svn commit: r603376 - in /servicemix/smx4/runtime/trunk: assembly/src/main/distribution/windows-text/bin/ gshell/gshell-wrapper/ gshell/gshell-wrapper/src/main/java/org/apache/servicemix/runtime/gshell/wrapper/ gshell/gshell-wrapper/src/main/resources/...

[ch...@apache.org]

Author: chirino
Date: Tue Dec 11 14:02:36 2007
New Revision: 603376

URL: http://svn.apache.org/viewvc?rev=603376&view=rev
Log:
Fixed it up so that it works on windows too.  Renamed the service wrapper stuff to servicemix-wrapper.exe so that it's easy to spot as the servicemix proecess in a running task manager.

Added:
    servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/all/servicemix-wrapper.conf
      - copied, changed from r603357, servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/all/wrapper.conf
    servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/all/servicemix-wrapper.jar
      - copied unchanged from r603357, servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/all/wrapper.jar
    servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/linux/servicemix-wrapper
      - copied unchanged from r603357, servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/linux/wrapper
    servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/macosx/servicemix-wrapper
      - copied unchanged from r603357, servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/macosx/wrapper
    servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/windows/servicemix-wrapper.exe
      - copied unchanged from r603357, servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/windows/wrapper.exe
Removed:
    servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/.project
    servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/all/wrapper.conf
    servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/all/wrapper.jar
    servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/linux/wrapper
    servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/macosx/wrapper
    servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/windows/wrapper.exe
Modified:
    servicemix/smx4/runtime/trunk/assembly/src/main/distribution/windows-text/bin/servicemix.bat
    servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/java/org/apache/servicemix/runtime/gshell/wrapper/InstallCommand.java
    servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/unix/servicemix-service
    servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/windows/servicemix-service.bat

Modified: servicemix/smx4/runtime/trunk/assembly/src/main/distribution/windows-text/bin/servicemix.bat
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/assembly/src/main/distribution/windows-text/bin/servicemix.bat?rev=603376&r1=603375&r2=603376&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/assembly/src/main/distribution/windows-text/bin/servicemix.bat (original)
+++ servicemix/smx4/runtime/trunk/assembly/src/main/distribution/windows-text/bin/servicemix.bat Tue Dec 11 14:02:36 2007
@@ -116,8 +116,9 @@
     call %SERVICEMIX_PROFILER_SCRIPT%
 
 :EXECUTE
+    SET OPTS=-Dservicemix.startLocalConsole=true -Dservicemix.startRemoteShell=true    
     rem Execute the Java Virtual Machine
-    "%JAVA%" %JAVA_OPTS% -Dservicemix.home="%SERVICEMIX_HOME%" -Dservicemix.base="%SERVICEMIX_BASE%" -jar "%SERVICEMIX_HOME%\bin\servicemix.jar" %*
+    "%JAVA%" %JAVA_OPTS% %OPTS% -Dservicemix.home="%SERVICEMIX_HOME%" -Dservicemix.base="%SERVICEMIX_BASE%" -jar "%SERVICEMIX_HOME%\bin\servicemix.jar" %*
 
 rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 

