You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ac...@apache.org on 2008/01/02 10:51:19 UTC
svn commit: r608064 - in /activemq/trunk/assembly/src:
main/descriptors/windows-bin.xml release/bin/linux/wrapper.conf
release/bin/macosx/wrapper.conf release/bin/win32/wrapper.conf
Author: aco
Date: Wed Jan 2 01:51:18 2008
New Revision: 608064
URL: http://svn.apache.org/viewvc?rev=608064&view=rev
Log:
Update to the Java Service Wrapper
Modified:
activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
activemq/trunk/assembly/src/release/bin/linux/wrapper.conf
activemq/trunk/assembly/src/release/bin/macosx/wrapper.conf
activemq/trunk/assembly/src/release/bin/win32/wrapper.conf
Modified: activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=608064&r1=608063&r2=608064&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/windows-bin.xml Wed Jan 2 01:51:18 2008
@@ -47,6 +47,7 @@
</fileSet>
<!-- Copy over the files that should not get the line endings converted but need to be chmod to 755 -->
+ <!-- Do not copy unix files
<fileSet>
<directory>src/release</directory>
<outputDirectory></outputDirectory>
@@ -58,8 +59,10 @@
</includes>
<fileMode>0755</fileMode>
</fileSet>
+ -->
<!-- Copy over the files that need unix line endings and also chmod to 755 -->
+ <!-- Do not copy unix files
<fileSet>
<directory>src/release</directory>
<outputDirectory></outputDirectory>
@@ -72,6 +75,7 @@
<fileMode>0755</fileMode>
<lineEnding>unix</lineEnding>
</fileSet>
+ -->
<!-- Copy over files that should not get the line endings converted -->
<fileSet>
Modified: activemq/trunk/assembly/src/release/bin/linux/wrapper.conf
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/linux/wrapper.conf?rev=608064&r1=608063&r2=608064&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/linux/wrapper.conf (original)
+++ activemq/trunk/assembly/src/release/bin/linux/wrapper.conf Wed Jan 2 01:51:18 2008
@@ -73,6 +73,7 @@
# Application parameters. Add parameters as needed starting from 1
wrapper.app.parameter.1=org.apache.activemq.console.Main
+wrapper.app.parameter.2=start
#********************************************************************
# Wrapper Logging Properties
@@ -84,7 +85,7 @@
wrapper.console.loglevel=INFO
# Log file to use for wrapper output logging.
-wrapper.logfile=%ACTIVEMQ_BASE%/activemq-data/wrapper.log
+wrapper.logfile=%ACTIVEMQ_BASE%/data/wrapper.log
# Format of output for the log file. (See docs for formats)
wrapper.logfile.format=LPTM
Modified: activemq/trunk/assembly/src/release/bin/macosx/wrapper.conf
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/macosx/wrapper.conf?rev=608064&r1=608063&r2=608064&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/macosx/wrapper.conf (original)
+++ activemq/trunk/assembly/src/release/bin/macosx/wrapper.conf Wed Jan 2 01:51:18 2008
@@ -73,6 +73,7 @@
# Application parameters. Add parameters as needed starting from 1
wrapper.app.parameter.1=org.apache.activemq.console.Main
+wrapper.app.parameter.2=start
#********************************************************************
# Wrapper Logging Properties
@@ -84,7 +85,7 @@
wrapper.console.loglevel=INFO
# Log file to use for wrapper output logging.
-wrapper.logfile=%ACTIVEMQ_BASE%/activemq-data/wrapper.log
+wrapper.logfile=%ACTIVEMQ_BASE%/data/wrapper.log
# Format of output for the log file. (See docs for formats)
wrapper.logfile.format=LPTM
Modified: activemq/trunk/assembly/src/release/bin/win32/wrapper.conf
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/win32/wrapper.conf?rev=608064&r1=608063&r2=608064&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/win32/wrapper.conf (original)
+++ activemq/trunk/assembly/src/release/bin/win32/wrapper.conf Wed Jan 2 01:51:18 2008
@@ -25,7 +25,7 @@
wrapper.working.dir=.
# Java Application
-wrapper.java.command=%JAVA_HOME%/bin/java
+wrapper.java.command=java
# Java Main class. This class must implement the WrapperListener interface
# or guarantee that the WrapperManager class is initialized. Helper
@@ -73,6 +73,7 @@
# Application parameters. Add parameters as needed starting from 1
wrapper.app.parameter.1=org.apache.activemq.console.Main
+wrapper.app.parameter.2=start
#********************************************************************
# Wrapper Logging Properties
@@ -84,7 +85,7 @@
wrapper.console.loglevel=INFO
# Log file to use for wrapper output logging.
-wrapper.logfile=%ACTIVEMQ_BASE%/activemq-data/wrapper.log
+wrapper.logfile=%ACTIVEMQ_BASE%/data/wrapper.log
# Format of output for the log file. (See docs for formats)
wrapper.logfile.format=LPTM