activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1179837 - in /activemq/trunk: assembly/src/main/descriptors/common-bin.xml assembly/src/main/descriptors/unix-bin.xml assembly/src/main/descriptors/unix-src.xml pom.xml
Date Thu, 06 Oct 2011 20:35:51 GMT
Author: tabish
Date: Thu Oct  6 20:35:51 2011
New Revision: 1179837

URL: http://svn.apache.org/viewvc?rev=1179837&view=rev
Log:
Move to the latest Apache parent pom and fix some permission issues in the assembly generation.

Modified:
    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/pom.xml

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=1179837&r1=1179836&r2=1179837&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/common-bin.xml Thu Oct  6 20:35:51 2011
@@ -6,9 +6,9 @@
     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.
@@ -30,7 +30,7 @@
         <include>conf/*.cert</include>
       </includes>
     </fileSet>
-    
+
     <!-- Copy over all sample configurations -->
     <fileSet>
       <directory>src/sample-conf</directory>
@@ -79,10 +79,10 @@
         <include>**/*.class</include>
       </includes>
     </fileSet>
-  </fileSets> 
-  
+  </fileSets>
+
   <dependencySets>
-    
+
     <!-- Copy over jar files -->
     <dependencySet>
       <outputDirectory>/bin</outputDirectory>
@@ -103,9 +103,6 @@
           <exclude>**/act*.jar</exclude>
           <exclude>**/ant*.jar</exclude>
           <exclude>**/aop*.jar</exclude>
-<!--
-          <exclude>**/asm*.jar</exclude>
--->
           <exclude>**/camel-*.jar</exclude>
           <exclude>**/commons*.jar</exclude>
           <exclude>**/groovy*.jar</exclude>
@@ -132,7 +129,7 @@
         <include>org.apache.camel:camel-web:war</include>
       </includes>
     </dependencySet>
-    
+
     <dependencySet>
       <outputDirectory>/</outputDirectory>
       <unpack>false</unpack>
@@ -140,6 +137,7 @@
       <includes>
         <include>${pom.groupId}:activemq-all</include>
       </includes>
+      <fileMode>0755</fileMode>
     </dependencySet>
     <dependencySet>
       <outputDirectory>/lib</outputDirectory>

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=1179837&r1=1179836&r2=1179837&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/unix-bin.xml Thu Oct  6 20:35:51 2011
@@ -6,9 +6,9 @@
     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.
@@ -32,6 +32,8 @@
         <exclude>conf/*.ks</exclude>
         <exclude>conf/*.cert</exclude>
       </excludes>
+      <fileMode>0644</fileMode>
+      <directoryMode>0755</directoryMode>
       <lineEnding>unix</lineEnding>
     </fileSet>
     <fileSet>
@@ -41,6 +43,8 @@
         <include>bin/macosx/wrapper.conf</include>
         <include>bin/linux-*/wrapper.conf</include>
       </includes>
+      <fileMode>0644</fileMode>
+      <directoryMode>0755</directoryMode>
       <lineEnding>unix</lineEnding>
     </fileSet>
 
@@ -55,6 +59,7 @@
         <include>bin/macosx/libwrapper.jnilib</include>
       </includes>
       <fileMode>0755</fileMode>
+      <directoryMode>0755</directoryMode>
     </fileSet>
 
     <!-- Copy over the files that need unix line endings and also chmod to 755 -->
@@ -67,14 +72,15 @@
         <include>bin/macosx/activemq</include>
         <include>bin/linux-*/activemq</include>
       </includes>
+      <directoryMode>0755</directoryMode>
       <fileMode>0755</fileMode>
       <lineEnding>unix</lineEnding>
     </fileSet>
 
   </fileSets>
-  
+
   <componentDescriptors>
     <componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
   </componentDescriptors>
-    
+
 </assembly>

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=1179837&r1=1179836&r2=1179837&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/unix-src.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/unix-src.xml Thu Oct  6 20:35:51 2011
@@ -6,9 +6,9 @@
   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.
@@ -46,6 +46,8 @@
         <exclude>**/eclipse-classes/**</exclude>
         <exclude>**/target/**</exclude>
       </excludes>
+      <fileMode>0755</fileMode>
+      <directoryMode>0755</directoryMode>
     </fileSet>
 
     <!-- Text Files -->
@@ -91,6 +93,8 @@
         <exclude>**/cobertura.ser</exclude>
 
       </excludes>
+      <fileMode>0644</fileMode>
+      <directoryMode>0755</directoryMode>
       <lineEnding>unix</lineEnding>
     </fileSet>
   </fileSets>

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1179837&r1=1179836&r2=1179837&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Thu Oct  6 20:35:51 2011
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>7</version>
+    <version>9</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 



Mime
View raw message