Modified: servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/java/org/apache/servicemix/runtime/gshell/wrapper/InstallCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/java/org/apache/servicemix/runtime/gshell/wrapper/InstallCommand.java?rev=603376&r1=603375&r2=603376&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/java/org/apache/servicemix/runtime/gshell/wrapper/InstallCommand.java (original)
+++ servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/java/org/apache/servicemix/runtime/gshell/wrapper/InstallCommand.java Tue Dec 11 14:02:36 2007
@@ -70,14 +70,14 @@
 			File serviceFile=null;
 			if( os.startsWith("Win") ) {
 				mkdir(bin);
-				copyResourceToDir(bin, "windows/wrapper.exe", false);
+				copyResourceToDir(bin, "windows/servicemix-wrapper.exe", false);
 				serviceFile = new File(bin,"servicemix-service.bat");
-				copyFilteredResourceTo(serviceFile, "macosx/servicemix-service.bat", props);
+				copyFilteredResourceTo(serviceFile, "windows/servicemix-service.bat", props);
 				mkdir(lib);
 				copyResourceToDir(lib, "windows/wrapper.dll", false);								
 			} else if( os.startsWith("Mac OS X") ) {
 				mkdir(bin);
-				copyResourceToDir(bin, "macosx/wrapper", false);
+				copyResourceToDir(bin, "macosx/servicemix-wrapper", false);
 				serviceFile = new File(bin,"servicemix-service");
 				copyFilteredResourceTo(serviceFile, "unix/servicemix-service", props);
 				mkdir(lib);
@@ -87,9 +87,9 @@
 				// when the machine boots up.
 			} else if( os.startsWith("Linux") ) {
 				mkdir(bin);
+				copyResourceToDir(bin, "linux/servicemix-wrapper", false);
 				serviceFile = new File(bin,"servicemix-service");
 				copyFilteredResourceTo(serviceFile, "unix/servicemix-service", props);
-				copyResourceToDir(bin, "linux/wrapper", false);
 				mkdir(lib);
 				copyResourceToDir(lib, "linux/libwrapper.jnilib", false);
 				
@@ -102,10 +102,10 @@
 
     		// Install the wrapper jar to the lib directory..
 			mkdir(lib);
-			copyResourceToDir(lib, "all/wrapper.jar", false);
+			copyResourceToDir(lib, "all/servicemix-wrapper.jar", false);
 			mkdir(etc);
-			File wrapperConf = new File(etc,"wrapper.conf");
-			copyFilteredResourceTo(wrapperConf, "all/wrapper.conf", props);
+			File wrapperConf = new File(etc,"servicemix-wrapper.conf");
+			copyFilteredResourceTo(wrapperConf, "all/servicemix-wrapper.conf", props);
 
 			io.out.println("Setup complete.  You may want to tweak the JVM properties in the wrapper configuration file: "+wrapperConf.getPath());
 			io.out.println("before installing and starting the service.");
@@ -154,6 +154,7 @@
 						Scanner scanner = new Scanner(is);
 						while (scanner.hasNextLine() ) {
 							String line = scanner.nextLine();
+							io.out.println("writing: "+line);
 							out.println(line);
 						}
 					} finally {

Copied: servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/all/servicemix-wrapper.conf (from r603357, servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/all/wrapper.conf)
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/all/servicemix-wrapper.conf?p2=servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/all/servicemix-wrapper.conf&p1=servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/all/wrapper.conf&r1=603357&r2=603376&rev=603376&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/all/wrapper.conf (original)
+++ servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/all/servicemix-wrapper.conf Tue Dec 11 14:02:36 2007
@@ -35,7 +35,7 @@
 
 # Java Classpath (include wrapper.jar)  Add class path elements as
 #  needed starting from 1
-wrapper.java.classpath.1=%SERVICEMIX_BASE%/lib/wrapper.jar
+wrapper.java.classpath.1=%SERVICEMIX_BASE%/lib/servicemix-wrapper.jar
 wrapper.java.classpath.2=%SERVICEMIX_HOME%/bin/servicemix.jar
 
 # Java Library Path (location of Wrapper.DLL or libwrapper.so)

Modified: servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/unix/servicemix-service
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/unix/servicemix-service?rev=603376&r1=603375&r2=603376&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/unix/servicemix-service (original)
+++ servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/unix/servicemix-service Tue Dec 11 14:02:36 2007
@@ -22,8 +22,8 @@
 APP_LONG_NAME="${displayName}"
 
 # Wrapper
-WRAPPER_CMD="${servicemix.base}/bin/wrapper"
-WRAPPER_CONF="${servicemix.base}/etc/wrapper.conf"
+WRAPPER_CMD="${servicemix.base}/bin/servicemix-wrapper"
+WRAPPER_CONF="${servicemix.base}/etc/servicemix-wrapper.conf"
 
 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
 #  nice is only used if a priority is specified.

Modified: servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/windows/servicemix-service.bat
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/windows/servicemix-service.bat?rev=603376&r1=603375&r2=603376&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/windows/servicemix-service.bat (original)
+++ servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/runtime/gshell/wrapper/windows/servicemix-service.bat Tue Dec 11 14:02:36 2007
@@ -27,7 +27,7 @@
 if ""%1"" == ""install"" goto doInstall
 if ""%1"" == ""remove"" goto doRemove
 
-echo Usage:  catalina ( commands ... )
+echo Usage:  servicemix-service ( commands ... )
 echo commands:
 echo   run               Start %APP_NAME% in the current console
 echo   install           Install %APP_NAME% as a Windows service
@@ -35,15 +35,15 @@
 goto end
 
 :doRun
-"%APP_BASE%\bin\wrapper.exe" -c "%APP_BASE%\etc\wrapper.conf"
+"%APP_BASE%\bin\servicemix-wrapper.exe" -c "%APP_BASE%\etc\servicemix-wrapper.conf"
 goto end
 
 :doInstall
-"%APP_BASE%\bin\wrapper.exe" -i "%APP_BASE%\etc\wrapper.conf"
+"%APP_BASE%\bin\servicemix-wrapper.exe" -i "%APP_BASE%\etc\servicemix-wrapper.conf"
 goto end
 
 :doRemove
-"%APP_BASE%\bin\wrapper.exe" -r "%APP_BASE%\etc\wrapper.conf"
+"%APP_BASE%\bin\servicemix-wrapper.exe" -r "%APP_BASE%\etc\servicemix-wrapper.conf"
 goto end
 
 :end