Updated startup shell scripts so that

- SSL_OPTS variable is set/overriden to configure the SSL options that are use to start up the ssl connector.
 - Added a ACTIVEMQ_BASE variable that default to be ACTIVEMQ_HOME but can be changed if you want multiple broker instances sharing the same broker installation.
 - Updated the assembly descriptors so that we are more careful about which file's line endings are translated or chmoded to 755.
 - the .zip is now specific to windows and the .tar.* packages are specific to unix flavors including cygwin.



git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@465903 13f79535-47bb-0310-9956-ffa450edef68

assembly/src/main/descriptors/unix-bin.xml

@@ -22,33 +22,72 @@
     <format>tar.bz2</format>
   </formats>
   <fileSets>
-    <!-- I don't think the STATUS file is required.
-    <fileSet>
-      <directory>..</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>STATUS*</include>
-      </includes>
-      <lineEnding>unix</lineEnding>
-    </fileSet>
-    -->
+
+    <!-- Copy over everything that needs to get unix line endings -->
     <fileSet>
       <directory>src/release</directory>
       <outputDirectory>/</outputDirectory>
       <excludes>
-        <exclude>bin/*</exclude>
+        <exclude>bin/**</exclude>
+        <exclude>conf/*.ts</exclude>
+        <exclude>conf/*.ks</exclude>
+        <exclude>conf/*.cert</exclude>
       </excludes>
       <lineEnding>unix</lineEnding>
     </fileSet>
     <fileSet>
-      <directory>src/release/bin</directory>
-      <outputDirectory>/bin</outputDirectory>
-      <excludes>
-        <exclude>*.bat</exclude>
-      </excludes>
+      <directory>src/release</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>bin/macosx/wrapper.conf</include>
+        <include>bin/linux/wrapper.conf</include>
+      </includes>
+      <lineEnding>unix</lineEnding>
+    </fileSet>
+
+    <!-- Copy over files that should not get the line endings converted -->
+    <fileSet>
+      <directory>src/release</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>conf/*.ts</include>
+        <include>conf/*.ks</include>
+        <include>conf/*.cert</include>
+      </includes>
+    </fileSet>
+
+    <!-- Copy over the files that should not get the line endings converted but need to be chmod to 755 -->
+    <fileSet>
+      <directory>src/release</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>bin/linux/wrapper</include>
+        <include>bin/linux/libwrapper.so</include>
+        <include>bin/macosx/wrapper</include>
+        <include>bin/macosx/libwrapper.jnilib</include>
+      </includes>
+      <fileMode>0755</fileMode>
+    </fileSet>
+
+    <!-- Copy over the files that need unix line endings and also chmod to 755 -->
+    <fileSet>
+      <directory>src/release</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>bin/activemq</include>
+        <include>bin/browse</include>
+        <include>bin/bstat</include>
+        <include>bin/list</include>
+        <include>bin/query</include>
+        <include>bin/shutdown</include>
+        <include>bin/macosx/activemq</include>
+        <include>bin/linux/activemq</include>
+      </includes>
       <fileMode>0755</fileMode>
       <lineEnding>unix</lineEnding>
     </fileSet>
+
+    <!-- Copy over jar files -->
     <fileSet>
       <directory>target</directory>
       <outputDirectory>/</outputDirectory>

assembly/src/main/descriptors/windows-bin.xml

@@ -21,21 +21,44 @@
     <format>zip</format>
   </formats>
   <fileSets>
-    <!-- I don't think the STATUS file is required.
-    <fileSet>
-      <directory>..</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>STATUS*</include>
-      </includes>
-      <lineEnding>dos</lineEnding>
-    </fileSet>
-    -->
+
+    <!-- Copy over everything that needs to get dos line endings -->
     <fileSet>
       <directory>src/release</directory>
       <outputDirectory>/</outputDirectory>
+      <excludes>
+        <exclude>bin/**</exclude>
+        <exclude>conf/*.ts</exclude>
+        <exclude>conf/*.ks</exclude>
+        <exclude>conf/*.cert</exclude>
+      </excludes>
       <lineEnding>dos</lineEnding>
     </fileSet>
+    <fileSet>
+      <directory>src/release</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>bin/*.bat</include>
+        <include>bin/win32/*.bat</include>
+        <include>bin/win32/*.conf</include>
+      </includes>
+      <lineEnding>dos</lineEnding>
+    </fileSet>
+
+    <!-- Copy over files that should not get the line endings converted -->
+    <fileSet>
+      <directory>src/release</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>conf/*.ts</include>
+        <include>conf/*.ks</include>
+        <include>conf/*.cert</include>
+        <include>bin/win32/*.exe</include>
+        <include>bin/win32/*.dll</include>
+      </includes>
+    </fileSet>
+
+    <!-- Copy over jar files -->
     <fileSet>
       <directory>target</directory>
       <outputDirectory>/</outputDirectory>

assembly/src/release/bin/activemq

@@ -1,5 +1,4 @@
 #!/bin/sh
-
 # ------------------------------------------------------------------------
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -67,9 +66,9 @@ if [ -z "$ACTIVEMQ_HOME" ] ; then
     ls=`ls -ld "$PRG"`
     link=`expr "$ls" : '.*-> \(.*\)$'`
     if expr "$link" : '.*/.*' > /dev/null; then
