You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2020/01/08 06:59:39 UTC
[karaf] branch master updated: [KARAF-6525] Add osgi.core in the
shell classpath (required by pax-logging)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new db2cccf [KARAF-6525] Add osgi.core in the shell classpath (required by pax-logging)
new f2ca7ff Merge pull request #1045 from jbonofre/KARAF-6525
db2cccf is described below
commit db2cccf3d88e16bebad93604fdd0e94b930a01a9
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Tue Jan 7 18:33:40 2020 +0100
[KARAF-6525] Add osgi.core in the shell classpath (required by pax-logging)
---
assemblies/features/base/src/main/filtered-resources/resources/bin/shell | 1 +
.../features/base/src/main/filtered-resources/resources/bin/shell.bat | 1 +
2 files changed, 2 insertions(+)
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/shell b/assemblies/features/base/src/main/filtered-resources/resources/bin/shell
index 96ea4fd..5635ed9 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/shell
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/shell
@@ -81,6 +81,7 @@ setupClassPath() {
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/org/jline/jline/@@jline.version@@/jline-@@jline.version@@.jar"
+ CLASSPATH="${CLASSPATH}:${KARAF_HOME}/lib/boot/osgi.core-@@osgi.version@@.jar"
}
init() {
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/shell.bat b/assemblies/features/base/src/main/filtered-resources/resources/bin/shell.bat
index 875ba15..4c49b8a 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/shell.bat
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/shell.bat
@@ -140,6 +140,7 @@ if "%KARAF_DEBUG%" == "" goto :KARAF_DEBUG_END
set 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\org\jline\jline\@@jline.version@@\jline-@@jline.version@@.jar
+set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\lib\boot\osgi.core-@@osgi.version@@.jar
:EXECUTE
if "%SHIFT%" == "true" SET ARGS=%2 %3 %4 %5 %6 %7 %8