Author: chetanm
Date: Tue Apr 11 05:30:01 2017
New Revision: 1790925
URL: http://svn.apache.org/viewvc?rev=1790925&view=rev
Log:
OAK-6063 - Oak run console not loading
Modified:
jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/GroovyConsole.groovy
Modified:
jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/GroovyConsole.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/GroovyConsole.groovy?rev=1790925&r1=1790924&r2=1790925&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/GroovyConsole.groovy
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/GroovyConsole.groovy
Tue Apr 11 05:30:01 2017
@@ -23,9 +23,9 @@ import groovy.transform.TypeCheckingMode
import jline.Terminal
import jline.TerminalFactory
import jline.console.history.FileHistory
+import org.apache.jackrabbit.oak.commons.run.Utils
import org.apache.jackrabbit.oak.console.commands.*
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore
-import org.apache.jackrabbit.oak.run.Main
import org.codehaus.groovy.runtime.StackTraceUtils
import org.codehaus.groovy.tools.shell.*
import org.codehaus.groovy.tools.shell.Command as ShellCommand
@@ -254,7 +254,7 @@ class GroovyConsole {
width = 80
}
- io.out.println("@|green Jackrabbit Oak Shell|@
(${Main.getProductInfo()}, " +
+ io.out.println("@|green Jackrabbit Oak Shell|@
(${getProductInfo()}, " +
"JVM: ${System.properties['java.version']})")
io.out.println("Type '@|bold :help|@' or '@|bold :h|@'
for help.")
io.out.println('-' * (width - 1))
@@ -284,4 +284,9 @@ class GroovyConsole {
}
}
+
+ private static String getProductInfo(){
+ return Utils.getProductInfo(
+
GroovyConsole.class.getResourceAsStream("/META-INF/maven/org.apache.jackrabbit/oak-run/pom.properties"));
+ }
}