activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1392810 - in /activemq/trunk/assembly: ./ src/main/descriptors/common-bin.xml src/main/descriptors/unix-bin.xml src/main/descriptors/unix-src.xml src/main/descriptors/windows-bin.xml src/main/descriptors/windows-src.xml
Date Tue, 02 Oct 2012 09:33:05 GMT
Author: davsclaus
Date: Tue Oct  2 09:33:04 2012
New Revision: 1392810

URL: http://svn.apache.org/viewvc?rev=1392810&view=rev
Log:
AMQ-4088: Unix kit examples should have execute permission on scripts by default.

Modified:
    activemq/trunk/assembly/   (props changed)
    activemq/trunk/assembly/src/main/descriptors/common-bin.xml
    activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
    activemq/trunk/assembly/src/main/descriptors/unix-src.xml
    activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
    activemq/trunk/assembly/src/main/descriptors/windows-src.xml

Propchange: activemq/trunk/assembly/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Oct  2 09:33:04 2012
@@ -8,3 +8,6 @@ activemq-data
 testJournalConfig
 *.iml
 eclipse-classes
+.idea
+derbydb
+derby.log

Modified: activemq/trunk/assembly/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/common-bin.xml?rev=1392810&r1=1392809&r2=1392810&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/common-bin.xml Tue Oct  2 09:33:04 2012
@@ -16,21 +16,8 @@
     limitations under the License.
 -->
 <component>
-  <!--<id>common-bin</id>-->
 
   <fileSets>
-    <!-- Copy over files that should not get the line endings converted -->
-    <fileSet>
-      <directory>src/release</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>bin/*.jar</include>
-        <include>conf/*.ts</include>
-        <include>conf/*.ks</include>
-        <include>conf/*.cert</include>
-        <include>webapps/*.ico</include>
-      </includes>
-    </fileSet>
 
     <!-- Copy over all sample configurations -->
     <fileSet>

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=1392810&r1=1392809&r2=1392810&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:33:04 2012
@@ -16,10 +16,12 @@
     limitations under the License.
 -->
 <assembly>
+
   <id>bin</id>
   <formats>
     <format>tar.gz</format>
   </formats>
+
   <fileSets>
 
     <!-- Copy over everything that needs to get unix line endings -->
@@ -31,7 +33,9 @@
         <exclude>conf/*.ts</exclude>
         <exclude>conf/*.ks</exclude>
         <exclude>conf/*.cert</exclude>
-      </excludes>
+        <exclude>example/**/*.sh</exclude>
+		<exclude>example/**/*.rb</exclude>
+	  </excludes>
       <fileMode>0644</fileMode>
       <directoryMode>0755</directoryMode>
       <lineEnding>unix</lineEnding>
@@ -51,7 +55,7 @@
     <!-- 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>
+      <outputDirectory>/</outputDirectory>
       <includes>
         <include>bin/linux-*/wrapper</include>
         <include>bin/linux-*/libwrapper.so</include>
@@ -65,7 +69,7 @@
     <!-- Copy over the files that need unix line endings and also chmod to 755 -->
     <fileSet>
       <directory>src/release</directory>
-      <outputDirectory></outputDirectory>
+      <outputDirectory>/</outputDirectory>
       <includes>
         <include>bin/activemq</include>
         <include>bin/diag</include>

Modified: activemq/trunk/assembly/src/main/descriptors/unix-src.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/unix-src.xml?rev=1392810&r1=1392809&r2=1392810&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/unix-src.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/unix-src.xml Tue Oct  2 09:33:04 2012
@@ -16,10 +16,12 @@
   limitations under the License.
 -->
 <assembly>
+
   <id>src</id>
   <formats>
     <format>tar.gz</format>
   </formats>
+
   <fileSets>
     <!-- Binary Files -->
     <fileSet>
@@ -78,8 +80,6 @@
         <exclude>assembly/src/release/bin/*/wrapper</exclude>
         <exclude>**/target/**</exclude>
         <exclude>**/build/**</exclude>
-        <!-- exclude>data/**</exclude>
-        <exclude>*/data/**</exclude -->
         <exclude>activemq-data/**</exclude>
         <exclude>*/activemq-data/**</exclude>
         <exclude>**/eclipse-classes/**</exclude>
@@ -100,5 +100,7 @@
       <directoryMode>0755</directoryMode>
       <lineEnding>unix</lineEnding>
     </fileSet>
+
   </fileSets>
+
 </assembly>

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=1392810&r1=1392809&r2=1392810&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/windows-bin.xml Tue Oct  2 09:33:04 2012
@@ -20,6 +20,7 @@
   <formats>
     <format>zip</format>
   </formats>
+
   <fileSets>
 
     <!-- Copy over everything that needs to get dos line endings -->
@@ -61,7 +62,7 @@
     <!-- Copy over files that should not get the line endings converted -->
     <fileSet>
       <directory>src/release</directory>
-      <outputDirectory></outputDirectory>
+      <outputDirectory>/</outputDirectory>
       <includes>
         <include>bin/win32/*.exe</include>
         <include>bin/win32/*.dll</include>

Modified: activemq/trunk/assembly/src/main/descriptors/windows-src.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/windows-src.xml?rev=1392810&r1=1392809&r2=1392810&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/windows-src.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/windows-src.xml Tue Oct  2 09:33:04 2012
@@ -16,10 +16,12 @@
   limitations under the License.
 -->
 <assembly>
+
   <id>src</id>
   <formats>
     <format>zip</format>
   </formats>
+
   <fileSets>
     <!-- Binary Files -->
     <fileSet>
@@ -77,8 +79,6 @@
 
         <exclude>**/target/**</exclude>
         <exclude>**/build/**</exclude>
-        <!-- exclude>data/**</exclude>
-        <exclude>*/data/**</exclude -->
         <exclude>activemq-data/**</exclude>
         <exclude>*/activemq-data/**</exclude>
         <exclude>**/eclipse-classes/**</exclude>
@@ -97,5 +97,7 @@
       </excludes>
       <lineEnding>dos</lineEnding>
     </fileSet>
+
   </fileSets>
+
 </assembly>



Mime
View raw message