servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r698723 - in /servicemix/smx4/kernel/branches/kernel-1.0.x: assembly/src/main/distribution/windows-text/bin/servicemix.bat gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/bin/servicemix.bat
Date Wed, 24 Sep 2008 20:40:49 GMT
Author: gnodet
Date: Wed Sep 24 13:40:49 2008
New Revision: 698723

URL: http://svn.apache.org/viewvc?rev=698723&view=rev
Log:
SMX4KNL-87: Backport windows batch fixes

Modified:
    servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/distribution/windows-text/bin/servicemix.bat
    servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/bin/servicemix.bat

Modified: servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/distribution/windows-text/bin/servicemix.bat
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/distribution/windows-text/bin/servicemix.bat?rev=698723&r1=698722&r2=698723&view=diff
==============================================================================
--- servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/distribution/windows-text/bin/servicemix.bat
(original)
+++ servicemix/smx4/kernel/branches/kernel-1.0.x/assembly/src/main/distribution/windows-text/bin/servicemix.bat
Wed Sep 24 13:40:49 2008
@@ -110,15 +110,38 @@
 set CLASSPATH=%CLASSPATH%;%SERVICEMIX_HOME%\lib\servicemix.jar;%SERVICEMIX_HOME%\lib\servicemix-jaas-boot.jar
 
 rem Execute the JVM or the load the profiler
-if "%SERVICEMIX_PROFILER%" == "" goto :EXECUTE
+if "%SERVICEMIX_PROFILER%" == "" goto :RUN
     rem Execute the profiler if it has been configured
     call :warn Loading profiler script: %SERVICEMIX_PROFILER_SCRIPT%
     call %SERVICEMIX_PROFILER_SCRIPT%
 
+:RUN
+    SET OPTS=-Dservicemix.startLocalConsole=true -Dservicemix.startRemoteShell=true
+    SET SHIFT=false
+    if "%1" == "console" goto :EXECUTE_CONSOLE
+    if "%1" == "server" goto :EXECUTE_SERVER
+    if "%1" == "client" goto :EXECUTE_CLIENT
+    goto :EXECUTE
+
+:EXECUTE_CONSOLE
+    SET SHIFT=true
+    goto :EXECUTE    
+
+:EXECUTE_SERVER
+    SET OPTS="-Dservicemix.startLocalConsole=false -Dservicemix.startRemoteShell=true"
+    SET SHIFT=true
+    goto :EXECUTE
+
+:EXECUTE_CLIENT
+    SET OPTS="-Dservicemix.startLocalConsole=true -Dservicemix.startRemoteShell=false"
+    SET SHIFT=true
+    goto :EXECUTE
+
 :EXECUTE
-    SET OPTS=-Dservicemix.startLocalConsole=true -Dservicemix.startRemoteShell=true    
+    if "%SHIFT%" == "true" SET ARGS=%2 %3 %4 %5 %6 %7 %8
+    if not "%SHIFT%" == "true" SET ARGS=%1 %2 %3 %4 %5 %6 %7 %8    
     rem Execute the Java Virtual Machine
-    "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Dservicemix.home="%SERVICEMIX_HOME%"
-Dservicemix.base="%SERVICEMIX_BASE%" org.apache.servicemix.kernel.main.Main %*
+    "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Dservicemix.home="%SERVICEMIX_HOME%"
-Dservicemix.base="%SERVICEMIX_BASE%" org.apache.servicemix.kernel.main.Main %ARGS%
 
 rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 

Modified: servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/bin/servicemix.bat
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/bin/servicemix.bat?rev=698723&r1=698722&r2=698723&view=diff
==============================================================================
--- servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/bin/servicemix.bat
(original)
+++ servicemix/smx4/kernel/branches/kernel-1.0.x/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/bin/servicemix.bat
Wed Sep 24 13:40:49 2008
@@ -22,4 +22,4 @@
 SETLOCAL
 SET SERVICEMIX_HOME=${servicemix.home}
 
-%SERVICEMIX_HOME%\bin\servicemix.bat "$*"
\ No newline at end of file
+%SERVICEMIX_HOME%\bin\servicemix.bat %*



Mime
View raw message