Make launching independent from detached version

git-svn-id: https://svn.argeo.org/slc/trunk@1749 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.detached.launcher/src/main/base/bin/slc-detached.bat b/org.argeo.slc.detached.launcher/src/main/base/bin/slc-detached.bat
index 97cff0cf8bf37c817a5e20fb7f93adef3e83106f..d5a5cfddf0597d0b8f3cd97b8314ebdef61e8a03 100644 (file)
--- a/org.argeo.slc.detached.launcher/src/main/base/bin/slc-detached.bat
+++ b/org.argeo.slc.detached.launcher/src/main/base/bin/slc-detached.bat
@@ -8,10 +8,11 @@ call slc-detached-settings.bat
 
 rem FOR %%f IN (%SLC_HOME%\lib\detached\*.jar) DO set CLASSPATH=%CLASSPATH%;%%f
 FOR %%f IN (%SLC_HOME%\lib\detached\org.argeo.slc.detached.launcher-*.jar) DO set SLC_DETACHED_LAUNCHER_JAR=%%f
+FOR %%f IN (%SLC_HOME%\lib\org.argeo.slc.detached-*.jar) DO set SLC_DETACHED_JAR=%%f
 
 set CLASSPATH=%SLC_DETACHED_LAUNCHER_JAR%;%SLC_USER_CLASSPATH%;%SLC_LIB_DETACHED%\aopalliance-1.0.jar;%SLC_LIB_DETACHED%\commons-io-1.4.jar;%SLC_LIB_DETACHED%\commons-logging-1.1.1.jar;%SLC_LIB_DETACHED%\log4j-1.2.15.jar;%SLC_LIB_DETACHED%\org.apache.felix.main-1.2.1.jar;%SLC_LIB_DETACHED%\spring-beans-2.0.8.jar;%SLC_LIB_DETACHED%\spring-context-2.0.8.jar;%SLC_LIB_DETACHED%\spring-core-2.0.8.jar;%SLC_LIB_DETACHED%\xercesImpl-2.8.1.jar;%SLC_LIB_DETACHED%\xml-apis-1.3.03.jar;%SLC_LIB_DETACHED%\xalan-2.7.0.jar
 
-set CMD=%JAVA_HOME%\bin\java %SLC_DETACHED_JVM_ARGS% -Dslc.home=%SLC_HOME% -Dslc.workDir=%SLC_WORK_DIR% "-Dslc.detached.userBundles=%SLC_USER_BUNDLES%" -Dslc.detached.appclass=%SLC_DETACHED_APPCLASS% "-Dslc.detached.appargs=%SLC_DETACHED_APPARGS%" -classpath %CLASSPATH% org.argeo.slc.detached.launcher.Main
+set CMD=%JAVA_HOME%\bin\java %SLC_DETACHED_JVM_ARGS% -Dslc.detached.jar=%SLC_DETACHED_JAR% -Dslc.home=%SLC_HOME% -Dslc.workDir=%SLC_WORK_DIR% "-Dslc.detached.userBundles=%SLC_USER_BUNDLES%" -Dslc.detached.appclass=%SLC_DETACHED_APPCLASS% "-Dslc.detached.appargs=%SLC_DETACHED_APPARGS%" -classpath %CLASSPATH% org.argeo.slc.detached.launcher.Main
 rem echo CMD=%CMD%
 
 start %CMD%

diff --git a/org.argeo.slc.detached.launcher/src/main/resources/org/argeo/slc/detached/launcher/felix.properties b/org.argeo.slc.detached.launcher/src/main/resources/org/argeo/slc/detached/launcher/felix.properties
index e5bd3924591941acb830adbcd3d06eef576d6bc6..19e5c24432c883f577f9943685e597efa61a484a 100644 (file)
--- a/org.argeo.slc.detached.launcher/src/main/resources/org/argeo/slc/detached/launcher/felix.properties
+++ b/org.argeo.slc.detached.launcher/src/main/resources/org/argeo/slc/detached/launcher/felix.properties
@@ -29,7 +29,7 @@ org.osgi.framework.system.packages=org.osgi.framework; version=1.4.0, \
 #felix.cache.profile=foo
 
 felix.auto.start.1= \
- file:${slc.home}/lib/org.argeo.slc.detached-0.11.1-SNAPSHOT.jar \
+ file:${slc.detached.jar} \
  file:${slc.home}/lib/detached/org.apache.felix.shell-1.0.2.jar \
  file:${slc.home}/lib/detached/org.apache.felix.shell.tui-1.0.2.jar \
  file:${slc.home}/lib/org.argeo.dep.jemmy.nb61-0.2.2.jar \