Return-Path: 
 <activemq-commits-return-3688-apmail-geronimo-activemq-commits-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org
Received: (qmail 62735 invoked from network); 19 Oct 2006 21:42:09 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 19 Oct 2006 21:42:09 -0000
Received: (qmail 67493 invoked by uid 500); 19 Oct 2006 21:42:09 -0000
Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org
Received: (qmail 67447 invoked by uid 500); 19 Oct 2006 21:42:09 -0000
Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:activemq-commits-help@geronimo.apache.org>
List-Unsubscribe: <mailto:activemq-commits-unsubscribe@geronimo.apache.org>
List-Post: <mailto:activemq-commits@geronimo.apache.org>
List-Id: <activemq-commits.geronimo.apache.org>
Reply-To: activemq-dev@geronimo.apache.org
Delivered-To: mailing list activemq-commits@geronimo.apache.org
Received: (qmail 67438 invoked by uid 99); 19 Oct 2006 21:42:09 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Oct 2006 14:42:09 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Oct 2006 14:42:06 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id CDE8E1A981A; Thu, 19 Oct 2006 14:41:45 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r465903 - in /incubator/activemq/trunk/assembly/src:
 main/descriptors/unix-bin.xml main/descriptors/windows-bin.xml
 release/bin/activemq release/bin/activemq.bat release/conf/activemq.xml
 release/conf/broker.ts
Date: Thu, 19 Oct 2006 21:41:45 -0000
To: activemq-commits@geronimo.apache.org
From: chirino@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061019214145.CDE8E1A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: chirino
Date: Thu Oct 19 14:41:42 2006
New Revision: 465903

URL: http://svn.apache.org/viewvc?view=rev&rev=465903
Log:
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.


Added:
    incubator/activemq/trunk/assembly/src/release/conf/broker.ts   (with props)
Modified:
    incubator/activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
    incubator/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
    incubator/activemq/trunk/assembly/src/release/bin/activemq
    incubator/activemq/trunk/assembly/src/release/bin/activemq.bat
    incubator/activemq/trunk/assembly/src/release/conf/activemq.xml

Modified: incubator/activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/main/descriptors/unix-bin.xml?view=diff&rev=465903&r1=465902&r2=465903
==============================================================================
--- incubator/activemq/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ incubator/activemq/trunk/assembly/src/main/descriptors/unix-bin.xml Thu Oct 19 14:41:42 2006
@@ -22,33 +22,72 @@
     <format>tar.bz2</format>
   </formats>
   <fileSets>
-    <!-- I don't think the STATUS file is required.
+
+    <!-- Copy over everything that needs to get unix line endings -->
     <fileSet>
-      <directory>..</directory>
+      <directory>src/release</directory>
+      <outputDirectory>/</outputDirectory>
+      <excludes>
+        <exclude>bin/**</exclude>
+        <exclude>conf/*.ts</exclude>
+        <exclude>conf/*.ks</exclude>
+        <exclude>conf/*.cert</exclude>
+      </excludes>
+      <lineEnding>unix</lineEnding>
+    </fileSet>
+    <fileSet>
+      <directory>src/release</directory>
       <outputDirectory>/</outputDirectory>
       <includes>
-        <include>STATUS*</include>
+        <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>
-      <excludes>
-        <exclude>bin/*</exclude>
-      </excludes>
-      <lineEnding>unix</lineEnding>
+      <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/bin</directory>
-      <outputDirectory>/bin</outputDirectory>
-      <excludes>
-        <exclude>*.bat</exclude>
-      </excludes>
+      <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>

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=465903&r1=465902&r2=465903
==============================================================================
--- incubator/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ incubator/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml Thu Oct 19 14:41:42 2006
@@ -21,21 +21,44 @@
     <format>zip</format>
   </formats>
   <fileSets>
-    <!-- I don't think the STATUS file is required.
+
+    <!-- Copy over everything that needs to get dos line endings -->
     <fileSet>
-      <directory>..</directory>
+      <directory>src/release</directory>
       <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>STATUS*</include>
-      </includes>
+      <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>

Modified: incubator/activemq/trunk/assembly/src/release/bin/activemq
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/bin/activemq?view=diff&rev=465903&r1=465902&r2=465903
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/bin/activemq (original)
+++ incubator/activemq/trunk/assembly/src/release/bin/activemq Thu Oct 19 14:41:42 2006
@@ -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 @@
     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 @@
   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 @@
   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_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
 
 

Modified: incubator/activemq/trunk/assembly/src/release/bin/activemq.bat
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/bin/activemq.bat?view=diff&rev=465903&r1=465902&r2=465903
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/bin/activemq.bat (original)
+++ incubator/activemq/trunk/assembly/src/release/bin/activemq.bat Thu Oct 19 14:41:42 2006
@@ -84,11 +84,15 @@
 
 :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 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
 

Modified: incubator/activemq/trunk/assembly/src/release/conf/activemq.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/conf/activemq.xml?view=diff&rev=465903&r1=465902&r2=465903
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/conf/activemq.xml (original)
+++ incubator/activemq/trunk/assembly/src/release/conf/activemq.xml Thu Oct 19 14:41:42 2006
@@ -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>
     

Added: incubator/activemq/trunk/assembly/src/release/conf/broker.ts
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/conf/broker.ts?view=auto&rev=465903
==============================================================================
Binary file - no diff available.

Propchange: incubator/activemq/trunk/assembly/src/release/conf/broker.ts
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream