servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r796121 - in /servicemix/smx4/features/trunk/assembly: pom.xml src/main/descriptors/unix-bin.xml src/main/descriptors/windows-bin.xml src/main/distribution/ant/
Date Tue, 21 Jul 2009 02:24:46 GMT
Author: ffang
Date: Tue Jul 21 02:24:46 2009
New Revision: 796121

URL: http://svn.apache.org/viewvc?rev=796121&view=rev
Log:
[SMX4-324]feature kit should reuse the ant related files from nmr kit

Removed:
    servicemix/smx4/features/trunk/assembly/src/main/distribution/ant/
Modified:
    servicemix/smx4/features/trunk/assembly/pom.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml

Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=796121&r1=796120&r2=796121&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Tue Jul 21 02:24:46 2009
@@ -943,6 +943,13 @@
                                     <type>tar.gz</type>
                                     <outputDirectory>target/dependencies/unix</outputDirectory>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.servicemix.nmr</groupId>
+                                    <artifactId>apache-servicemix-nmr</artifactId>
+                                    <version>${servicemix.nmr.version}</version>
+                                    <type>tar.gz</type>
+                                    <outputDirectory>target/dependencies/unix</outputDirectory>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>
@@ -961,6 +968,13 @@
                                     <type>zip</type>
                                     <outputDirectory>target/dependencies/win</outputDirectory>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.servicemix.nmr</groupId>
+                                    <artifactId>apache-servicemix-nmr</artifactId>
+                                    <version>${servicemix.nmr.version}</version>
+                                    <type>zip</type>
+                                    <outputDirectory>target/dependencies/win</outputDirectory>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>

Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=796121&r1=796120&r2=796121&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml Tue Jul 21 02:24:46
2009
@@ -57,6 +57,13 @@
               <include>**/smx4web/**</include>
             </includes>
         </fileSet>
+       
+       <!-- Copy over ant files -->
+       <fileSet>
+            <directory>target/dependencies/unix/apache-servicemix-nmr-${servicemix.nmr.version}/ant</directory>
+            <outputDirectory>/ant</outputDirectory>
+            <lineEnding>unix</lineEnding>
+       </fileSet>
 
         <!-- Copy license and other files from root -->
         <fileSet>
@@ -89,11 +96,6 @@
             <outputDirectory>/etc/</outputDirectory>
             <lineEnding>unix</lineEnding>
         </fileSet>
-        <fileSet>
-            <directory>src/main/distribution/ant</directory>
-            <outputDirectory>/ant</outputDirectory>
-            <lineEnding>unix</lineEnding>
-        </fileSet>
 
         <!-- Copy over the examples -->
         <fileSet>

Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=796121&r1=796120&r2=796121&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml Tue Jul 21
02:24:46 2009
@@ -46,6 +46,13 @@
             <include>**/smx4web/**</include>
           </includes>
       </fileSet>
+      
+      <!-- Copy over ant files -->
+       <fileSet>
+            <directory>target/dependencies/unix/apache-servicemix-nmr-${servicemix.nmr.version}/ant</directory>
+            <outputDirectory>/ant</outputDirectory>
+            <lineEnding>dos</lineEnding>
+       </fileSet>
 
       <!-- Copy license and other files from root -->
       <fileSet>
@@ -69,11 +76,6 @@
           <outputDirectory>/etc/</outputDirectory>
           <lineEnding>dos</lineEnding>
       </fileSet>
-      <fileSet>
-            <directory>src/main/distribution/ant</directory>
-            <outputDirectory>/ant</outputDirectory>
-            <lineEnding>dos</lineEnding>
-        </fileSet>
 
       <!-- Copy over jar files -->
       <fileSet>



Mime
View raw message