You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2016/11/18 20:36:14 UTC
[2/2] karaf git commit: Fix bin/instance shell wrt to jline
Fix bin/instance shell wrt to jline
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c6d36618
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c6d36618
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c6d36618
Branch: refs/heads/master
Commit: c6d366186547020f69f4d49ead6fd330a9873357
Parents: 1e00d82
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Nov 14 09:38:34 2016 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu Nov 17 14:59:56 2016 +0100
----------------------------------------------------------------------
.../base/src/main/filtered-resources/resources/bin/instance | 2 +-
.../base/src/main/filtered-resources/resources/bin/instance.bat | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/c6d36618/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
index 2daeb15..94126db 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
@@ -295,7 +295,7 @@ setupDefaults() {
CLASSPATH="$KARAF_HOME/system/org/apache/karaf/instance/org.apache.karaf.instance.core/@@project.version@@/org.apache.karaf.instance.core-@@project.version@@.jar"
CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/apache/karaf/shell/org.apache.karaf.shell.core/@@project.version@@/org.apache.karaf.shell.core-@@project.version@@.jar"
CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/ops4j/pax/logging/pax-logging-api/@@pax.logging.version@@/pax-logging-api-@@pax.logging.version@@.jar"
- CLASSPATH="$CLASSPATH:$KARAF_HOME/system/jline/jline/@@jline.version@@/jline-@@jline.version@@.jar"
+ CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/jline/jline/@@jline.version@@/jline-@@jline.version@@.jar"
DEFAULT_JAVA_DEBUG_PORT="5005"
if [ "x$JAVA_DEBUG_PORT" = "x" ]; then
http://git-wip-us.apache.org/repos/asf/karaf/blob/c6d36618/assemblies/features/base/src/main/filtered-resources/resources/bin/instance.bat
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance.bat b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance.bat
index ffdece2..e29cc56 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance.bat
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance.bat
@@ -142,7 +142,7 @@ goto :EOF
set CLASSPATH=%KARAF_HOME%\system\org\apache\karaf\instance\org.apache.karaf.instance.core\@@project.version@@\org.apache.karaf.instance.core-@@project.version@@.jar
set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\apache\karaf\shell\org.apache.karaf.shell.core\@@project.version@@\org.apache.karaf.shell.core-@@project.version@@.jar
set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\ops4j\pax\logging\pax-logging-api\@@pax.logging.version@@\pax-logging-api-@@pax.logging.version@@.jar
-set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\jline\jline\@@jline.version@@\jline-@@jline.version@@.jar
+set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\jline\jline\@@jline.version@@\jline-@@jline.version@@.jar
:EXECUTE
if "%SHIFT%" == "true" SET ARGS=%2 %3 %4 %5 %6 %7 %8