activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r474931 - in /incubator/activemq/branches/activemq-4.1: activemq-console/src/main/java/org/apache/activemq/console/ assembly/src/main/descriptors/ assembly/src/release/bin/ assembly/src/release/bin/linux/ assembly/src/release/bin/macosx/ as...
Date Tue, 14 Nov 2006 19:35:10 GMT
Author: chirino
Date: Tue Nov 14 11:35:09 2006
New Revision: 474931

URL: http://svn.apache.org/viewvc?view=rev&rev=474931
Log:
Merged in rev 474705-474926 for AMQ-644

Added:
    incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/wrapper.jar
      - copied unchanged from r474926, incubator/activemq/trunk/assembly/src/release/bin/wrapper.jar
Modified:
    incubator/activemq/branches/activemq-4.1/activemq-console/src/main/java/org/apache/activemq/console/Main.java
    incubator/activemq/branches/activemq-4.1/assembly/src/main/descriptors/unix-bin.xml
    incubator/activemq/branches/activemq-4.1/assembly/src/main/descriptors/windows-bin.xml
    incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/linux/wrapper.conf 
 (contents, props changed)
    incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/macosx/wrapper.conf
  (contents, props changed)
    incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/win32/InstallService.bat
    incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/win32/UninstallService.bat
    incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/win32/activemq.bat
    incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/win32/wrapper.conf 
 (contents, props changed)

Modified: incubator/activemq/branches/activemq-4.1/activemq-console/src/main/java/org/apache/activemq/console/Main.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-console/src/main/java/org/apache/activemq/console/Main.java?view=diff&rev=474931&r1=474930&r2=474931
==============================================================================
--- incubator/activemq/branches/activemq-4.1/activemq-console/src/main/java/org/apache/activemq/console/Main.java
(original)
+++ incubator/activemq/branches/activemq-4.1/activemq-console/src/main/java/org/apache/activemq/console/Main.java
Tue Nov 14 11:35:09 2006
@@ -89,11 +89,52 @@
 
         try {
             app.runTaskClass(tokens);
+        } catch (ClassNotFoundException e) {
+            System.out.println("Could not load class: " + e.getMessage());
+            try {
+				ClassLoader cl = app.getClassLoader();
+				if( cl!=null ) {
+		            System.out.println("Class loader setup: ");
+					printClassLoaderTree(cl);
+				}
+			} catch (MalformedURLException e1) {
+			}
         } catch (Throwable e) {
             System.out.println("Failed to execute main task. Reason: " + e);
         }
     }
 
