You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2011/02/25 10:30:27 UTC

svn commit: r1074453 - in /servicemix/smx4/features/trunk/assembly/src/main/descriptors: unix-bin.xml windows-bin.xml

Author: jbonofre
Date: Fri Feb 25 09:30:26 2011
New Revision: 1074453

URL: http://svn.apache.org/viewvc?rev=1074453&view=rev
Log:
[SMX4-763] Exclude web examples from the distribution.

Modified:
    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/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=1074453&r1=1074452&r2=1074453&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 Fri Feb 25 09:30:26 2011
@@ -146,6 +146,7 @@
                 <exclude>**/.settings/**</exclude>
                 <exclude>**/wsdl-first/**</exclude>
                 <exclude>**/loan-broker-bpel/**</exclude>
+                <exclude>**/web/**</exclude>
             </excludes>
         </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=1074453&r1=1074452&r2=1074453&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 Fri Feb 25 09:30:26 2011
@@ -34,6 +34,9 @@
              <exclude>etc/users.properties</exclude>
              <exclude>etc/custom.properties</exclude>
              <exclude>etc/jre.properties</exclude>
+             <!-- SMX4-764 - Override the Felix Framework version -->
+             <exclude>etc/config.properties</exclude>
+             <exclude>system/org/apache/felix/org.apache.felix.framework/**</exclude>
              <exclude>LICENSE</exclude>
              <exclude>NOTICE</exclude>
              <exclude>README</exclude>
@@ -126,6 +129,7 @@
               <exclude>**/.settings/**</exclude>
               <exclude>**/wsdl-first/**</exclude>
               <exclude>**/loan-broker-bpel/**</exclude>
+              <exclude>**/web/**</exclude>
           </excludes>
       </fileSet>
 
@@ -428,6 +432,16 @@
                 <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
             </includes>
         </dependencySet>
+        <!-- SMX4-764 - Override the Felix Framework version -->
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.felix:org.apache.felix.framework</include>
+            </includes>
+        </dependencySet>
 
     </dependencySets>