servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r1188130 - in /servicemix/smx4/features/trunk: ./ assemblies/apache-servicemix-full/src/main/descriptors/ assemblies/apache-servicemix-jbi/src/main/descriptors/ assemblies/apache-servicemix/ assemblies/apache-servicemix/src/main/descriptors...
Date Mon, 24 Oct 2011 12:51:54 GMT
Author: gertv
Date: Mon Oct 24 12:51:53 2011
New Revision: 1188130

URL: http://svn.apache.org/viewvc?rev=1188130&view=rev
Log:
SMX4-939: Split out the examples into a separate component descriptor

Added:
    servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/examples-unix-bin.xml
      - copied, changed from r1188128, servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/unix-bin.xml
    servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/examples-windows-bin.xml
      - copied, changed from r1188128, servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/windows-bin.xml
Removed:
    servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/unix-src.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/windows-src.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/unix-src.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/windows-src.xml
Modified:
    servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/unix-bin.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/windows-bin.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/unix-bin.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/windows-bin.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/pom.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-src.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-src.xml
    servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
    servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
    servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
    servicemix/smx4/features/trunk/parent/pom.xml
    servicemix/smx4/features/trunk/pom.xml

Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/unix-bin.xml?rev=1188130&r1=1188129&r2=1188130&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/unix-bin.xml Mon Oct 24 12:51:53 2011
@@ -28,182 +28,7 @@
     <componentDescriptors>
         <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
         <componentDescriptor>target/shared/common-unix-bin.xml</componentDescriptor>
+        <componentDescriptor>target/shared/examples-unix-bin.xml</componentDescriptor>
     </componentDescriptors>
 