+    /**
+     * Print out what's in the classloader tree being used. 
+     * 
+     * @param cl
+     * @return
+     */
+	private static int printClassLoaderTree(ClassLoader cl) {
+		int depth = 0;
+		if( cl.getParent()!=null ) {
+			depth = printClassLoaderTree(cl.getParent())+1;
+		}
+		
+		StringBuffer indent = new StringBuffer();
+		for (int i = 0; i < depth; i++) {
+			indent.append("  ");
+		}
+		
+		if( cl instanceof URLClassLoader ) {
+			URLClassLoader ucl = (URLClassLoader) cl;
+			System.out.println(indent+cl.getClass().getName()+" {");
+			URL[] urls = ucl.getURLs();
+			for (int i = 0; i < urls.length; i++) {
+				System.out.println(indent+"  "+urls[i]);
+			}
+			System.out.println(indent+"}");
+		} else {
+			System.out.println(indent+cl.getClass().getName());
+		}
+		return depth;
+	}
+
 	public void parseExtensions(List tokens) {
         if (tokens.isEmpty()) {
             return;
@@ -147,7 +188,9 @@
     }
 
     public void runTaskClass(List tokens) throws Throwable {
+    	
         System.out.println("ACTIVEMQ_HOME: "+ getActiveMQHome());
+        System.out.println("ACTIVEMQ_BASE: "+ getActiveMQBase());
 
         ClassLoader cl = getClassLoader();
 

Modified: incubator/activemq/branches/activemq-4.1/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/assembly/src/main/descriptors/unix-bin.xml?view=diff&rev=474931&r1=474930&r2=474931
==============================================================================
--- incubator/activemq/branches/activemq-4.1/assembly/src/main/descriptors/unix-bin.xml (original)
+++ incubator/activemq/branches/activemq-4.1/assembly/src/main/descriptors/unix-bin.xml Tue
Nov 14 11:35:09 2006
@@ -50,6 +50,7 @@
       <directory>src/release</directory>
       <outputDirectory>/</outputDirectory>
       <includes>
+        <include>bin/*.jar</include>
         <include>conf/*.ts</include>
         <include>conf/*.ks</include>
         <include>conf/*.cert</include>

Modified: incubator/activemq/branches/activemq-4.1/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/assembly/src/main/descriptors/windows-bin.xml?view=diff&rev=474931&r1=474930&r2=474931
==============================================================================
--- incubator/activemq/branches/activemq-4.1/assembly/src/main/descriptors/windows-bin.xml
(original)
+++ incubator/activemq/branches/activemq-4.1/assembly/src/main/descriptors/windows-bin.xml
Tue Nov 14 11:35:09 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>
@@ -53,6 +54,7 @@
         <include>conf/*.ts</include>
         <include>conf/*.ks</include>
         <include>conf/*.cert</include>
+        <include>bin/*.jar</include>
         <include>bin/win32/*.exe</include>
         <include>bin/win32/*.dll</include>
       </includes>

Modified: incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/linux/wrapper.conf
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/linux/wrapper.conf?view=diff&rev=474931&r1=474930&r2=474931
==============================================================================
--- incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/linux/wrapper.conf (original)
+++ incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/linux/wrapper.conf Tue
Nov 14 11:35:09 2006
@@ -1,136 +1,138 @@
-# ------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-# 
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ------------------------------------------------------------------------
-
-#********************************************************************
-# Wrapper Properties
-#********************************************************************
-
-# Java Application
-wrapper.java.command=java
-
-#wrapper.debug=TRUE
-wrapper.working.dir=../..
-
-# Java Main class.  This class must implement the WrapperListener interface
-#  or guarantee that the WrapperManager class is initialized.  Helper
-#  classes are provided to do this for you.  See the Integration section
-#  of the documentation for details.
-wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
-
-# Java Classpath (include wrapper.jar)  Add class path elements as
-#  needed starting from 1
-wrapper.java.classpath.1=bin/core/boot/wrapper.jar
-wrapper.java.classpath.2=bin/run.jar
-wrapper.java.classpath.3=conf/
-wrapper.java.classpath.4=lib/
-wrapper.java.classpath.5=lib/optional/
-wrapper.java.classpath.6=./
-
-# Java Library Path (location of Wrapper.DLL or libwrapper.so)
-wrapper.java.library.path.1=bin/linux/
-
-# Java Additional Parameters
-# note that n is the parameter number starting from 1.
-wrapper.java.additional.1=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
-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=./
-
-# 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
-
-# Uncomment to enable YourKit profiling
-#wrapper.java.additional.n=-Xrunyjpagent
-
-# Uncomment to enable remote debugging
-#wrapper.java.additional.n=-Xdebug -Xnoagent -Djava.compiler=NONE 
-#wrapper.java.additional.n=-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
-
-# Initial Java Heap Size (in MB)
-#wrapper.java.initmemory=3
-
-# Maximum Java Heap Size (in MB)
-wrapper.java.maxmemory=512
-
-# Application parameters.  Add parameters as needed starting from 1
-wrapper.app.parameter.1=org.apache.activemq.console.Main
-
-#********************************************************************
-# Wrapper Logging Properties
-#********************************************************************
-# Format of output for the console.  (See docs for formats)
-wrapper.console.format=PM
-
-# Log Level for console output.  (See docs for log levels)
-wrapper.console.loglevel=INFO
-
-# Log file to use for wrapper output logging.
-wrapper.logfile=bin/linux/wrapper.log
-
-# Format of output for the log file.  (See docs for formats)
-wrapper.logfile.format=LPTM
-
-# Log Level for log file output.  (See docs for log levels)
-wrapper.logfile.loglevel=INFO
-
-# Maximum size that the log file will be allowed to grow to before
-#  the log is rolled. Size is specified in bytes.  The default value
-#  of 0, disables log rolling.  May abbreviate with the 'k' (kb) or
-#  'm' (mb) suffix.  For example: 10m = 10 megabytes.
-wrapper.logfile.maxsize=0
-
-# Maximum number of rolled log files which will be allowed before old
-#  files are deleted.  The default value of 0 implies no limit.
-wrapper.logfile.maxfiles=0
-
-# Log Level for sys/event log output.  (See docs for log levels)
-wrapper.syslog.loglevel=NONE
-
-#********************************************************************
-# Wrapper Windows Properties
-#********************************************************************
-# Title to use when running as a console
-wrapper.console.title=ActiveMQ
-
-#********************************************************************
-# Wrapper Windows NT/2000/XP Service Properties
-#********************************************************************
-# WARNING - Do not modify any of these properties when an application
-#  using this configuration file has been installed as a service.
-#  Please uninstall the service before modifying this section.  The
-#  service can then be reinstalled.
-
-# Name of the service
-wrapper.ntservice.name=ActiveMQ
-
-# Display name of the service
-wrapper.ntservice.displayname=ActiveMQ
-
-# Description of the service
-wrapper.ntservice.description=ActiveMQ Broker
-
-# Service dependencies.  Add dependencies as needed starting from 1
-wrapper.ntservice.dependency.1=
-
-# Mode in which the service is installed.  AUTO_START or DEMAND_START
-wrapper.ntservice.starttype=AUTO_START
-
-# Allow the service to interact with the desktop.
-wrapper.ntservice.interactive=false
+# ------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ------------------------------------------------------------------------
+
+#********************************************************************
+# Wrapper Properties
+#********************************************************************
+
+#wrapper.debug=TRUE
+set.default.ACTIVEMQ_HOME=../..
+set.default.ACTIVEMQ_BASE=../..
+wrapper.working.dir=.
+
+# Java Application
+wrapper.java.command=java
+
+# Java Main class.  This class must implement the WrapperListener interface
+#  or guarantee that the WrapperManager class is initialized.  Helper
+#  classes are provided to do this for you.  See the Integration section
+#  of the documentation for details.
+wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
+
+# Java Classpath (include wrapper.jar)  Add class path elements as
+#  needed starting from 1
+wrapper.java.classpath.1=%ACTIVEMQ_HOME%/bin/wrapper.jar
+wrapper.java.classpath.2=%ACTIVEMQ_HOME%/bin/run.jar
+
+# Java Library Path (location of Wrapper.DLL or libwrapper.so)
+wrapper.java.library.path.1=%ACTIVEMQ_HOME%/bin/linux/
+
+# Java Additional Parameters
+# note that n is the parameter number starting from 1.
+wrapper.java.additional.1=-Dactivemq.home=%ACTIVEMQ_HOME%
+wrapper.java.additional.2=-Dactivemq.base=%ACTIVEMQ_BASE%
+wrapper.java.additional.3=-Djavax.net.ssl.keyStorePassword=password
+wrapper.java.additional.4=-Djavax.net.ssl.trustStorePassword=password
+wrapper.java.additional.5=-Djavax.net.ssl.keyStore=%ACTIVEMQ_BASE%/conf/broker.ks
+wrapper.java.additional.6=-Djavax.net.ssl.trustStore=%ACTIVEMQ_BASE%/conf/broker.ts
+wrapper.java.additional.7=-Dcom.sun.management.jmxremote
+wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
+wrapper.java.additional.9=-Dderby.storage.fileSyncTransactionLog=true
+
+# 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
+
+# Uncomment to enable YourKit profiling
+#wrapper.java.additional.n=-Xrunyjpagent
+
+# Uncomment to enable remote debugging
+#wrapper.java.additional.n=-Xdebug -Xnoagent -Djava.compiler=NONE 
+#wrapper.java.additional.n=-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
+
+# Initial Java Heap Size (in MB)
+#wrapper.java.initmemory=3
+
+# Maximum Java Heap Size (in MB)
+wrapper.java.maxmemory=512
+
+# Application parameters.  Add parameters as needed starting from 1
+wrapper.app.parameter.1=org.apache.activemq.console.Main
+
+#********************************************************************
+# Wrapper Logging Properties
+#********************************************************************
+# Format of output for the console.  (See docs for formats)
+wrapper.console.format=PM
+
+# Log Level for console output.  (See docs for log levels)
+wrapper.console.loglevel=INFO
+
+# Log file to use for wrapper output logging.
+wrapper.logfile=%ACTIVEMQ_BASE%/activemq-data/wrapper.log
+
+# Format of output for the log file.  (See docs for formats)
+wrapper.logfile.format=LPTM
+
+# Log Level for log file output.  (See docs for log levels)
+wrapper.logfile.loglevel=INFO
+
+# Maximum size that the log file will be allowed to grow to before
+#  the log is rolled. Size is specified in bytes.  The default value
+#  of 0, disables log rolling.  May abbreviate with the 'k' (kb) or
+#  'm' (mb) suffix.  For example: 10m = 10 megabytes.
+wrapper.logfile.maxsize=0
+
+# Maximum number of rolled log files which will be allowed before old
+#  files are deleted.  The default value of 0 implies no limit.
+wrapper.logfile.maxfiles=0
+
+# Log Level for sys/event log output.  (See docs for log levels)
+wrapper.syslog.loglevel=NONE
+
+#********************************************************************
+# Wrapper Windows Properties
+#********************************************************************
+# Title to use when running as a console
+wrapper.console.title=ActiveMQ
+
+#********************************************************************
+# Wrapper Windows NT/2000/XP Service Properties
+#********************************************************************
+# WARNING - Do not modify any of these properties when an application
+#  using this configuration file has been installed as a service.
+#  Please uninstall the service before modifying this section.  The
+#  service can then be reinstalled.
+
+# Name of the service
+wrapper.ntservice.name=ActiveMQ
+
+# Display name of the service
+wrapper.ntservice.displayname=ActiveMQ
+
+# Description of the service
+wrapper.ntservice.description=ActiveMQ Broker
+
+# Service dependencies.  Add dependencies as needed starting from 1
+wrapper.ntservice.dependency.1=
+
+# Mode in which the service is installed.  AUTO_START or DEMAND_START
+wrapper.ntservice.starttype=AUTO_START
+
+# Allow the service to interact with the desktop.
+wrapper.ntservice.interactive=false

Propchange: incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/linux/wrapper.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/macosx/wrapper.conf
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/macosx/wrapper.conf?view=diff&rev=474931&r1=474930&r2=474931
==============================================================================
--- incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/macosx/wrapper.conf
(original)
+++ incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/macosx/wrapper.conf
Tue Nov 14 11:35:09 2006
@@ -15,122 +15,124 @@
 # limitations under the License.
 # ------------------------------------------------------------------------
 
-#********************************************************************
-# Wrapper Properties
-#********************************************************************
-
-# Java Application
-wrapper.java.command=java
-
-#wrapper.debug=TRUE
-wrapper.working.dir=../..
-
-# Java Main class.  This class must implement the WrapperListener interface
-#  or guarantee that the WrapperManager class is initialized.  Helper
-#  classes are provided to do this for you.  See the Integration section
-#  of the documentation for details.
-wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
-
-# Java Classpath (include wrapper.jar)  Add class path elements as
-#  needed starting from 1
-wrapper.java.classpath.1=bin/core/boot/wrapper.jar
-wrapper.java.classpath.2=bin/run.jar
-wrapper.java.classpath.3=conf/
-wrapper.java.classpath.4=lib/
-wrapper.java.classpath.5=lib/optional/
-wrapper.java.classpath.6=./
-
-# Java Library Path (location of Wrapper.DLL or libwrapper.so)
-wrapper.java.library.path.1=bin/macosx/
-
-# Java Additional Parameters
-# note that n is the parameter number starting from 1.
-wrapper.java.additional.1=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
-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=.
-
-# 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
-
-# Uncomment to enable YourKit profiling
-#wrapper.java.additional.n=-Xrunyjpagent
-
-# Uncomment to enable remote debugging
-#wrapper.java.additional.n=-Xdebug -Xnoagent -Djava.compiler=NONE 
-#wrapper.java.additional.n=-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
-
-# Initial Java Heap Size (in MB)
-#wrapper.java.initmemory=3
-
-# Maximum Java Heap Size (in MB)
-wrapper.java.maxmemory=512
-
-# Application parameters.  Add parameters as needed starting from 1
-wrapper.app.parameter.1=org.apache.activemq.console.Main
-
-#********************************************************************
-# Wrapper Logging Properties
-#********************************************************************
-# Format of output for the console.  (See docs for formats)
-wrapper.console.format=PM
-
-# Log Level for console output.  (See docs for log levels)
-wrapper.console.loglevel=INFO
-
-# Log file to use for wrapper output logging.
-wrapper.logfile=bin/linux/wrapper.log
-
-# Format of output for the log file.  (See docs for formats)
-wrapper.logfile.format=LPTM
-
-# Log Level for log file output.  (See docs for log levels)
-wrapper.logfile.loglevel=INFO
-
-# Maximum size that the log file will be allowed to grow to before
-#  the log is rolled. Size is specified in bytes.  The default value
-#  of 0, disables log rolling.  May abbreviate with the 'k' (kb) or
-#  'm' (mb) suffix.  For example: 10m = 10 megabytes.
-wrapper.logfile.maxsize=0
-
-# Maximum number of rolled log files which will be allowed before old
-#  files are deleted.  The default value of 0 implies no limit.
-wrapper.logfile.maxfiles=0
-
-# Log Level for sys/event log output.  (See docs for log levels)
-wrapper.syslog.loglevel=NONE
-
-#********************************************************************
-# Wrapper Windows Properties
-#********************************************************************
-# Title to use when running as a console
-wrapper.console.title=ActiveMQ
-
-#********************************************************************
-# Wrapper Windows NT/2000/XP Service Properties
-#********************************************************************
-# WARNING - Do not modify any of these properties when an application
-#  using this configuration file has been installed as a service.
-#  Please uninstall the service before modifying this section.  The
-#  service can then be reinstalled.
-
-# Name of the service
-wrapper.ntservice.name=ActiveMQ
-
-# Display name of the service
-wrapper.ntservice.displayname=ActiveMQ
-
-# Description of the service
-wrapper.ntservice.description=ActiveMQ Broker
-
-# Service dependencies.  Add dependencies as needed starting from 1
-wrapper.ntservice.dependency.1=
-
-# Mode in which the service is installed.  AUTO_START or DEMAND_START
-wrapper.ntservice.starttype=AUTO_START
-
-# Allow the service to interact with the desktop.
-wrapper.ntservice.interactive=false
+#********************************************************************
+# Wrapper Properties
+#********************************************************************
+
+#wrapper.debug=TRUE
+set.default.ACTIVEMQ_HOME=../..
+set.default.ACTIVEMQ_BASE=../..
+wrapper.working.dir=.
+
+# Java Application
+wrapper.java.command=java
+
+# Java Main class.  This class must implement the WrapperListener interface
+#  or guarantee that the WrapperManager class is initialized.  Helper
+#  classes are provided to do this for you.  See the Integration section
+#  of the documentation for details.
+wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
+
+# Java Classpath (include wrapper.jar)  Add class path elements as
+#  needed starting from 1
+wrapper.java.classpath.1=%ACTIVEMQ_HOME%/bin/wrapper.jar
+wrapper.java.classpath.2=%ACTIVEMQ_HOME%/bin/run.jar
+
+# Java Library Path (location of Wrapper.DLL or libwrapper.so)
+wrapper.java.library.path.1=%ACTIVEMQ_HOME%/bin/macosx/
+
+# Java Additional Parameters
+# note that n is the parameter number starting from 1.
+wrapper.java.additional.1=-Dactivemq.home=%ACTIVEMQ_HOME%
+wrapper.java.additional.2=-Dactivemq.base=%ACTIVEMQ_BASE%
+wrapper.java.additional.3=-Djavax.net.ssl.keyStorePassword=password
+wrapper.java.additional.4=-Djavax.net.ssl.trustStorePassword=password
+wrapper.java.additional.5=-Djavax.net.ssl.keyStore=%ACTIVEMQ_BASE%/conf/broker.ks
+wrapper.java.additional.6=-Djavax.net.ssl.trustStore=%ACTIVEMQ_BASE%/conf/broker.ts
+wrapper.java.additional.7=-Dcom.sun.management.jmxremote
+wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
+wrapper.java.additional.9=-Dderby.storage.fileSyncTransactionLog=true
+
+# 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
+
+# Uncomment to enable YourKit profiling
+#wrapper.java.additional.n=-Xrunyjpagent
+
+# Uncomment to enable remote debugging
+#wrapper.java.additional.n=-Xdebug -Xnoagent -Djava.compiler=NONE 
+#wrapper.java.additional.n=-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
+
+# Initial Java Heap Size (in MB)
+#wrapper.java.initmemory=3
+
+# Maximum Java Heap Size (in MB)
+wrapper.java.maxmemory=512
+
+# Application parameters.  Add parameters as needed starting from 1
+wrapper.app.parameter.1=org.apache.activemq.console.Main
+
+#********************************************************************
+# Wrapper Logging Properties
+#********************************************************************
+# Format of output for the console.  (See docs for formats)
+wrapper.console.format=PM
+
+# Log Level for console output.  (See docs for log levels)
+wrapper.console.loglevel=INFO
+
+# Log file to use for wrapper output logging.
+wrapper.logfile=%ACTIVEMQ_BASE%/activemq-data/wrapper.log
+
+# Format of output for the log file.  (See docs for formats)
+wrapper.logfile.format=LPTM
+
+# Log Level for log file output.  (See docs for log levels)
+wrapper.logfile.loglevel=INFO
+
+# Maximum size that the log file will be allowed to grow to before
+#  the log is rolled. Size is specified in bytes.  The default value
+#  of 0, disables log rolling.  May abbreviate with the 'k' (kb) or
+#  'm' (mb) suffix.  For example: 10m = 10 megabytes.
+wrapper.logfile.maxsize=0
+
+# Maximum number of rolled log files which will be allowed before old
+#  files are deleted.  The default value of 0 implies no limit.
+wrapper.logfile.maxfiles=0
+
+# Log Level for sys/event log output.  (See docs for log levels)
+wrapper.syslog.loglevel=NONE
+
+#********************************************************************
+# Wrapper Windows Properties
+#********************************************************************
+# Title to use when running as a console
+wrapper.console.title=ActiveMQ
+
+#********************************************************************
+# Wrapper Windows NT/2000/XP Service Properties
+#********************************************************************
+# WARNING - Do not modify any of these properties when an application
+#  using this configuration file has been installed as a service.
+#  Please uninstall the service before modifying this section.  The
+#  service can then be reinstalled.
+
+# Name of the service
+wrapper.ntservice.name=ActiveMQ
+
+# Display name of the service
+wrapper.ntservice.displayname=ActiveMQ
+
+# Description of the service
+wrapper.ntservice.description=ActiveMQ Broker
+
+# Service dependencies.  Add dependencies as needed starting from 1
+wrapper.ntservice.dependency.1=
+
+# Mode in which the service is installed.  AUTO_START or DEMAND_START
+wrapper.ntservice.starttype=AUTO_START
+
+# Allow the service to interact with the desktop.
+wrapper.ntservice.interactive=false

Propchange: incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/macosx/wrapper.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/win32/InstallService.bat
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/win32/InstallService.bat?view=diff&rev=474931&r1=474930&r2=474931
==============================================================================
--- incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/win32/InstallService.bat
(original)
+++ incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/win32/InstallService.bat
Tue Nov 14 11:35:09 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/branches/activemq-4.1/assembly/src/release/bin/win32/UninstallService.bat
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/win32/UninstallService.bat?view=diff&rev=474931&r1=474930&r2=474931
==============================================================================
--- incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/win32/UninstallService.bat
(original)
+++ incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/win32/UninstallService.bat
Tue Nov 14 11:35:09 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/branches/activemq-4.1/assembly/src/release/bin/win32/activemq.bat
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/win32/activemq.bat?view=diff&rev=474931&r1=474930&r2=474931
==============================================================================
--- incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/win32/activemq.bat (original)
+++ incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/win32/activemq.bat Tue
Nov 14 11:35:09 2006
@@ -31,9 +31,6 @@
 rem %~dp0 is name of current script under NT
 set _APP_HOME=%~dp0
 
-rem Set ActiveMQ Home
-set ACTIVEMQ_HOME=%~dp0..\..
-
 rem
 rem Find the wrapper.conf
 rem

Modified: incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/win32/wrapper.conf
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/win32/wrapper.conf?view=diff&rev=474931&r1=474930&r2=474931
==============================================================================
--- incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/win32/wrapper.conf (original)
+++ incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/win32/wrapper.conf Tue
Nov 14 11:35:09 2006
@@ -1,134 +1,138 @@
-# ------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-# 
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ------------------------------------------------------------------------
-
-#********************************************************************
-# Wrapper Properties
-#********************************************************************
-
-# Java Application
-wrapper.java.command=%JAVA_HOME%/bin/java
-
-#wrapper.debug=TRUE
-wrapper.working.dir=../..
-
-# Java Main class.  This class must implement the WrapperListener interface
-#  or guarantee that the WrapperManager class is initialized.  Helper
-#  classes are provided to do this for you.  See the Integration section
-#  of the documentation for details.
-wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
-
-# Java Classpath (include wrapper.jar)  Add class path elements as
-#  needed starting from 1
-wrapper.java.classpath.1=bin/core/boot/wrapper.jar
-wrapper.java.classpath.2=bin/run.jar
-wrapper.java.classpath.3=conf/
-wrapper.java.classpath.4=lib/
-wrapper.java.classpath.5=lib/optional/
-wrapper.java.classpath.6=./
-
-# Java Library Path (location of Wrapper.DLL or libwrapper.so)
-wrapper.java.library.path.1=bin/win32
-
-# Java Additional Parameters
-# note that n is the parameter number starting from 1.
-wrapper.java.additional.1=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
-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%
-
-# 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
-
-# Uncomment to enable YourKit profiling
-#wrapper.java.additional.n=-Xrunyjpagent
-
-# Uncomment to enable remote debugging
-#wrapper.java.additional.n=-Xdebug -Xnoagent -Djava.compiler=NONE 
-#wrapper.java.additional.n=-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
-
-# Initial Java Heap Size (in MB)
-#wrapper.java.initmemory=3
-
-# Maximum Java Heap Size (in MB)
-wrapper.java.maxmemory=512
-
-# Application parameters.  Add parameters as needed starting from 1
-wrapper.app.parameter.1=org.apache.activemq.console.Main
-
-#********************************************************************
-# Wrapper Logging Properties
-#********************************************************************
-# Format of output for the console.  (See docs for formats)
-wrapper.console.format=PM
-
-# Log Level for console output.  (See docs for log levels)
-wrapper.console.loglevel=INFO
-
-# Log file to use for wrapper output logging.
-wrapper.logfile=bin/win32/wrapper.log
-
-# Format of output for the log file.  (See docs for formats)
-wrapper.logfile.format=LPTM
-
-# Log Level for log file output.  (See docs for log levels)
-wrapper.logfile.loglevel=INFO
-
-# Maximum size that the log file will be allowed to grow to before
-#  the log is rolled. Size is specified in bytes.  The default value
-#  of 0, disables log rolling.  May abbreviate with the 'k' (kb) or
-#  'm' (mb) suffix.  For example: 10m = 10 megabytes.
-wrapper.logfile.maxsize=0
-
-# Maximum number of rolled log files which will be allowed before old
-#  files are deleted.  The default value of 0 implies no limit.
-wrapper.logfile.maxfiles=0
-
-# Log Level for sys/event log output.  (See docs for log levels)
-wrapper.syslog.loglevel=NONE
-
-#********************************************************************
-# Wrapper Windows Properties
-#********************************************************************
-# Title to use when running as a console
-wrapper.console.title=ActiveMQ
-
-#********************************************************************
-# Wrapper Windows NT/2000/XP Service Properties
-#********************************************************************
-# WARNING - Do not modify any of these properties when an application
-#  using this configuration file has been installed as a service.
-#  Please uninstall the service before modifying this section.  The
-#  service can then be reinstalled.
-
-# Name of the service
-wrapper.ntservice.name=ActiveMQ
-
-# Display name of the service
-wrapper.ntservice.displayname=ActiveMQ
-
-# Description of the service
-wrapper.ntservice.description=ActiveMQ Broker
-
-# Service dependencies.  Add dependencies as needed starting from 1
-wrapper.ntservice.dependency.1=
-
-# Mode in which the service is installed.  AUTO_START or DEMAND_START
-wrapper.ntservice.starttype=AUTO_START
-
-# Allow the service to interact with the desktop.
-wrapper.ntservice.interactive=false
+# ------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ------------------------------------------------------------------------
+
+#********************************************************************
+# Wrapper Properties
+#********************************************************************
+
+# wrapper.debug=TRUE
+set.default.ACTIVEMQ_HOME=../..
+set.default.ACTIVEMQ_BASE=../..
+wrapper.working.dir=.
+
+# Java Application
+wrapper.java.command=%JAVA_HOME%/bin/java
+
+# Java Main class.  This class must implement the WrapperListener interface
+#  or guarantee that the WrapperManager class is initialized.  Helper
+#  classes are provided to do this for you.  See the Integration section
+#  of the documentation for details.
+wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
+
+# Java Classpath (include wrapper.jar)  Add class path elements as
+#  needed starting from 1
+wrapper.java.classpath.1=%ACTIVEMQ_HOME%/bin/wrapper.jar
+wrapper.java.classpath.2=%ACTIVEMQ_HOME%/bin/run.jar
+
+# Java Library Path (location of Wrapper.DLL or libwrapper.so)
+wrapper.java.library.path.1=%ACTIVEMQ_HOME%/bin/win32
+
+# Java Additional Parameters
+# note that n is the parameter number starting from 1.
+wrapper.java.additional.1=-Dactivemq.home=%ACTIVEMQ_HOME%
+wrapper.java.additional.2=-Dactivemq.base=%ACTIVEMQ_BASE%
+wrapper.java.additional.3=-Djavax.net.ssl.keyStorePassword=password
+wrapper.java.additional.4=-Djavax.net.ssl.trustStorePassword=password
+wrapper.java.additional.5=-Djavax.net.ssl.keyStore=%ACTIVEMQ_BASE%/conf/broker.ks
+wrapper.java.additional.6=-Djavax.net.ssl.trustStore=%ACTIVEMQ_BASE%/conf/broker.ts
+wrapper.java.additional.7=-Dcom.sun.management.jmxremote
+wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
+wrapper.java.additional.9=-Dderby.storage.fileSyncTransactionLog=true
+
+# Uncomment to enable remote 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
+
+# Uncomment to enable YourKit profiling
+#wrapper.java.additional.n=-Xrunyjpagent
+
+# Uncomment to enable remote debugging
+#wrapper.java.additional.n=-Xdebug -Xnoagent -Djava.compiler=NONE 
+#wrapper.java.additional.n=-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
+
+# Initial Java Heap Size (in MB)
+#wrapper.java.initmemory=3
+
+# Maximum Java Heap Size (in MB)
+wrapper.java.maxmemory=512
+
+# Application parameters.  Add parameters as needed starting from 1
+wrapper.app.parameter.1=org.apache.activemq.console.Main
+
+#********************************************************************
+# Wrapper Logging Properties
+#********************************************************************
+# Format of output for the console.  (See docs for formats)
+wrapper.console.format=PM
+
+# Log Level for console output.  (See docs for log levels)
+wrapper.console.loglevel=INFO
+
+# Log file to use for wrapper output logging.
+wrapper.logfile=%ACTIVEMQ_BASE%/activemq-data/wrapper.log
+
+# Format of output for the log file.  (See docs for formats)
+wrapper.logfile.format=LPTM
+
+# Log Level for log file output.  (See docs for log levels)
+wrapper.logfile.loglevel=INFO
+
+# Maximum size that the log file will be allowed to grow to before
+#  the log is rolled. Size is specified in bytes.  The default value
+#  of 0, disables log rolling.  May abbreviate with the 'k' (kb) or
+#  'm' (mb) suffix.  For example: 10m = 10 megabytes.
+wrapper.logfile.maxsize=0
+
+# Maximum number of rolled log files which will be allowed before old
+#  files are deleted.  The default value of 0 implies no limit.
+wrapper.logfile.maxfiles=0
+
+# Log Level for sys/event log output.  (See docs for log levels)
+wrapper.syslog.loglevel=NONE
+
+#********************************************************************
+# Wrapper Windows Properties
+#********************************************************************
+# Title to use when running as a console
+wrapper.console.title=ActiveMQ
+
+#********************************************************************
+# Wrapper Windows NT/2000/XP Service Properties
+#********************************************************************
+# WARNING - Do not modify any of these properties when an application
+#  using this configuration file has been installed as a service.
+#  Please uninstall the service before modifying this section.  The
+#  service can then be reinstalled.
+
+# Name of the service
+wrapper.ntservice.name=ActiveMQ
+
+# Display name of the service
+wrapper.ntservice.displayname=ActiveMQ
+
+# Description of the service
+wrapper.ntservice.description=ActiveMQ Broker
+
+# Service dependencies.  Add dependencies as needed starting from 1
+wrapper.ntservice.dependency.1=
+
+# Mode in which the service is installed.  AUTO_START or DEMAND_START
+wrapper.ntservice.starttype=AUTO_START
+
+# Allow the service to interact with the desktop.
+wrapper.ntservice.interactive=false

Propchange: incubator/activemq/branches/activemq-4.1/assembly/src/release/bin/win32/wrapper.conf
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message