activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1392820 - in /activemq/trunk/assembly/src: main/descriptors/unix-bin.xml release/example/perfharness/perfharness-activemq.sh
Date Tue, 02 Oct 2012 09:54:54 GMT
Author: davsclaus
Date: Tue Oct  2 09:54:54 2012
New Revision: 1392820

URL: http://svn.apache.org/viewvc?rev=1392820&view=rev
Log:
AMQ-4088: Filtered the example scripts so they can use the AMQ version number in their scripts.

Modified:
    activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
    activemq/trunk/assembly/src/release/example/perfharness/perfharness-activemq.sh

Modified: activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=1392820&r1=1392819&r2=1392820&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/unix-bin.xml Tue Oct  2 09:54:54 2012
@@ -76,13 +76,26 @@
         <include>bin/activemq-admin</include>
         <include>bin/macosx/activemq</include>
         <include>bin/linux-*/activemq</include>
+      </includes>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0755</fileMode>
+      <lineEnding>unix</lineEnding>
+	</fileSet>
+
+    <!-- Copy over example scripts that need unix line endings and also chmod to 755 -->
+    <fileSet>
+      <directory>src/release</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
         <include>example/**/*.sh</include>
         <include>example/**/*.rb</include>
       </includes>
       <directoryMode>0755</directoryMode>
       <fileMode>0755</fileMode>
       <lineEnding>unix</lineEnding>
-    </fileSet>
+	  <!-- need to filter to ensure script files have AMQ version number included -->
+      <filtered>true</filtered>
+	</fileSet>
 
   </fileSets>
 

Modified: activemq/trunk/assembly/src/release/example/perfharness/perfharness-activemq.sh
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/example/perfharness/perfharness-activemq.sh?rev=1392820&r1=1392819&r2=1392820&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/example/perfharness/perfharness-activemq.sh (original)
+++ activemq/trunk/assembly/src/release/example/perfharness/perfharness-activemq.sh Tue Oct
 2 09:54:54 2012
@@ -22,15 +22,15 @@
 # Sample Usage: 
 #   ./perfharness-activemq.sh -d dynamicQueues/FOO -tc jms.r11.PutGet -nt 6
 #
-# It assumes that the apache-activemq JAR and 
+# It assumes that the apache-activemq-${project.version}.jar and 
 # perfharness.jar files are in the current directory.  If they are not,
 # set the ACTIVEMQ_HOME and PERFHARNESS_HOME env variable to the correct location.
 #
 # You can download the perfharness.jar file from:
 # http://www.alphaworks.ibm.com/tech/perfharness
 #
-# By Default the test connects the the vm://localhost broker.  To change that, use
-# set the BROKER_URL to the broker url you want to use.
+# By Default the test connects the the vm://localhost broker.
+# To change that, use set the BROKER_URL to the broker url you want to use.
 #
 # ==================================================================
 



Mime
View raw message