-	PRG="$link"
+    PRG="$link"
     else
-	PRG=`dirname "$PRG"`"/$link"
+    PRG=`dirname "$PRG"`"/$link"
     fi
   done
 
@@ -113,17 +112,21 @@ if [ ! -x "$JAVACMD" ] ; then
   exit 1
 fi
 
+if [ -z "$ACTIVEMQ_BASE" ] ; then
+  ACTIVEMQ_BASE="$ACTIVEMQ_HOME"
+fi
+
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then
   ACTIVEMQ_HOME=`cygpath --windows "$ACTIVEMQ_HOME"`
+  ACTIVEMQ_BASE=`cygpath --windows "$ACTIVEMQ_BASE"`
   JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
   CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
   CYGHOME=`cygpath --windows "$HOME"`
 fi
 
-
 if [ -z "$ACTIVEMQ_OPTS" ] ; then
-  ACTIVEMQ_OPTS="-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Dderby.system.home=../data -Dderby.storage.fileSyncTransactionLog=true"
+  ACTIVEMQ_OPTS="-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Dderby.system.home=${ACTIVEMQ_BASE}/data -Dderby.storage.fileSyncTransactionLog=true"
 fi
 
 if [ -z "$SUNJMX" ] ; then
@@ -131,7 +134,11 @@ if [ -z "$SUNJMX" ] ; then
   SUNJMX="-Dcom.sun.management.jmxremote"
 fi
 
-ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $SUNJMX"
+if [ -z "$SSL_OPTS" ] ; then
+  SSL_OPTS="-Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStorePassword=password -Djavax.net.ssl.keyStore=${ACTIVEMQ_BASE}/conf/broker.ks -Djavax.net.ssl.trustStore=${ACTIVEMQ_BASE}/conf/broker.ts"
+fi
+
+ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $SUNJMX $SSL_OPTS"
 # Uncomment to enable YourKit profiling
 #ACTIVEMQ_DEBUG_OPTS="-Xrunyjpagent"
 
@@ -140,9 +147,9 @@ ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $SUNJMX"
 
 #ACTIVEMQ_TASK="start"
 if [ -n "$CYGHOME" ]; then
