[karaf] branch master updated: [KARAF-5634] Change CLASSPATH after copying lib.next to lib during restart

[gg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ggrzybek 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 e16de62  [KARAF-5634] Change CLASSPATH after copying lib.next to lib during restart
e16de62 is described below

commit e16de6257515b8717a1d8f115f37cd1042581465
Author: Grzegorz Grzybek <gg...@redhat.com>
AuthorDate: Wed Feb 21 17:05:53 2018 +0100

    [KARAF-5634] Change CLASSPATH after copying lib.next to lib during restart
---
 .../features/base/src/main/filtered-resources/resources/bin/karaf | 5 +++++
 .../base/src/main/filtered-resources/resources/bin/karaf.bat      | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
index aba7322..d8c938e 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
@@ -48,6 +48,7 @@ realpath() {
 REALNAME=$(realpath "$0")
 DIRNAME=$(dirname "${REALNAME}")
 PROGNAME=$(basename "${REALNAME}")
+LOCAL_CLASSPATH=$CLASSPATH
 
 #
 # Load common functions
@@ -254,6 +255,10 @@ run() {
             echo "Updating libs..."
             rm -rf "${KARAF_HOME:?}/lib"
             mv -f "${KARAF_HOME:?}/lib.next" "${KARAF_HOME}/lib"
+
+            echo "Updating classpath..."
+            CLASSPATH=$LOCAL_CLASSPATH
+            setupClassPath
         fi
 
         # Ensure the log directory exists
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
index cb0f0d9..ca814d5 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
@@ -108,6 +108,8 @@ if "%LOCAL_CLASSPATH%" == "" goto :KARAF_CLASSPATH_EMPTY
     set CLASSPATH=%KARAF_BASE%\conf
 :KARAF_CLASSPATH_END
 
+set CLASSPATH_INITIAL=%CLASSPATH%
+
 rem Setup Karaf Home
 if exist "%KARAF_HOME%\conf\karaf-rc.cmd" call %KARAF_HOME%\conf\karaf-rc.cmd
 if exist "%HOME%\karaf-rc.cmd" call %HOME%\karaf-rc.cmd
@@ -381,6 +383,12 @@ if "%KARAF_PROFILER%" == "" goto :RUN
         echo Updating libs...
         RD /S /Q "%KARAF_HOME%\lib"
         MOVE /Y "%KARAF_HOME%\lib.next" "%KARAF_HOME%\lib"
+
+        echo "Updating classpath..."
+        set CLASSPATH=%CLASSPATH_INITIAL%
+        pushd "%KARAF_HOME%\lib\boot"
+        for %%G in (*.jar) do call:APPEND_TO_CLASSPATH %%G
+        popd
     )
 
     SET IS_RUNNABLE=false

-- 
To stop receiving notification emails like this one, please contact
ggrzybek@apache.org.