-    <fileSets>
-        <!-- Copy over karaf demo to examples folder -->
-        <fileSet>
-            <directory>target/dependencies/unix/apache-karaf-${karaf.version}/demos</directory>
-            <outputDirectory>/examples/karaf-demos</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <includes>
-              <include>pom.xml</include>
-              <include>**/web/**</include>
-            </includes>
-        </fileSet>
-
-        <!-- Copy over the examples -->
-        <fileSet>
-            <directory>${basedir}/../../examples</directory>
-            <outputDirectory>/examples/</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <excludes>
-                <exclude>pom.xml</exclude>
-                <!-- we need add filtered README.txt, so exclude the raw one here -->
-                <exclude>**/README.txt</exclude>
-                <!-- exclude the integration tests -->
-                <exclude>**/itests/**</exclude>
-                <!-- exclude build output/IDE config/... files -->
-                <exclude>**/target/**</exclude>
-                <exclude>**/.classpath</exclude>
-                <exclude>**/.project</exclude>
-                <exclude>**/.settings/**</exclude>
-                <exclude>**/*.i??</exclude>
-                <!-- exclude these 3 failing demos -->
-                <exclude>**/wsdl-first/**</exclude>
-                <exclude>**/loan-broker-bpel/**</exclude>
-                <exclude>**/web/**</exclude>
-            </excludes>
-        </fileSet>
-
-    </fileSets>
-
-    <files>
-        <!--filtering README.txt-->
-        <file>
-            <source>${basedir}/../../examples/README.txt</source>
-            <outputDirectory>/examples/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/bridge/README.txt</source>
-            <outputDirectory>/examples/bridge</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-ws-addressing/README.txt</source>
-            <outputDirectory>/examples/cxf-ws-addressing</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-jaxrs/README.txt</source>
-            <outputDirectory>/examples/cxf-jaxrs</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-wsdl-first-osgi-package/README.txt</source>
-            <outputDirectory>/examples/cxf-wsdl-first-osgi-package</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/bridge-camel/README.txt</source>
-            <outputDirectory>/examples/bridge-camel</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/camel/README.txt</source>
-            <outputDirectory>/examples/camel</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/camel-blueprint/README.txt</source>
-            <outputDirectory>/examples/camel-blueprint</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-wsdl-first/README.txt</source>
-            <outputDirectory>/examples/cxf-wsdl-first</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/camel-osgi/README.txt</source>
-            <outputDirectory>/examples/camel-osgi</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/camel-nmr/README.txt</source>
-            <outputDirectory>/examples/camel-nmr</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-          <source>${basedir}/../../examples/camel-nmr-blueprint/README.txt</source>
-          <outputDirectory>/examples/camel-nmr-blueprint</outputDirectory>
-          <filtered>true</filtered>
-          <fileMode>0644</fileMode>
-          <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-nmr/README.txt</source>
-            <outputDirectory>/examples/cxf-nmr</outputDirectory>               
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-osgi/README.txt</source>
-            <outputDirectory>/examples/cxf-osgi</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-ws-security-osgi/README.txt</source>
-            <outputDirectory>/examples/cxf-ws-security-osgi</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-ws-rm/README.txt</source>
-            <outputDirectory>/examples/cxf-ws-rm</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-
-        <file>
-            <source>${basedir}/../../examples/cxf-camel-nmr/README.txt</source>
-            <outputDirectory>/examples/cxf-camel-nmr</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/simple/README.txt</source>
-            <outputDirectory>/examples/simple</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/shared/pom.xml</source>
-            <outputDirectory>/examples/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-    </files>
-
 </assembly>

Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/windows-bin.xml?rev=1188130&r1=1188129&r2=1188130&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/windows-bin.xml Mon Oct 24 12:51:53 2011
@@ -27,194 +27,7 @@
     <componentDescriptors>
         <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
         <componentDescriptor>target/shared/common-windows-bin.xml</componentDescriptor>
+        <componentDescriptor>target/shared/examples-windows-bin.xml</componentDescriptor>
     </componentDescriptors>
 
-    <fileSets>
-      <!-- Copy over kernel demo to examples folder -->
-      <fileSet>
-          <directory>target/dependencies/win/apache-karaf-${karaf.version}/demos</directory>
-          <outputDirectory>/examples/karaf-demos</outputDirectory>
-          <lineEnding>dos</lineEnding>
-          <includes>
-            <include>pom.xml</include>
-            <include>**/web/**</include>
-          </includes>
-      </fileSet>
-
-      <!-- Copy over nmr examples files -->
-      <fileSet>
-           <directory>target/dependencies/win/apache-servicemix-nmr-${servicemix.nmr.version}/examples</directory>
-           <outputDirectory>/examples/</outputDirectory>
-           <excludes>
-               <exclude>pom.xml</exclude>
-               <exclude>**/itests/**</exclude>
-               <exclude>**/target/**</exclude>
-               <exclude>**/.classpath</exclude>
-               <exclude>**/.project</exclude>
-               <exclude>**/.settings/**</exclude>
-           </excludes>
-           <lineEnding>dos</lineEnding>
-      </fileSet>
-
-      <!-- Copy over the examples -->
-      <fileSet>
-          <directory>${basedir}/../../examples</directory>
-          <outputDirectory>/examples/</outputDirectory>
-          <lineEnding>dos</lineEnding>
-          <excludes>
-              <exclude>pom.xml</exclude>
-              <!--we need add filtered README.txt, so exclude the raw one here-->
-              <exclude>**/README.txt</exclude>
-              <exclude>**/itests/**</exclude>
-              <exclude>**/target/**</exclude>
-              <exclude>**/.classpath</exclude>
-              <exclude>**/.project</exclude>
-              <exclude>**/.settings/**</exclude>
-              <exclude>**/wsdl-first/**</exclude>
-              <exclude>**/loan-broker-bpel/**</exclude>
-              <exclude>**/web/**</exclude>
-          </excludes>
-      </fileSet>
-    </fileSets>
-
-    <files>
-        <!--filtering README.txt-->
-        <file>
-            <source>${basedir}/../../examples/README.txt</source>
-            <outputDirectory>/examples/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-
-        <file>
-              <source>${basedir}/../../examples/bridge/README.txt</source>
-              <outputDirectory>/examples/bridge</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../../examples/cxf-ws-addressing/README.txt</source>
-              <outputDirectory>/examples/cxf-ws-addressing</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../../examples/cxf-jaxrs/README.txt</source>
-              <outputDirectory>/examples/cxf-jaxrs</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-wsdl-first-osgi-package/README.txt</source>
-            <outputDirectory>/examples/cxf-wsdl-first-osgi-package</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../../examples/bridge-camel/README.txt</source>
-              <outputDirectory>/examples/bridge-camel</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../../examples/camel/README.txt</source>
-              <outputDirectory>/examples/camel</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../../examples/camel-blueprint/README.txt</source>
-              <outputDirectory>/examples/camel-blueprint</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../../examples/cxf-wsdl-first/README.txt</source>
-              <outputDirectory>/examples/cxf-wsdl-first</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../../examples/camel-osgi/README.txt</source>
-              <outputDirectory>/examples/camel-osgi</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/../../examples/camel-nmr/README.txt</source>
-              <outputDirectory>/examples/camel-nmr</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-        <file>
-          <source>${basedir}/../../examples/camel-nmr-blueprint/README.txt</source>
-          <outputDirectory>/examples/camel-nmr-blueprint</outputDirectory>
-          <filtered>true</filtered>
-          <fileMode>0644</fileMode>
-          <lineEnding>dos</lineEnding>
-        </file>
-            <file>
-              <source>${basedir}/../../examples/cxf-nmr/README.txt</source>
-              <outputDirectory>/examples/cxf-nmr</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/../../examples/cxf-osgi/README.txt</source>
-              <outputDirectory>/examples/cxf-osgi</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/../../examples/cxf-ws-security-osgi/README.txt</source>
-              <outputDirectory>/examples/cxf-ws-security-osgi</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/../../examples/cxf-ws-rm/README.txt</source>
-              <outputDirectory>/examples/cxf-ws-rm</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-
-            <file>
-              <source>${basedir}/../../examples/cxf-camel-nmr/README.txt</source>
-              <outputDirectory>/examples/cxf-camel-nmr</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/../../examples/simple/README.txt</source>
-              <outputDirectory>/examples/simple</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/target/shared/pom.xml</source>
-              <outputDirectory>/examples/</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-
-    </files>
-
 </assembly>

Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/unix-bin.xml?rev=1188130&r1=1188129&r2=1188130&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/unix-bin.xml Mon Oct 24 12:51:53 2011
@@ -28,182 +28,7 @@
     <componentDescriptors>
         <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
         <componentDescriptor>target/shared/common-unix-bin.xml</componentDescriptor>
+        <componentDescriptor>target/shared/examples-unix-bin.xml</componentDescriptor>
     </componentDescriptors>
 
-    <fileSets>
-        <!-- Copy over karaf demo to examples folder -->
-        <fileSet>
-            <directory>target/dependencies/unix/apache-karaf-${karaf.version}/demos</directory>
-            <outputDirectory>/examples/karaf-demos</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <includes>
-              <include>pom.xml</include>
-              <include>**/web/**</include>
-            </includes>
-        </fileSet>
-
-        <!-- Copy over the examples -->
-        <fileSet>
-            <directory>${basedir}/../../examples</directory>
-            <outputDirectory>/examples/</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <excludes>
-                <exclude>pom.xml</exclude>
-                <!-- we need add filtered README.txt, so exclude the raw one here -->
-                <exclude>**/README.txt</exclude>
-                <!-- exclude the integration tests -->
-                <exclude>**/itests/**</exclude>
-                <!-- exclude build output/IDE config/... files -->
-                <exclude>**/target/**</exclude>
-                <exclude>**/.classpath</exclude>
-                <exclude>**/.project</exclude>
-                <exclude>**/.settings/**</exclude>
-                <exclude>**/*.i??</exclude>
-                <!-- exclude these 3 failing demos -->
-                <exclude>**/wsdl-first/**</exclude>
-                <exclude>**/loan-broker-bpel/**</exclude>
-                <exclude>**/web/**</exclude>
-            </excludes>
-        </fileSet>
-
-    </fileSets>
-
-    <files>
-        <!--filtering README.txt-->
-        <file>
-            <source>${basedir}/../../examples/README.txt</source>
-            <outputDirectory>/examples/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/bridge/README.txt</source>
-            <outputDirectory>/examples/bridge</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-ws-addressing/README.txt</source>
-            <outputDirectory>/examples/cxf-ws-addressing</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-jaxrs/README.txt</source>
-            <outputDirectory>/examples/cxf-jaxrs</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-wsdl-first-osgi-package/README.txt</source>
-            <outputDirectory>/examples/cxf-wsdl-first-osgi-package</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/bridge-camel/README.txt</source>
-            <outputDirectory>/examples/bridge-camel</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/camel/README.txt</source>
-            <outputDirectory>/examples/camel</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/camel-blueprint/README.txt</source>
-            <outputDirectory>/examples/camel-blueprint</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-wsdl-first/README.txt</source>
-            <outputDirectory>/examples/cxf-wsdl-first</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/camel-osgi/README.txt</source>
-            <outputDirectory>/examples/camel-osgi</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/camel-nmr/README.txt</source>
-            <outputDirectory>/examples/camel-nmr</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-          <source>${basedir}/../../examples/camel-nmr-blueprint/README.txt</source>
-          <outputDirectory>/examples/camel-nmr-blueprint</outputDirectory>
-          <filtered>true</filtered>
-          <fileMode>0644</fileMode>
-          <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-nmr/README.txt</source>
-            <outputDirectory>/examples/cxf-nmr</outputDirectory>               
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-osgi/README.txt</source>
-            <outputDirectory>/examples/cxf-osgi</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-ws-security-osgi/README.txt</source>
-            <outputDirectory>/examples/cxf-ws-security-osgi</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-ws-rm/README.txt</source>
-            <outputDirectory>/examples/cxf-ws-rm</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-
-        <file>
-            <source>${basedir}/../../examples/cxf-camel-nmr/README.txt</source>
-            <outputDirectory>/examples/cxf-camel-nmr</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/simple/README.txt</source>
-            <outputDirectory>/examples/simple</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/shared/pom.xml</source>
-            <outputDirectory>/examples/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-    </files>
-
 </assembly>

Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/windows-bin.xml?rev=1188130&r1=1188129&r2=1188130&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/descriptors/windows-bin.xml Mon Oct 24 12:51:53 2011
@@ -27,194 +27,7 @@
     <componentDescriptors>
         <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
         <componentDescriptor>target/shared/common-windows-bin.xml</componentDescriptor>
+        <componentDescriptor>target/shared/examples-windows-bin.xml</componentDescriptor>
     </componentDescriptors>
 
-    <fileSets>
-      <!-- Copy over kernel demo to examples folder -->
-      <fileSet>
-          <directory>target/dependencies/win/apache-karaf-${karaf.version}/demos</directory>
-          <outputDirectory>/examples/karaf-demos</outputDirectory>
-          <lineEnding>dos</lineEnding>
-          <includes>
-            <include>pom.xml</include>
-            <include>**/web/**</include>
-          </includes>
-      </fileSet>
-
-      <!-- Copy over nmr examples files -->
-      <fileSet>
-           <directory>target/dependencies/win/apache-servicemix-nmr-${servicemix.nmr.version}/examples</directory>
-           <outputDirectory>/examples/</outputDirectory>
-           <excludes>
-               <exclude>pom.xml</exclude>
-               <exclude>**/itests/**</exclude>
-               <exclude>**/target/**</exclude>
-               <exclude>**/.classpath</exclude>
-               <exclude>**/.project</exclude>
-               <exclude>**/.settings/**</exclude>
-           </excludes>
-           <lineEnding>dos</lineEnding>
-      </fileSet>
-
-      <!-- Copy over the examples -->
-      <fileSet>
-          <directory>${basedir}/../../examples</directory>
-          <outputDirectory>/examples/</outputDirectory>
-          <lineEnding>dos</lineEnding>
-          <excludes>
-              <exclude>pom.xml</exclude>
-              <!--we need add filtered README.txt, so exclude the raw one here-->
-              <exclude>**/README.txt</exclude>
-              <exclude>**/itests/**</exclude>
-              <exclude>**/target/**</exclude>
-              <exclude>**/.classpath</exclude>
-              <exclude>**/.project</exclude>
-              <exclude>**/.settings/**</exclude>
-              <exclude>**/wsdl-first/**</exclude>
-              <exclude>**/loan-broker-bpel/**</exclude>
-              <exclude>**/web/**</exclude>
-          </excludes>
-      </fileSet>
-    </fileSets>
-
-    <files>
-        <!--filtering README.txt-->
-        <file>
-            <source>${basedir}/../../examples/README.txt</source>
-            <outputDirectory>/examples/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-
-        <file>
-              <source>${basedir}/../../examples/bridge/README.txt</source>
-              <outputDirectory>/examples/bridge</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../../examples/cxf-ws-addressing/README.txt</source>
-              <outputDirectory>/examples/cxf-ws-addressing</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../../examples/cxf-jaxrs/README.txt</source>
-              <outputDirectory>/examples/cxf-jaxrs</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-wsdl-first-osgi-package/README.txt</source>
-            <outputDirectory>/examples/cxf-wsdl-first-osgi-package</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../../examples/bridge-camel/README.txt</source>
-              <outputDirectory>/examples/bridge-camel</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../../examples/camel/README.txt</source>
-              <outputDirectory>/examples/camel</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../../examples/camel-blueprint/README.txt</source>
-              <outputDirectory>/examples/camel-blueprint</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../../examples/cxf-wsdl-first/README.txt</source>
-              <outputDirectory>/examples/cxf-wsdl-first</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../../examples/camel-osgi/README.txt</source>
-              <outputDirectory>/examples/camel-osgi</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/../../examples/camel-nmr/README.txt</source>
-              <outputDirectory>/examples/camel-nmr</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-        <file>
-          <source>${basedir}/../../examples/camel-nmr-blueprint/README.txt</source>
-          <outputDirectory>/examples/camel-nmr-blueprint</outputDirectory>
-          <filtered>true</filtered>
-          <fileMode>0644</fileMode>
-          <lineEnding>dos</lineEnding>
-        </file>
-            <file>
-              <source>${basedir}/../../examples/cxf-nmr/README.txt</source>
-              <outputDirectory>/examples/cxf-nmr</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/../../examples/cxf-osgi/README.txt</source>
-              <outputDirectory>/examples/cxf-osgi</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/../../examples/cxf-ws-security-osgi/README.txt</source>
-              <outputDirectory>/examples/cxf-ws-security-osgi</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/../../examples/cxf-ws-rm/README.txt</source>
-              <outputDirectory>/examples/cxf-ws-rm</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-
-            <file>
-              <source>${basedir}/../../examples/cxf-camel-nmr/README.txt</source>
-              <outputDirectory>/examples/cxf-camel-nmr</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/../../examples/simple/README.txt</source>
-              <outputDirectory>/examples/simple</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/target/shared/pom.xml</source>
-              <outputDirectory>/examples/</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-
-    </files>
-
 </assembly>

Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/pom.xml?rev=1188130&r1=1188129&r2=1188130&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/pom.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/pom.xml Mon Oct 24 12:51:53 2011
@@ -333,6 +333,7 @@
                                         <descriptor>src/main/descriptors/unix-src.xml</descriptor>
                                     </descriptors>
                                 </configuration>
+                                <inherited>false</inherited>
                             </execution>
                             <execution>
                                 <id>windows-src</id>
@@ -345,6 +346,7 @@
                                         <descriptor>src/main/descriptors/windows-src.xml</descriptor>
                                     </descriptors>
                                 </configuration>
+                                <inherited>false</inherited>
                             </execution>
                         </executions>
                     </plugin>

Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml?rev=1188130&r1=1188129&r2=1188130&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml Mon Oct 24 12:51:53 2011
@@ -26,191 +26,18 @@
     <componentDescriptors>
         <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
         <componentDescriptor>target/shared/common-unix-bin.xml</componentDescriptor>
+        <componentDescriptor>target/shared/examples-unix-bin.xml</componentDescriptor>
     </componentDescriptors>
 
-    <fileSets>
-        <!-- Copy over karaf demo to examples folder -->
-        <fileSet>
-            <directory>target/dependencies/unix/apache-karaf-${karaf.version}/demos</directory>
-            <outputDirectory>/examples/karaf-demos</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <includes>
-              <include>pom.xml</include>
-              <include>**/web/**</include>
-            </includes>
-        </fileSet>
-
-        <!-- Copy over the examples -->
-        <fileSet>
-            <directory>${basedir}/../../examples</directory>
-            <outputDirectory>/examples/</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <excludes>
-                <exclude>pom.xml</exclude>
-                <!-- we need add filtered README.txt, so exclude the raw one here -->
-                <exclude>**/README.txt</exclude>
-                <!-- exclude the integration tests -->
-                <exclude>**/itests/**</exclude>
-                <!-- exclude build output/IDE config/... files -->
-                <exclude>**/target/**</exclude>
-                <exclude>**/.classpath</exclude>
-                <exclude>**/.project</exclude>
-                <exclude>**/.settings/**</exclude>
-                <exclude>**/*.i??</exclude>
-                <!-- exclude these 3 failing demos -->
-                <exclude>**/wsdl-first/**</exclude>
-                <exclude>**/loan-broker-bpel/**</exclude>
-                <exclude>**/web/**</exclude>
-            </excludes>
-        </fileSet>
-
-    </fileSets>
-
     <files>
-        <!-- Install the features descriptor into the system repository -->
         <file>
+        <!-- Install the features descriptor into the system repository -->
             <source>${basedir}/target/classes/features.xml</source>
             <outputDirectory>system/org/apache/servicemix/${artifactId}/${version}</outputDirectory>
             <destName>${artifactId}-${version}-features.xml</destName>
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
-
-        <!--filtering README.txt-->
-        <file>
-            <source>${basedir}/../../examples/README.txt</source>
-            <outputDirectory>/examples/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/bridge/README.txt</source>
-            <outputDirectory>/examples/bridge</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-ws-addressing/README.txt</source>
-            <outputDirectory>/examples/cxf-ws-addressing</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-jaxrs/README.txt</source>
-            <outputDirectory>/examples/cxf-jaxrs</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-wsdl-first-osgi-package/README.txt</source>
-            <outputDirectory>/examples/cxf-wsdl-first-osgi-package</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/bridge-camel/README.txt</source>
-            <outputDirectory>/examples/bridge-camel</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/camel/README.txt</source>
-            <outputDirectory>/examples/camel</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/camel-blueprint/README.txt</source>
-            <outputDirectory>/examples/camel-blueprint</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-wsdl-first/README.txt</source>
-            <outputDirectory>/examples/cxf-wsdl-first</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/camel-osgi/README.txt</source>
-            <outputDirectory>/examples/camel-osgi</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/camel-nmr/README.txt</source>
-            <outputDirectory>/examples/camel-nmr</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-          <source>${basedir}/../../examples/camel-nmr-blueprint/README.txt</source>
-          <outputDirectory>/examples/camel-nmr-blueprint</outputDirectory>
-          <filtered>true</filtered>
-          <fileMode>0644</fileMode>
-          <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-nmr/README.txt</source>
-            <outputDirectory>/examples/cxf-nmr</outputDirectory>               
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-osgi/README.txt</source>
-            <outputDirectory>/examples/cxf-osgi</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-ws-security-osgi/README.txt</source>
-            <outputDirectory>/examples/cxf-ws-security-osgi</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-ws-rm/README.txt</source>
-            <outputDirectory>/examples/cxf-ws-rm</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-
-        <file>
-            <source>${basedir}/../../examples/cxf-camel-nmr/README.txt</source>
-            <outputDirectory>/examples/cxf-camel-nmr</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/simple/README.txt</source>
-            <outputDirectory>/examples/simple</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/shared/pom.xml</source>
-            <outputDirectory>/examples/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
     </files>
 
 </assembly>

Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-src.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-src.xml?rev=1188130&r1=1188129&r2=1188130&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-src.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/unix-src.xml Mon Oct 24 12:51:53 2011
@@ -64,7 +64,7 @@
 
         <!-- Text Files -->
         <fileSet>
-            <directory>${basedir}/..</directory>
+            <directory>${basedir}/../..</directory>
             <outputDirectory>src</outputDirectory>
             <includes>
                 <include>**/*</include>

Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml?rev=1188130&r1=1188129&r2=1188130&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml Mon Oct 24 12:51:53 2011
@@ -25,56 +25,9 @@
     <componentDescriptors>
         <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
         <componentDescriptor>target/shared/common-windows-bin.xml</componentDescriptor>
