You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jg...@apache.org on 2006/11/14 09:52:14 UTC

svn commit: r474706 - in /incubator/activemq/trunk/assembly/src: main/descriptors/ release/bin/core/ release/bin/core/boot/ release/bin/win32/

Author: jgapuz
Date: Tue Nov 14 00:52:13 2006
New Revision: 474706

URL: http://svn.apache.org/viewvc?view=rev&rev=474706
Log:
AMQ-644 - create Java Service Wrapper for ActiveMQ

Added:
    incubator/activemq/trunk/assembly/src/release/bin/core/
    incubator/activemq/trunk/assembly/src/release/bin/core/boot/
    incubator/activemq/trunk/assembly/src/release/bin/core/boot/wrapper.jar   (with props)
Modified:
    incubator/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
    incubator/activemq/trunk/assembly/src/release/bin/win32/InstallService.bat
    incubator/activemq/trunk/assembly/src/release/bin/win32/UninstallService.bat
    incubator/activemq/trunk/assembly/src/release/bin/win32/activemq.bat
    incubator/activemq/trunk/assembly/src/release/bin/win32/wrapper.conf

Modified: incubator/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml?view=diff&rev=474706&r1=474705&r2=474706
==============================================================================
--- incubator/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ incubator/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml Tue Nov 14 00:52:13 2006
@@ -41,6 +41,7 @@
         <include>bin/*.bat</include>
         <include>bin/win32/*.bat</include>
         <include>bin/win32/*.conf</include>
+	<include>bin/core/boot/*.jar</include>
       </includes>
       <lineEnding>dos</lineEnding>
     </fileSet>

Added: incubator/activemq/trunk/assembly/src/release/bin/core/boot/wrapper.jar
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/bin/core/boot/wrapper.jar?view=auto&rev=474706
==============================================================================
Binary file - no diff available.

Propchange: incubator/activemq/trunk/assembly/src/release/bin/core/boot/wrapper.jar
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/activemq/trunk/assembly/src/release/bin/core/boot/wrapper.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/activemq/trunk/assembly/src/release/bin/win32/InstallService.bat
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/bin/win32/InstallService.bat?view=diff&rev=474706&r1=474705&r2=474706
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/bin/win32/InstallService.bat (original)
+++ incubator/activemq/trunk/assembly/src/release/bin/win32/InstallService.bat Tue Nov 14 00:52:13 2006
@@ -34,17 +34,19 @@
 set _REALPATH=%~dp0
 
 set ACTIVEMQ_HOME=%~dp0..\..
+set ACTIVEMQ_BASE=%~dp0..\..
 
 :conf
-set _WRAPPER_CONF=wrapper.conf
+set _WRAPPER_CONF="%ACTIVEMQ_HOME%\bin\win32\wrapper.conf"
 
 set _ACTIVEMQ_HOME="set.ACTIVEMQ_HOME=%ACTIVEMQ_HOME%"
+set _ACTIVEMQ_BASE="set.ACTIVEMQ_BASE=%ACTIVEMQ_BASE%"
 
 rem
 rem Install the Wrapper as an NT service.
 rem
 :startup
-"wrapper.exe" -i %_WRAPPER_CONF% %_ACTIVEMQ_HOME%
+"wrapper.exe" -i %_WRAPPER_CONF% %_ACTIVEMQ_HOME% %_ACTIVEMQ_BASE%
 if not errorlevel 1 goto :eof
 pause
 

Modified: incubator/activemq/trunk/assembly/src/release/bin/win32/UninstallService.bat
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/bin/win32/UninstallService.bat?view=diff&rev=474706&r1=474705&r2=474706
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/bin/win32/UninstallService.bat (original)
+++ incubator/activemq/trunk/assembly/src/release/bin/win32/UninstallService.bat Tue Nov 14 00:52:13 2006
@@ -35,7 +35,7 @@
 set ACTIVEMQ_HOME=%~dp0\..\..
 
 :conf
-set _WRAPPER_CONF=wrapper.conf
+set _WRAPPER_CONF="%ACTIVEMQ_HOME%\bin\win32\wrapper.conf"
 
 
 rem

Modified: incubator/activemq/trunk/assembly/src/release/bin/win32/activemq.bat
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/bin/win32/activemq.bat?view=diff&rev=474706&r1=474705&r2=474706
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/bin/win32/activemq.bat (original)
+++ incubator/activemq/trunk/assembly/src/release/bin/win32/activemq.bat Tue Nov 14 00:52:13 2006
@@ -33,6 +33,7 @@
 
 rem Set ActiveMQ Home
 set ACTIVEMQ_HOME=%~dp0..\..
+set ACTIVEMQ_BASE=%~dp0..\..
 
 rem
 rem Find the wrapper.conf

Modified: incubator/activemq/trunk/assembly/src/release/bin/win32/wrapper.conf
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/bin/win32/wrapper.conf?view=diff&rev=474706&r1=474705&r2=474706
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/bin/win32/wrapper.conf (original)
+++ incubator/activemq/trunk/assembly/src/release/bin/win32/wrapper.conf Tue Nov 14 00:52:13 2006
@@ -49,10 +49,17 @@
 wrapper.java.additional.2=-Dderby.system.home=data
 wrapper.java.additional.3=-Dderby.storage.fileSyncTransactionLog=true
 wrapper.java.additional.4=-Dcom.sun.management.jmxremote
-wrapper.java.additional.5=-Dactivemq.home=%ACTIVEMQ_HOME%
+wrapper.java.additional.5=-Dactivemq.home="%ACTIVEMQ_HOME%"
+wrapper.java.additional.6=-Dactivemq.base="%ACTIVEMQ_BASE%"
+wrapper.java.additional.7=-Djavax.net.ssl.keyStorePassword=password
+wrapper.java.additional.8=-Djavax.net.ssl.trustStorePassword=password
+wrapper.java.additional.9=-Djavax.net.ssl.keyStore="%ACTIVEMQ_BASE%/conf/broker.ks"
+wrapper.java.additional.10=-Djavax.net.ssl.trustStore="%ACTIVEMQ_BASE%/conf/broker.ts"
 
 # Uncomment to enable jmx
-#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616 #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.authenticate=false #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.ssl=false
+#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616 
+#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.authenticate=false 
+#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.ssl=false
 
 # Uncomment to enable YourKit profiling
 #wrapper.java.additional.n=-Xrunyjpagent