-    exec "$JAVACMD" $ACTIVEMQ_DEBUG_OPTS $ACTIVEMQ_OPTS -classpath "${ACTIVEMQ_CLASSPATH}" -Dactivemq.home="${ACTIVEMQ_HOME}" -Dcygwin.user.home="$CYGHOME" -jar "${ACTIVEMQ_HOME}/bin/run.jar" $ACTIVEMQ_TASK $@
+    exec "$JAVACMD" $ACTIVEMQ_DEBUG_OPTS $ACTIVEMQ_OPTS -classpath "${ACTIVEMQ_CLASSPATH}" -Dactivemq.home="${ACTIVEMQ_HOME}" -Dactivemq.base="${ACTIVEMQ_BASE}" -Dcygwin.user.home="$CYGHOME" -jar "${ACTIVEMQ_HOME}/bin/run.jar" $ACTIVEMQ_TASK $@
 else
-    exec "$JAVACMD" $ACTIVEMQ_DEBUG_OPTS $ACTIVEMQ_OPTS -classpath "${ACTIVEMQ_CLASSPATH}" -Dactivemq.home="${ACTIVEMQ_HOME}" -jar "${ACTIVEMQ_HOME}/bin/run.jar" $ACTIVEMQ_TASK $@
+    exec "$JAVACMD" $ACTIVEMQ_DEBUG_OPTS $ACTIVEMQ_OPTS -classpath "${ACTIVEMQ_CLASSPATH}" -Dactivemq.home="${ACTIVEMQ_HOME}" -Dactivemq.base="${ACTIVEMQ_BASE}" -jar "${ACTIVEMQ_HOME}/bin/run.jar" $ACTIVEMQ_TASK $@
 fi
 
 

assembly/src/release/bin/activemq.bat

@@ -84,11 +84,15 @@ echo.
 
 :runAnt
 
-if "%ACTIVEMQ_OPTS%" == "" set ACTIVEMQ_OPTS=-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Dderby.system.home="..\data" -Dderby.storage.fileSyncTransactionLog=true -Dcom.sun.management.jmxremote
+if "%ACTIVEMQ_BASE%" == "" set ACTIVEMQ_BASE=%ACTIVEMQ_HOME%
+
+if "%ACTIVEMQ_OPTS%" == "" set ACTIVEMQ_OPTS=-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Dderby.system.home="%ACTIVEMQ_BASE%\data" -Dderby.storage.fileSyncTransactionLog=true
 
 if "%SUNJMX%" == "" set SUNJMX=-Dcom.sun.management.jmxremote
 REM set SUNJMX=-Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false
 
+if "%SSL_OPTS%" == "" set SSL_OPTS=-Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStorePassword=password -Djavax.net.ssl.keyStore="%ACTIVEMQ_BASE%/conf/broker.ks" -Djavax.net.ssl.trustStore="%ACTIVEMQ_BASE%/conf/broker.ts"
+
 REM Uncomment to enable YourKit profiling
 REM SET ACTIVEMQ_DEBUG_OPTS="-Xrunyjpagent"
 
@@ -96,7 +100,7 @@ REM Uncomment to enable remote debugging
 REM SET ACTIVEMQ_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
 
 set ACTIVEMQ_TASK="start"
-"%_JAVACMD%" %SUNJMX% %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS% -classpath "%ACTIVEMQ_CLASSPATH%" -Dactivemq.home="%ACTIVEMQ_HOME%" -jar "%ACTIVEMQ_HOME%/bin/run.jar" %ACTIVEMQ_TASK% %ACTIVEMQ_CMD_LINE_ARGS%
+"%_JAVACMD%" %SUNJMX% %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS% %SSL_OPTS% -classpath "%ACTIVEMQ_CLASSPATH%" -Dactivemq.home="%ACTIVEMQ_HOME%" -Dactivemq.base="%ACTIVEMQ_BASE%" -jar "%ACTIVEMQ_HOME%/bin/run.jar" %ACTIVEMQ_TASK% %ACTIVEMQ_CMD_LINE_ARGS%
 
 goto end
 

assembly/src/release/conf/activemq.xml

@@ -61,6 +61,7 @@
   
     <transportConnectors>
        <transportConnector name="default" uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
+       <transportConnector name="ssl"     uri="ssl://localhost:61617"/>
        <transportConnector name="stomp"   uri="stomp://localhost:61613"/>
     </transportConnectors>