+        <componentDescriptor>target/shared/examples-windows-bin.xml</componentDescriptor>
     </componentDescriptors>
 
-    <fileSets>
-      <!-- Copy over kernel demo to examples folder -->
-      <fileSet>
-          <directory>target/dependencies/win/apache-karaf-${karaf.version}/demos</directory>
-          <outputDirectory>/examples/karaf-demos</outputDirectory>
-          <lineEnding>dos</lineEnding>
-          <includes>
-            <include>pom.xml</include>
-            <include>**/web/**</include>
-          </includes>
-      </fileSet>
-
-      <!-- Copy over nmr examples files -->
-      <fileSet>
-           <directory>target/dependencies/win/apache-servicemix-nmr-${servicemix.nmr.version}/examples</directory>
-           <outputDirectory>/examples/</outputDirectory>
-           <excludes>
-               <exclude>pom.xml</exclude>
-               <exclude>**/itests/**</exclude>
-               <exclude>**/target/**</exclude>
-               <exclude>**/.classpath</exclude>
-               <exclude>**/.project</exclude>
-               <exclude>**/.settings/**</exclude>
-           </excludes>
-           <lineEnding>dos</lineEnding>
-      </fileSet>
-
-      <!-- Copy over the examples -->
-      <fileSet>
-          <directory>${basedir}/../../examples</directory>
-          <outputDirectory>/examples/</outputDirectory>
-          <lineEnding>dos</lineEnding>
-          <excludes>
-              <exclude>pom.xml</exclude>
-              <!--we need add filtered README.txt, so exclude the raw one here-->
-              <exclude>**/README.txt</exclude>
-              <exclude>**/itests/**</exclude>
-              <exclude>**/target/**</exclude>
-              <exclude>**/.classpath</exclude>
-              <exclude>**/.project</exclude>
-              <exclude>**/.settings/**</exclude>
-              <exclude>**/wsdl-first/**</exclude>
-              <exclude>**/loan-broker-bpel/**</exclude>
-              <exclude>**/web/**</exclude>
-          </excludes>
-      </fileSet>
-    </fileSets>
-
     <files>
         <file>
             <source>${basedir}/target/classes/features.xml</source>
@@ -83,144 +36,6 @@
             <fileMode>0644</fileMode>
             <lineEnding>dos</lineEnding>
         </file>
-
-        <!--filtering README.txt-->
-        <file>
-            <source>${basedir}/../../examples/README.txt</source>
-            <outputDirectory>/examples/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-
-        <file>
-              <source>${basedir}/../../examples/bridge/README.txt</source>
-              <outputDirectory>/examples/bridge</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../../examples/cxf-ws-addressing/README.txt</source>
-              <outputDirectory>/examples/cxf-ws-addressing</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../../examples/cxf-jaxrs/README.txt</source>
-              <outputDirectory>/examples/cxf-jaxrs</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/../../examples/cxf-wsdl-first-osgi-package/README.txt</source>
-            <outputDirectory>/examples/cxf-wsdl-first-osgi-package</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../../examples/bridge-camel/README.txt</source>
-              <outputDirectory>/examples/bridge-camel</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../../examples/camel/README.txt</source>
-              <outputDirectory>/examples/camel</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../../examples/camel-blueprint/README.txt</source>
-              <outputDirectory>/examples/camel-blueprint</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../../examples/cxf-wsdl-first/README.txt</source>
-              <outputDirectory>/examples/cxf-wsdl-first</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-              <source>${basedir}/../../examples/camel-osgi/README.txt</source>
-              <outputDirectory>/examples/camel-osgi</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/../../examples/camel-nmr/README.txt</source>
-              <outputDirectory>/examples/camel-nmr</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-        <file>
-          <source>${basedir}/../../examples/camel-nmr-blueprint/README.txt</source>
-          <outputDirectory>/examples/camel-nmr-blueprint</outputDirectory>
-          <filtered>true</filtered>
-          <fileMode>0644</fileMode>
-          <lineEnding>dos</lineEnding>
-        </file>
-            <file>
-              <source>${basedir}/../../examples/cxf-nmr/README.txt</source>
-              <outputDirectory>/examples/cxf-nmr</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/../../examples/cxf-osgi/README.txt</source>
-              <outputDirectory>/examples/cxf-osgi</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/../../examples/cxf-ws-security-osgi/README.txt</source>
-              <outputDirectory>/examples/cxf-ws-security-osgi</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/../../examples/cxf-ws-rm/README.txt</source>
-              <outputDirectory>/examples/cxf-ws-rm</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-
-            <file>
-              <source>${basedir}/../../examples/cxf-camel-nmr/README.txt</source>
-              <outputDirectory>/examples/cxf-camel-nmr</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/../../examples/simple/README.txt</source>
-              <outputDirectory>/examples/simple</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-            <file>
-              <source>${basedir}/target/shared/pom.xml</source>
-              <outputDirectory>/examples/</outputDirectory>
-              <filtered>true</filtered>
-              <fileMode>0644</fileMode>
-              <lineEnding>dos</lineEnding>
-            </file>
-
     </files>
 
 </assembly>

Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-src.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-src.xml?rev=1188130&r1=1188129&r2=1188130&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-src.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-src.xml Mon Oct 24 12:51:53 2011
@@ -23,7 +23,7 @@
     <fileSets>
         <!-- Copy license and other files from root -->
         <fileSet>
-            <directory>${basedir}/..</directory>
+            <directory>${basedir}/../..</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>BUILDING.txt</include>
@@ -35,7 +35,7 @@
 
         <!-- Binary Files -->
         <fileSet>
-            <directory>${basedir}/..</directory>
+            <directory>${basedir}/../..</directory>
             <outputDirectory>src</outputDirectory>
             <includes>
                 <include>**/*.jpeg</include>
