servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r602975 - in /servicemix/smx4/runtime/trunk: assembly/src/main/release/bin/servicemix.bat main/src/main/java/org/apache/servicemix/runtime/main/Main.java
Date Mon, 10 Dec 2007 17:42:13 GMT
Author: chirino
Date: Mon Dec 10 09:42:12 2007
New Revision: 602975

URL: http://svn.apache.org/viewvc?rev=602975&view=rev
Log:
Updated config so that instance system directory does not need to exist also update windows
bat file to that it can be
used per instance too.

Modified:
    servicemix/smx4/runtime/trunk/assembly/src/main/release/bin/servicemix.bat
    servicemix/smx4/runtime/trunk/main/src/main/java/org/apache/servicemix/runtime/main/Main.java

Modified: servicemix/smx4/runtime/trunk/assembly/src/main/release/bin/servicemix.bat
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/assembly/src/main/release/bin/servicemix.bat?rev=602975&r1=602974&r2=602975&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/assembly/src/main/release/bin/servicemix.bat (original)
+++ servicemix/smx4/runtime/trunk/assembly/src/main/release/bin/servicemix.bat Mon Dec 10
09:42:12 2007
@@ -48,16 +48,26 @@
     goto END
 )
 
+if not "%SERVICEMIX_BASE%" == "" (
+    if not exist "%SERVICEMIX_BASE%" (
+       call :warn SERVICEMIX_BASE is not valid: %SERVICEMIX_BASE%
+       goto END
+    )
+)
+if "%SERVICEMIX_BASE%" == "" (
+  set SERVICEMIX_BASE=%SERVICEMIX_HOME%
+)
+
 set LOCAL_CLASSPATH=%CLASSPATH%
-set DEFAULT_JAVA_OPTS=-server -Xmx512M -Dderby.system.home="%SERVICEMIX_HOME%\var" -Dderby.storage.fileSyncTransactionLog=true
-Dcom.sun.management.jmxremote
-set CLASSPATH=%LOCAL_CLASSPATH%;%SERVICEMIX_HOME%\conf
+set DEFAULT_JAVA_OPTS=-server -Xmx512M -Dderby.system.home="%SERVICEMIX_BASE%\data\derby"
-Dderby.storage.fileSyncTransactionLog=true -Dcom.sun.management.jmxremote
+set CLASSPATH=%LOCAL_CLASSPATH%;%SERVICEMIX_BASE%\conf
 set DEFAULT_JAVA_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
 
 if "%LOCAL_CLASSPATH%" == "" goto :SERVICEMIX_CLASSPATH_EMPTY
-    set CLASSPATH=%LOCAL_CLASSPATH%;%SERVICEMIX_HOME%\conf
+    set CLASSPATH=%LOCAL_CLASSPATH%;%SERVICEMIX_BASE%\conf
     goto :SERVICEMIX_CLASSPATH_END
 :SERVICEMIX_CLASSPATH_EMPTY
-    set CLASSPATH=%SERVICEMIX_HOME%\conf
+    set CLASSPATH=%SERVICEMIX_BASE%\conf
 :SERVICEMIX_CLASSPATH_END
 
 rem Setup Servicemix Home
@@ -65,7 +75,7 @@
 if exist "%HOME%\servicemix-rc.cmd" call %HOME%\servicemix-rc.cmd
 
 rem Support for loading native libraries
-set PATH=%PATH%;%SERVICEMIX_HOME%\lib
+set PATH=%PATH%;%SERVICEMIX_BASE%\lib;%SERVICEMIX_HOME%\lib
 
 rem Setup the Java Virtual Machine
 if not "%JAVA%" == "" goto :Check_JAVA_END
@@ -99,12 +109,6 @@
 rem Setup the classpath
 set CLASSPATH=%CLASSPATH%;%SERVICEMIX_HOME%\lib\classworlds-1.0.1.jar
 
-rem Setup boot options
-set CLASSWORLDS_CONF=%SERVICEMIX_HOME%\conf\servicemix.conf
-set BOOT_OPTS=%BOOT_OPTS% -Dclassworlds.conf="%CLASSWORLDS_CONF%"
-set BOOT_OPTS=%BOOT_OPTS% -Dservicemix.home="%SERVICEMIX_HOME%"
-set BOOT_OPTS=%BOOT_OPTS% -Djava.endorsed.dirs="%SERVICEMIX_HOME%\lib\endorsed"
-
 rem Execute the JVM or the load the profiler
 if "%SERVICEMIX_PROFILER%" == "" goto :EXECUTE
     rem Execute the profiler if it has been configured
@@ -113,8 +117,8 @@
 
 :EXECUTE
     rem Execute the Java Virtual Machine
-    cd "%SERVICEMIX_HOME%"
-    "%JAVA%" %JAVA_OPTS% -Dservicemix.home="%SERVICEMIX_HOME%" -Dbundles.configuration.location="%SERVICEMIX_HOME%/conf"
-jar "%SERVICEMIX_HOME%\bin\servicemix.jar" %*
+    cd "%SERVICEMIX_BASE%"
+    "%JAVA%" %JAVA_OPTS% -Dservicemix.home="%SERVICEMIX_HOME%" -Dservicemix.base="%SERVICEMIX_BASE%"
-jar "%SERVICEMIX_HOME%\bin\servicemix.jar" %*
 
 rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 

Modified: servicemix/smx4/runtime/trunk/main/src/main/java/org/apache/servicemix/runtime/main/Main.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/main/src/main/java/org/apache/servicemix/runtime/main/Main.java?rev=602975&r1=602974&r2=602975&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/main/src/main/java/org/apache/servicemix/runtime/main/Main.java
(original)
+++ servicemix/smx4/runtime/trunk/main/src/main/java/org/apache/servicemix/runtime/main/Main.java
Mon Dec 10 09:42:12 2007
@@ -544,8 +544,8 @@
                     public boolean accept(File pathname) {
                         return pathname.toString().endsWith(".jar");
                     }
-                });
-                for (int i = 0; i < bundles.length; i++) {
+                });                
+                for (int i = 0; bundles!=null && i < bundles.length; i++) {
                     try {
                         sb.append("\"").append(bundles[i].toURL().toString()).append("\"
");
                     } catch (MalformedURLException e) {



Mime
View raw message