@@ -63,7 +63,7 @@
 
         <!-- Text Files -->
         <fileSet>
-            <directory>${basedir}/..</directory>
+            <directory>${basedir}/../..</directory>
             <outputDirectory>src</outputDirectory>
             <includes>
                 <include>**/*</include>

Copied: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/examples-unix-bin.xml (from r1188128, servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/unix-bin.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/examples-unix-bin.xml?p2=servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/examples-unix-bin.xml&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/unix-bin.xml&r1=1188128&r2=1188130&rev=1188130&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/examples-unix-bin.xml Mon Oct 24 12:51:53 2011
@@ -15,21 +15,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<assembly>
-    <id>apache-servicemix</id>
-
-    <formats>
-        <format>jar</format>        <!-- SMX4-775: Added JAR assembly for *nix systems without GNU TAR  -->
-        <format>tar.gz</format>
-    </formats>
-
-    <baseDirectory>apache-servicemix-${version}</baseDirectory>
-
-    <componentDescriptors>
-        <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
-        <componentDescriptor>target/shared/common-unix-bin.xml</componentDescriptor>
-    </componentDescriptors>
-
+<component>
     <fileSets>
         <!-- Copy over karaf demo to examples folder -->
         <fileSet>
@@ -206,4 +192,4 @@
         </file>
     </files>
 
-</assembly>
+</component>

Copied: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/examples-windows-bin.xml (from r1188128, servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/windows-bin.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/examples-windows-bin.xml?p2=servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/examples-windows-bin.xml&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/windows-bin.xml&r1=1188128&r2=1188130&rev=1188130&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/examples-windows-bin.xml Mon Oct 24 12:51:53 2011
@@ -15,20 +15,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<assembly>
-    <id>apache-servicemix</id>
-
-    <formats>
-        <format>zip</format>
-    </formats>
-
-    <baseDirectory>apache-servicemix-${version}</baseDirectory>
-
-    <componentDescriptors>
-        <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
-        <componentDescriptor>target/shared/common-windows-bin.xml</componentDescriptor>
-    </componentDescriptors>
-
+<component>
     <fileSets>
       <!-- Copy over kernel demo to examples folder -->
       <fileSet>
@@ -217,4 +204,4 @@
 
     </files>
 
-</assembly>
+</component>

Modified: servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/pom.xml?rev=1188130&r1=1188129&r2=1188130&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Mon Oct 24 12:51:53 2011
@@ -54,8 +54,18 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
-            <artifactId>org.apache.karaf.management</artifactId>
+            <groupId>org.apache.karaf.jaas</groupId>
+            <artifactId>org.apache.karaf.jaas.boot</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.jaas</groupId>
+            <artifactId>org.apache.karaf.jaas.config</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.management</groupId>
+            <artifactId>org.apache.karaf.management.server</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -360,6 +370,10 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
+            <artifactId>spring-expression</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
         </dependency>
         <dependency>

Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java?rev=1188130&r1=1188129&r2=1188130&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java Mon Oct 24 12:51:53 2011
@@ -110,7 +110,9 @@ public class CXFNMRIntegrationTest exten
             getBundle("org.ops4j.pax.web", "pax-web-extender-whiteboard"),
             getBundle("org.apache.servicemix", "servicemix-utils"),
             getBundle("org.fusesource.commonman", "commons-management"),
-            getBundle("org.apache.karaf", "org.apache.karaf.management"),
+            getBundle("org.apache.karaf.jaas", "org.apache.karaf.jaas.boot"),
+            getBundle("org.apache.karaf.jaas", "org.apache.karaf.jaas.config"),
+            getBundle("org.apache.karaf.management", "org.apache.karaf.management.server"),
             getBundle("org.apache.cxf", "cxf-bundle"),
             getBundle("org.apache.servicemix.cxf", "org.apache.servicemix.cxf.transport.nmr"),
             getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.api"),

Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=1188130&r1=1188129&r2=1188130&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java Mon Oct 24 12:51:53 2011
@@ -146,7 +146,9 @@ public class IntegrationTest extends Abs
             getBundle("org.ops4j.pax.web", "pax-web-extender-whiteboard"),
             getBundle("org.apache.servicemix", "servicemix-utils"),
             getBundle("org.fusesource.commonman", "commons-management"),
-            getBundle("org.apache.karaf", "org.apache.karaf.management"),
+            getBundle("org.apache.karaf.jaas", "org.apache.karaf.jaas.boot"),
+            getBundle("org.apache.karaf.jaas", "org.apache.karaf.jaas.config"),
+            getBundle("org.apache.karaf.management", "org.apache.karaf.management.server"),
             getBundle("org.apache.cxf", "cxf-bundle"),
             getBundle("org.apache.servicemix.cxf", "org.apache.servicemix.cxf.transport.nmr"),
             getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.api"),

Modified: servicemix/smx4/features/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/parent/pom.xml?rev=1188130&r1=1188129&r2=1188130&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/parent/pom.xml (original)
+++ servicemix/smx4/features/trunk/parent/pom.xml Mon Oct 24 12:51:53 2011
@@ -39,7 +39,7 @@
   <properties>
     <activemq.version>5.5.0</activemq.version>
     <camel.version>2.8.2-SNAPSHOT</camel.version>
-    <cxf.version>2.4.3</cxf.version>
+    <cxf.version>2.4.2</cxf.version>
 
     <felix.obr.version>1.6.4</felix.obr.version>
 

Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1188130&r1=1188129&r2=1188130&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Mon Oct 24 12:51:53 2011
@@ -201,7 +201,7 @@
         <jettison.version>1.2</jettison.version>
         <lingo.version>1.3</lingo.version>
         <scriptengines.version>1.1</scriptengines.version>
-        <spring.version>3.0.5.RELEASE</spring.version>
+        <spring.version>3.0.6.RELEASE</spring.version>
         <spring.osgi.version>1.2.1</spring.osgi.version>
         <wss4j.version>1.6.1</wss4j.version>
         <neethi.version>3.0.0</neethi.version>



Mime
View raw message