servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r680346 - in /servicemix/smx4/features/trunk: ./ assembly/ assembly/src/main/descriptors/ assembly/src/main/filtered-resources/ assembly/src/main/filtered-resources/etc/
Date Mon, 28 Jul 2008 13:24:58 GMT
Author: gnodet
Date: Mon Jul 28 06:24:57 2008
New Revision: 680346

URL: http://svn.apache.org/viewvc?rev=680346&view=rev
Log:
SMX4-79: Use the features plugin to generate the assembly and use the OSGi packaged JBI components

Added:
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg
Removed:
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
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
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
    servicemix/smx4/features/trunk/pom.xml

Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=680346&r1=680345&r2=680346&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Mon Jul 28 06:24:57 2008
@@ -39,12 +39,12 @@
             <artifactId>apache-servicemix-kernel</artifactId>
             <version>${servicemix.kernel.version}</version>
             <type>zip</type>
-<exclusions>
-	<exclusion>
-		<groupId>junit</groupId>
-		<artifactId>junit</artifactId>
-	</exclusion>
-</exclusions>
+            <exclusions>
+	            <exclusion>
+		            <groupId>junit</groupId>
+		            <artifactId>junit</artifactId>
+	            </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.kernel</groupId>
@@ -74,6 +74,13 @@
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.nmr</groupId>
+            <artifactId>apache-servicemix-nmr</artifactId>
+            <version>${servicemix.nmr.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.nmr</groupId>
             <artifactId>org.apache.servicemix.nmr.api</artifactId>
             <version>${servicemix.nmr.version}</version>
         </dependency>
@@ -154,6 +161,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.saxon</artifactId>
+            <version>${saxon.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.asm</artifactId>
             <version>${asm.version}</version>
         </dependency>
@@ -446,39 +458,148 @@
         </dependency>
         <!-- Dependencies not included directly, but repackaged in bundles.
      	     Listed for legal reasons (and LICENSE file generation) 
-			<dependency>
-				<groupId>com.sun.xml.bind</groupId>
-				<artifactId>jaxb-impl</artifactId>
-				<version>${jaxb.impl.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>javax.activation</groupId>
-						<artifactId>activation</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-	            <groupId>com.sun.xml.messaging.saaj</groupId>
-				<artifactId>saaj-impl</artifactId>
-				<version>1.3</version>
-				<exclusions>
-					<exclusion>
-						<groupId>javax.xml.soap</groupId>
-						<artifactId>saaj-api</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-	            <groupId>asm</groupId>
-	            <artifactId>asm-all</artifactId>
-				<version>${asm.version}</version>
-			</dependency>
-			<dependency>
-	            <groupId>wsdl4j</groupId>
-	            <artifactId>wsdl4j</artifactId>
-				<version>1.6.1</version>
-			</dependency>
-			-->
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-impl</artifactId>
+			<version>${jaxb.impl.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.activation</groupId>
+					<artifactId>activation</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+	        <groupId>com.sun.xml.messaging.saaj</groupId>
+			<artifactId>saaj-impl</artifactId>
+			<version>1.3</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.xml.soap</groupId>
+					<artifactId>saaj-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+	        <groupId>asm</groupId>
+	        <artifactId>asm-all</artifactId>
+			<version>${asm.version}</version>
+		</dependency>
+		<dependency>
+	        <groupId>wsdl4j</groupId>
+	        <artifactId>wsdl4j</artifactId>
+			<version>1.6.1</version>
+		</dependency>
+		-->
+
+		<!-- 
+		  - JBI components 
+		  -->
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-http</artifactId>
+            <version>${servicemix-http-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-jms</artifactId>
+            <version>${servicemix-jms-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-drools</artifactId>
+            <version>${servicemix-drools-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-eip</artifactId>
+            <version>${servicemix-eip-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-script</artifactId>
+            <version>${servicemix-script-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-scripting</artifactId>
+            <version>${servicemix-scripting-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-validation</artifactId>
+            <version>${servicemix-validation-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-file</artifactId>
+            <version>${servicemix-file-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-ftp</artifactId>
+            <version>${servicemix-ftp-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-xmpp</artifactId>
+            <version>${servicemix-xmpp-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-saxon</artifactId>
+            <version>${servicemix-saxon-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-quartz</artifactId>
+            <version>${servicemix-quartz-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-jsr181</artifactId>
+            <version>${servicemix-jsr181-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-mail</artifactId>
+            <version>${servicemix-mail-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-osworkflow</artifactId>
+            <version>${servicemix-osworkflow-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-bean</artifactId>
+            <version>${servicemix-bean-version}</version>
+        </dependency>                
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-truezip</artifactId>
+            <version>${servicemix-truezip-version}</version>
+        </dependency>                
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-cxf-se</artifactId>
+            <version>${servicemix-cxf-se-version}</version>
+        </dependency>                
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-cxf-bc</artifactId>
+            <version>${servicemix-cxf-bc-version}</version>
+        </dependency>                
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-camel</artifactId>
+            <version>${servicemix-camel-version}</version>
+        </dependency>                
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-shared</artifactId>
+            <version>${servicemix-shared-version}</version>
+        </dependency>
     </dependencies>
     <build>
         <resources>
@@ -492,6 +613,51 @@
         </resources>
         <plugins>
             <plugin>
+                <groupId>org.apache.servicemix.tooling</groupId>
+                <artifactId>features-maven-plugin</artifactId>
+                <version>1.0-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <id>add-features-to-repo</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>add-features-to-repo</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</descriptor>
+                                <descriptor>file:${basedir}/target/classes/features.xml</descriptor>
+                            </descriptors>
+                            <features>
+                                <!--
+                                    Those features are dependencies of JBI components, so no need to install them explicitely
+                                  -->
+                                <!--
+                                <feature>jbi</feature>
+                                <feature>camel</feature>
+                                <feature>activemq</feature>
+                                <feature>cxf</feature>
+                                 -->
+                                <feature>servicemix-cxf-bc</feature>
+                                <feature>servicemix-file</feature>
+                                <feature>servicemix-ftp</feature>
+                                <feature>servicemix-http</feature>
+                                <feature>servicemix-jms</feature>
+                                <feature>servicemix-mail</feature>
+                                <feature>servicemix-bean</feature>
+                                <feature>servicemix-camel</feature>
+                                <feature>servicemix-cxf-se</feature>
+                                <feature>servicemix-drools</feature>
+                                <feature>servicemix-eip</feature>
+                                <feature>servicemix-saxon</feature>
+                                <feature>servicemix-wsn2005</feature>
+                            </features>
+                            <repository>target/features-repo</repository>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
@@ -504,176 +670,7 @@
                     </execution>
                 </executions>
             </plugin>
-
-           <!-- Grab SMX 3 Dependencies -->            
-
-            <plugin>
-              <groupId>org.codehaus.mojo</groupId>
-              <artifactId>dependency-maven-plugin</artifactId>
-              <version>1.0</version>
-              <executions>
-                <execution>
-                  <id>copy-components</id>
-                  <phase>generate-resources</phase>
-                  <goals>
-                    <goal>copy</goal>
-                  </goals>
-                  <configuration>
-                    <outputDirectory>target/components</outputDirectory>
-                    <artifactItems>
-                      <artifactItem>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>servicemix-http</artifactId>
-                        <version>${servicemix-http-version}</version>
-                        <classifier>installer</classifier>
-                        <type>zip</type>
-                      </artifactItem>
-                      <artifactItem>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>servicemix-jms</artifactId>
-                        <version>${servicemix-jms-version}</version>
-                        <classifier>installer</classifier>
-                        <type>zip</type>
-                      </artifactItem>
-                      <artifactItem>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>servicemix-drools</artifactId>
-                        <version>${servicemix-drools-version}</version>
-                        <classifier>installer</classifier>
-                        <type>zip</type>
-                      </artifactItem>
-                      <artifactItem>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>servicemix-eip</artifactId>
-                        <version>${servicemix-eip-version}</version>
-                        <classifier>installer</classifier>
-                        <type>zip</type>
-                      </artifactItem>
-                      <artifactItem>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>servicemix-script</artifactId>
-                        <version>${servicemix-script-version}</version>
-                        <classifier>installer</classifier>
-                        <type>zip</type>
-                      </artifactItem>
-                      <artifactItem>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>servicemix-scripting</artifactId>
-                        <version>${servicemix-scripting-version}</version>
-                        <classifier>installer</classifier>
-                        <type>zip</type>
-                      </artifactItem>
-                      <artifactItem>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>servicemix-validation</artifactId>
-                        <version>${servicemix-validation-version}</version>
-                        <classifier>installer</classifier>
-                        <type>zip</type>
-                      </artifactItem>
-                      <artifactItem>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>servicemix-file</artifactId>
-                        <version>${servicemix-file-version}</version>
-                        <classifier>installer</classifier>
-                        <type>zip</type>
-                      </artifactItem>
-                      <artifactItem>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>servicemix-ftp</artifactId>
-                        <version>${servicemix-ftp-version}</version>
-                        <classifier>installer</classifier>
-                        <type>zip</type>
-                      </artifactItem>
-                      <artifactItem>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>servicemix-xmpp</artifactId>
-                        <version>${servicemix-xmpp-version}</version>
-                        <classifier>installer</classifier>
-                        <type>zip</type>
-                      </artifactItem>
-                      <artifactItem>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>servicemix-saxon</artifactId>
-                        <version>${servicemix-saxon-version}</version>
-                        <classifier>installer</classifier>
-                        <type>zip</type>
-                      </artifactItem>
-                      <artifactItem>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>servicemix-quartz</artifactId>
-                        <version>${servicemix-quartz-version}</version>
-                        <classifier>installer</classifier>
-                        <type>zip</type>
-                      </artifactItem>
-                      <artifactItem>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>servicemix-jsr181</artifactId>
-                        <version>${servicemix-jsr181-version}</version>
-                        <classifier>installer</classifier>
-                        <type>zip</type>
-                      </artifactItem>
-                      <artifactItem>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>servicemix-mail</artifactId>
-                        <version>${servicemix-mail-version}</version>
-                        <classifier>installer</classifier>
-                        <type>zip</type>
-                      </artifactItem>
-                      <artifactItem>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>servicemix-osworkflow</artifactId>
-                        <version>${servicemix-osworkflow-version}</version>
-                        <classifier>installer</classifier>
-                        <type>zip</type>
-                      </artifactItem>
-                      <artifactItem>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>servicemix-bean</artifactId>
-                        <version>${servicemix-bean-version}</version>
-                        <classifier>installer</classifier>
-                        <type>zip</type>
-                      </artifactItem>                
-                      <artifactItem>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>servicemix-truezip</artifactId>
-                        <version>${servicemix-truezip-version}</version>
-                        <classifier>installer</classifier>
-                        <type>zip</type>
-                      </artifactItem>                
-                      <artifactItem>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>servicemix-cxf-se</artifactId>
-                        <version>${servicemix-cxf-se-version}</version>
-                        <classifier>installer</classifier>
-                        <type>zip</type>
-                      </artifactItem>                
-                      <artifactItem>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>servicemix-cxf-bc</artifactId>
-                        <version>${servicemix-cxf-bc-version}</version>
-                        <classifier>installer</classifier>
-                        <type>zip</type>
-                      </artifactItem>                
-                      <artifactItem>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>servicemix-camel</artifactId>
-                        <version>${servicemix-camel-version}</version>
-                        <classifier>installer</classifier>
-                        <type>zip</type>
-                      </artifactItem>                
-                      <artifactItem>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>servicemix-shared</artifactId>
-                        <version>${servicemix-shared-version}</version>
-                        <classifier>installer</classifier>
-                        <type>zip</type>
-                      </artifactItem>
-                    </artifactItems>
-                  </configuration>
-                </execution>
-              </executions>
-            </plugin>
-
+        
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>

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=680346&r1=680345&r2=680346&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 Mon Jul 28 06:24:57 2008
@@ -103,14 +103,21 @@
         </fileSet>
         
         <fileSet>
-          <directory>target/components</directory>
-          <outputDirectory>deploy</outputDirectory>
+          <directory>target/features-repo</directory>
+          <outputDirectory>system</outputDirectory>
         </fileSet>
 
     </fileSets>
 
     <files>
         <file>
+            <source>${basedir}/target/classes/features.xml</source>
+            <outputDirectory>system/org/apache/servicemix/features/${artifactId}/${version}</outputDirectory>
+            <destName>${artifactId}-${version}-features.xml</destName>
+            <fileMode>0644</fileMode>
+            <lineEnding>unix</lineEnding>
+        </file>
+        <file>
             <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
             <outputDirectory>/</outputDirectory>
             <destName>LICENSE.txt</destName>
@@ -127,178 +134,77 @@
 
         <!--filtering README.txt-->
         <file>
-              <source>../examples/bridge/README.txt</source>
-              <outputDirectory>/examples/bridge</outputDirectory>
-              <filtered>true</filtered>
-              <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-              <source>../examples/camel/README.txt</source>
-              <outputDirectory>/examples/camel</outputDirectory>
-              <filtered>true</filtered>
-              <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-              <source>../examples/cxf-wsdl-first/README.txt</source>
-              <outputDirectory>/examples/cxf-wsdl-first</outputDirectory>
-              <filtered>true</filtered>
-              <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-              <source>../examples/wsdl-first/README.txt</source>
-              <outputDirectory>/examples/wsdl-first</outputDirectory>
-              <filtered>true</filtered>
-              <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-              <source>../examples/loan-broker-bpel/README.txt</source>
-              <outputDirectory>/examples/loan-broker-bpel</outputDirectory>
-              <filtered>true</filtered>
-              <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-              <source>../examples/camel-osgi/README.txt</source>
-              <outputDirectory>/examples/camel-osgi</outputDirectory>
-              <filtered>true</filtered>
-              <lineEnding>unix</lineEnding>
-            </file>
-            <file>
-              <source>../examples/camel-nmr/README.txt</source>
-              <outputDirectory>/examples/camel-nmr</outputDirectory>
-              <filtered>true</filtered>
-              <lineEnding>unix</lineEnding>
-            </file>
-            <file>
-              <source>../examples/cxf-nmr/README.txt</source>
-              <outputDirectory>/examples/cxf-nmr</outputDirectory>               <filtered>true</filtered>
-              <lineEnding>unix</lineEnding>
-            </file>
-            <file>
-              <source>../examples/cxf-osgi/README.txt</source>
-              <outputDirectory>/examples/cxf-osgi</outputDirectory>
-              <filtered>true</filtered>
-              <lineEnding>unix</lineEnding>
-            </file>
-            <file>
-              <source>../examples/cxf-camel-nmr/README.txt</source>
-              <outputDirectory>/examples/cxf-camel-nmr</outputDirectory>
-              <filtered>true</filtered>
-              <lineEnding>unix</lineEnding>
-            </file>
+            <source>../examples/bridge/README.txt</source>
+            <outputDirectory>/examples/bridge</outputDirectory>
+            <filtered>true</filtered>
+            <lineEnding>unix</lineEnding>
+        </file>
+        <file>
+            <source>../examples/camel/README.txt</source>
+            <outputDirectory>/examples/camel</outputDirectory>
+            <filtered>true</filtered>
+            <lineEnding>unix</lineEnding>
+        </file>
+        <file>
+            <source>../examples/cxf-wsdl-first/README.txt</source>
+            <outputDirectory>/examples/cxf-wsdl-first</outputDirectory>
+            <filtered>true</filtered>
+            <lineEnding>unix</lineEnding>
+        </file>
+        <file>
+            <source>../examples/wsdl-first/README.txt</source>
+            <outputDirectory>/examples/wsdl-first</outputDirectory>
+            <filtered>true</filtered>
+            <lineEnding>unix</lineEnding>
+        </file>
+        <file>
+            <source>../examples/loan-broker-bpel/README.txt</source>
+            <outputDirectory>/examples/loan-broker-bpel</outputDirectory>
+            <filtered>true</filtered>
+            <lineEnding>unix</lineEnding>
+        </file>
+        <file>
+            <source>../examples/camel-osgi/README.txt</source>
+            <outputDirectory>/examples/camel-osgi</outputDirectory>
+            <filtered>true</filtered>
+            <lineEnding>unix</lineEnding>
+        </file>
+        <file>
+            <source>../examples/camel-nmr/README.txt</source>
+            <outputDirectory>/examples/camel-nmr</outputDirectory>
+            <filtered>true</filtered>
+            <lineEnding>unix</lineEnding>
+        </file>
+        <file>
+            <source>../examples/cxf-nmr/README.txt</source>
+            <outputDirectory>/examples/cxf-nmr</outputDirectory>               
+            <filtered>true</filtered>
+            <lineEnding>unix</lineEnding>
+        </file>
+        <file>
+            <source>../examples/cxf-osgi/README.txt</source>
+            <outputDirectory>/examples/cxf-osgi</outputDirectory>
+            <filtered>true</filtered>
+            <lineEnding>unix</lineEnding>
+        </file>
+        <file>
+            <source>../examples/cxf-camel-nmr/README.txt</source>
+            <outputDirectory>/examples/cxf-camel-nmr</outputDirectory>
+            <filtered>true</filtered>
+            <lineEnding>unix</lineEnding>
+        </file>
     </files>
 
     <dependencySets>
-
-        <!-- Mandatory bundles for everything -->
         <dependencySet>
             <outputDirectory>/system</outputDirectory>
-            <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <outputFileNameMapping>org/apache/servicemix/nmr/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <unpack>false</unpack>
             <scope>runtime</scope>
             <includes>
-                <!-- NMR / JBI -->
-                <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox</include>
-                <include>org.apache.felix:org.apache.felix.prefs</include>
-                <include>org.apache.xbean:xbean-classloader</include>
-                <include>org.apache.servicemix.document:org.apache.servicemix.document</include>
-                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
-                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
-                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.spring</include>
-                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.osgi</include>
-                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.commands</include>
-                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.api</include>
-                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.runtime</include>
-                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.osgi</include>
-                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.deployer</include>
-                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.commands</include>
-
-                <!-- Management -->
-                <include>org.apache.servicemix.management:org.apache.servicemix.management.core</include>
-                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.management</include>
-                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.management</include>
-
-                <!-- Transaction -->
-                <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
-                <include>org.springframework:spring-tx</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.howl</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jencks</include>
-                <include>org.apache.geronimo.components:geronimo-connector</include>
-                <include>org.apache.geronimo.components:geronimo-transaction</include>
-                <include>org.apache.servicemix.transaction:org.apache.servicemix.transaction</include>
-
-                <!-- ActiveMQ -->
-                <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
-                <include>org.springframework:spring-web</include>
-                <include>org.apache.activemq:activemq-core</include>
-                <include>org.apache.activemq:activemq-console</include>
-                <include>org.apache.activemq:activemq-pool</include>
-                <include>commons-pool:commons-pool</include>
-                <include>org.apache.xbean:xbean-spring</include>
-                <include>org.apache.servicemix.activemq:org.apache.servicemix.activemq.commands</include>
-
-                <!-- WEB / WAR -->
-                <include>org.mortbay.jetty:jetty-util</include>
-                <include>org.mortbay.jetty:jetty</include>
-                <include>org.ops4j.pax.web:pax-web-bundle</include>
-                <include>org.ops4j.pax.web:pax-web-jsp</include>
-                <include>org.ops4j.pax.web-extender:pax-web-ex-war</include>
-                <include>org.ops4j.pax.web-extender:pax-web-ex-whiteboard</include>
-                <include>org.ops4j.pax.url:pax-url-war</include>
-                <include>org.apache.servicemix.war:org.apache.servicemix.war.deployer</include>
-
-                <!-- CXF -->
-                <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.saaj-api-1.3</include>
-                <include>org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.asm</include>
-                <include>org.apache.cxf:cxf-bundle</include>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.1</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl</include>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxws-api-2.1</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.fastinfoset</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.neethi</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.saaj-impl</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.wsdl4j</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xmlschema</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xmlresolver</include>
-                <include>org.apache.servicemix.cxf:org.apache.servicemix.cxf.transport.nmr</include>
-                <include>org.apache.servicemix.cxf:org.apache.servicemix.cxf.transport.osgi</include>
-                <include>org.apache.servicemix.cxf:org.apache.servicemix.cxf.binding.nmr</include>
-
-                <!-- OpenEJB -->
-                <!--
-				<include>org.apache.xbean:xbean-finder</include>
-				<include>org.apache.xbean:xbean-naming</include>
-				<include>org.apache.xbean:xbean-reflect</include>
-			    <include>org.apache.geronimo.specs:geronimo-ejb_3.0_spec</include>
-			    <include>org.apache.geronimo.specs:geronimo-interceptor_3.0_spec</include>
-			    <include>org.apache.geronimo.specs:geronimo-jacc_1.1_spec</include>
-		        <include>org.apache.geronimo.specs:geronimo-jaxrpc_1.1_spec</include>
-		        <include>org.apache.geronimo.specs:geronimo-jpa_3.0_spec</include>
-	            <include>org.apache.openejb:openejb-core</include>
-	            <include>org.apache.openejb:openejb-cxf</include>
-	            <include>org.apache.openejb:openejb-ejbd</include>
-	            <include>org.apache.openejb:openejb-http</include>
-	            <include>org.apache.openejb:openejb-javaagent</include>
-	            <include>org.apache.openejb:openejb-jee</include>
-	            <include>org.apache.openejb:openejb-loader</include>
-	            <include>org.apache.openejb:openejb-server</include>
-	            <include>org.apache.openejb:openejb-webservices</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-cli-1.1</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.openjpa-1.0.1</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.swizzle-stream-1.0.1</include>
-                <include>org.apache.servicemix.ejb3:org.apache.servicemix.ejb3.deployer</include>
-                -->
-
+                <include>org.apache.servicemix.nmr:apache-servicemix-nmr:xml:features</include>
             </includes>
         </dependencySet>
-
     </dependencySets>
 
 </assembly>

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=680346&r1=680345&r2=680346&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 Mon Jul 28 06:24:57 2008
@@ -99,10 +99,10 @@
       </fileSet>
 
       <fileSet>
-        <directory>target/components</directory>
-        <outputDirectory>deploy</outputDirectory>
+        <directory>target/features-repo</directory>
+        <outputDirectory>system</outputDirectory>
       </fileSet>
-
+      
     </fileSets>
 
     <files>
@@ -186,117 +186,15 @@
     </files>
 
     <dependencySets>
-
-        <!-- Mandatory bundles for everything -->
         <dependencySet>
             <outputDirectory>/system</outputDirectory>
-            <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <outputFileNameMapping>org/apache/servicemix/nmr/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <unpack>false</unpack>
             <scope>runtime</scope>
             <includes>
-                <!-- NMR / JBI -->
-                <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox</include>
-                <include>org.apache.felix:org.apache.felix.prefs</include>
-                <include>org.apache.xbean:xbean-classloader</include>
-                <include>org.apache.servicemix.document:org.apache.servicemix.document</include>
-                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
-                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
-                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.spring</include>
-                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.osgi</include>
-                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.commands</include>
-                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.api</include>
-                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.runtime</include>
-                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.osgi</include>
-                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.deployer</include>
-                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.commands</include>
-
-                <!-- Management -->
-                <include>org.apache.servicemix.management:org.apache.servicemix.management.core</include>
-                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.management</include>
-                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.management</include>
-
-                <!-- Transaction -->
-                <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
-                <include>org.springframework:spring-tx</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.howl</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jencks</include>
-                <include>org.apache.geronimo.components:geronimo-connector</include>
-                <include>org.apache.geronimo.components:geronimo-transaction</include>
-                <include>org.apache.servicemix.transaction:org.apache.servicemix.transaction</include>
-
-                <!-- ActiveMQ -->
-                <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
-                <include>org.springframework:spring-web</include>
-                <include>org.apache.activemq:activemq-core</include>
-                <include>org.apache.activemq:activemq-console</include>
-                <include>org.apache.activemq:activemq-pool</include>
-                <include>commons-pool:commons-pool</include>
-                <include>org.apache.xbean:xbean-spring</include>
-                <include>org.apache.servicemix.activemq:org.apache.servicemix.activemq.commands</include>
-
-                <!-- WEB / WAR -->
-                <include>org.mortbay.jetty:jetty-util</include>
-                <include>org.mortbay.jetty:jetty</include>
-                <include>org.ops4j.pax.web:pax-web-bundle</include>
-                <include>org.ops4j.pax.web:pax-web-jsp</include>
-                <include>org.ops4j.pax.web-extender:pax-web-ex-war</include>
-                <include>org.ops4j.pax.web-extender:pax-web-ex-whiteboard</include>
-                <include>org.ops4j.pax.url:pax-url-war</include>
-                <include>org.apache.servicemix.war:org.apache.servicemix.war.deployer</include>
-
-                <!-- CXF -->
-                <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.saaj-api-1.3</include>
-                <include>org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.asm</include>
-                <include>org.apache.cxf:cxf-bundle</include>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.1</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl</include>
-                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxws-api-2.1</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.fastinfoset</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.neethi</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.saaj-impl</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.wsdl4j</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xmlschema</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xmlresolver</include>
-                <include>org.apache.servicemix.cxf:org.apache.servicemix.cxf.transport.nmr</include>
-                <include>org.apache.servicemix.cxf:org.apache.servicemix.cxf.transport.osgi</include>
-                <include>org.apache.servicemix.cxf:org.apache.servicemix.cxf.binding.nmr</include>
-
-                <!-- OpenEJB -->
-                <!--
-				<include>org.apache.xbean:xbean-finder</include>
-				<include>org.apache.xbean:xbean-naming</include>
-				<include>org.apache.xbean:xbean-reflect</include>
-			    <include>org.apache.geronimo.specs:geronimo-ejb_3.0_spec</include>
-			    <include>org.apache.geronimo.specs:geronimo-interceptor_3.0_spec</include>
-			    <include>org.apache.geronimo.specs:geronimo-jacc_1.1_spec</include>
-		        <include>org.apache.geronimo.specs:geronimo-jaxrpc_1.1_spec</include>
-		        <include>org.apache.geronimo.specs:geronimo-jpa_3.0_spec</include>
-	            <include>org.apache.openejb:openejb-core</include>
-	            <include>org.apache.openejb:openejb-cxf</include>
-	            <include>org.apache.openejb:openejb-ejbd</include>
-	            <include>org.apache.openejb:openejb-http</include>
-	            <include>org.apache.openejb:openejb-javaagent</include>
-	            <include>org.apache.openejb:openejb-jee</include>
-	            <include>org.apache.openejb:openejb-loader</include>
-	            <include>org.apache.openejb:openejb-server</include>
-	            <include>org.apache.openejb:openejb-webservices</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-cli-1.1</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.openjpa-1.0.1</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.swizzle-stream-1.0.1</include>
-                <include>org.apache.servicemix.ejb3:org.apache.servicemix.ejb3.deployer</include>
-                -->
-
+                <include>org.apache.servicemix.nmr:apache-servicemix-nmr:xml:features</include>
             </includes>
         </dependencySet>
-
     </dependencySets>
 
 </assembly>

Added: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg?rev=680346&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg (added)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg Mon Jul 28 06:24:57 2008
@@ -0,0 +1,29 @@
+################################################################################
+#
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    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.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+################################################################################
+
+#
+# Comma separated list of features repositories to register by default
+#
+featuresRepositories=http://svn.apache.org/repos/asf/servicemix/smx4/obr-repo/features.xml,mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features,mvn:org.apache.servicemix.features/apache-servicemix/${version}/xml/features
+
+#
+# Comma separated list of features to install at startup
+#
+featuresBoot=servicemix-cxf-bc,servicemix-file,servicemix-ftp,servicemix-http,servicemix-jms,servicemix-mail,servicemix-bean,servicemix-camel,servicemix-cxf-se,servicemix-drools,servicemix-eip,servicemix-saxon,servicemix-wsn2005
+

Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=680346&r1=680345&r2=680346&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Mon Jul 28 06:24:57 2008
@@ -38,6 +38,7 @@
 		<bundle>mvn:commons-pool/commons-pool/${commons.pool.version}</bundle>
 		<bundle>mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
         <bundle>mvn:org.apache.activemq/activemq-core/${activemq.version}</bundle>
+        <bundle>mvn:org.apache.activemq/activemq-ra/${activemq.version}</bundle>
         <bundle>mvn:org.apache.activemq/activemq-console/${activemq.version}</bundle>
         <bundle>mvn:org.apache.activemq/activemq-pool/${activemq.version}</bundle>
         <bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.commands/${version}</bundle>
@@ -84,6 +85,11 @@
 		<bundle>mvn:org.apache.camel/camel-spring/${camel.version}</bundle>
 		<bundle>mvn:org.apache.camel/camel-osgi/${camel.version}</bundle>
 	</feature>
+	<!--
+	  -
+	  -  Examples
+	  -
+      -->
 	<feature name="camel-nmr">
 		<feature>camel</feature>
 		<feature>nmr</feature>
@@ -110,4 +116,125 @@
 		<feature>cxf-nmr</feature>
 		<bundle>mvn:org.apache.servicemix.examples/cxf-camel-nmr/${version}</bundle>
 	</feature>
+	<!--
+      -
+      -  JBI Components
+      -
+      -->
+    <feature name="servicemix-shared">
+        <feature>jbi</feature>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.version}</bundle>
+        <bundle>mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-utils/${servicemix3.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-services/${servicemix3.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-common/${servicemix-shared-version}</bundle>
+    </feature>
+    <feature name="servicemix-cxf-bc">
+        <feature>servicemix-shared</feature>
+        <bundle>mvn:org.mortbay.jetty/jetty-util/${jetty.version}</bundle>
+        <bundle>mvn:org.mortbay.jetty/jetty/${jetty.version}</bundle>
+  	    <bundle>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/${geronimo.activation.version}</bundle>
+  	    <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo.annotation.version}</bundle>
+  	    <bundle>mvn:org.apache.geronimo.specs/geronimo-javamail_1.4_spec/${geronimo.javamail.version}</bundle>
+  	    <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo.wsmetadata.version}</bundle>
+  	    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
+  	    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
+  	    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix.specs.version}</bundle>
+  	    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.1/${servicemix.specs.version}</bundle>
+  	    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.version}</bundle>
+  	    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${fastinfoset.version}</bundle>
+  	    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb.impl.version}</bundle>
+  	    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi/${neethi.version}</bundle>
+  	    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.woodstox/${woodstox.version}</bundle>
+  	    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.version}</bundle>
+  	    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.version}</bundle>
+  	    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlschema/${xmlschema.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wss4j/${wss4j.version}</bundle>
+  	    <bundle>mvn:org.apache.cxf/cxf-bundle/${cxf.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared-version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-cxf-bc/${servicemix-cxf-bc-version}</bundle>
+    </feature>
+    <feature name="servicemix-file">
+        <feature>servicemix-shared</feature>
+        <bundle>mvn:org.apache.servicemix/servicemix-file/${servicemix-file-version}</bundle>
+    </feature>
+    <feature name="servicemix-ftp">
+        <feature>servicemix-shared</feature>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-net/${commons.net.version}</bundle>
+  	    <bundle>mvn:commons-pool/commons-pool/${commons.pool.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-ftp/${servicemix-ftp-version}</bundle>
+    </feature>
+    <feature name="servicemix-http">
+        <feature>servicemix-shared</feature>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons.httpclient.version}</bundle>
+  	    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlschema/${xmlschema.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wss4j/${wss4j.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-soap/${servicemix-shared-version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared-version}</bundle>
+        <bundle>mvn:org.mortbay.jetty/jetty-util/${jetty.version}</bundle>
+        <bundle>mvn:org.mortbay.jetty/jetty/${jetty.version}</bundle>
+        <bundle>mvn:org.mortbay.jetty/jetty-management/${jetty.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-client/${jetty.client.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-http/${servicemix-http-version}</bundle>
+    </feature>
+    <feature name="servicemix-jms">
+        <feature>servicemix-shared</feature>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlschema/${xmlschema.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wss4j/${wss4j.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-soap/${servicemix-shared-version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared-version}</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo.j2ee.connector.version}</bundle>
+		<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms.version}</bundle>
+        <bundle>mvn:org.springframework/spring-jms/${spring.version}</bundle>
+        <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-jms/${servicemix-jms-version}</bundle>
+    </feature>
+    <feature name="servicemix-mail">
+        <feature>servicemix-shared</feature>
+        <bundle>mvn:org.apache.servicemix/servicemix-mail/${servicemix-mail-version}</bundle>
+    </feature>
+    <feature name="servicemix-bean">
+        <feature>servicemix-shared</feature>
+  	    <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo.annotation.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-bean/${servicemix-bean-version}</bundle>
+    </feature>
+    <feature name="servicemix-camel">
+        <feature>servicemix-shared</feature>
+        <feature>camel</feature>
+        <bundle>mvn:org.apache.servicemix/servicemix-camel/${servicemix-camel-version}</bundle>
+    </feature>
+    <feature name="servicemix-drools">
+        <feature>servicemix-shared</feature>
+        <bundle>mvn:org.apache.servicemix/servicemix-drools/${servicemix-drools-version}</bundle>
+    </feature>
+    <feature name="servicemix-cxf-se">
+        <feature>servicemix-shared</feature>
+        <feature>cxf</feature>
+        <bundle>mvn:org.apache.cxf/cxf-rt-bindings-jbi/${cxf.version}</bundle>
+        <bundle>mvn:org.apache.cxf/cxf-rt-transports-jbi/${cxf.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-cxf-se/${servicemix-cxf-se-version}</bundle>
+    </feature>
+    <feature name="servicemix-eip">
+        <feature>servicemix-shared</feature>
+        <bundle>mvn:org.apache.servicemix/servicemix-eip/${servicemix-eip-version}</bundle>
+    </feature>
+    <feature name="servicemix-saxon">
+        <feature>servicemix-shared</feature>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-saxon/${servicemix-saxon-version}</bundle>
+    </feature>
+    <feature name="servicemix-wsn2005">
+        <feature>servicemix-shared</feature>
+        <feature>activemq</feature>
+  	    <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo.wsmetadata.version}</bundle>
+  	    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
+  	    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix.specs.version}</bundle>
+  	    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.1/${servicemix.specs.version}</bundle>
+  	    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb.impl.version}</bundle>
+        <bundle>mvn:org.apache.servicemix/servicemix-wsn2005/${servicemix-wsn2005-version}</bundle>
+    </feature>
 </features>

Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=680346&r1=680345&r2=680346&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Mon Jul 28 06:24:57 2008
@@ -71,12 +71,14 @@
       <bnd.version>0.0.227</bnd.version>
       <cglib.version>2.1_3_1</cglib.version>
       <camel.version>1.4.0</camel.version>
+      <commons.httpclient.version>3.1_1-SNAPSHOT</commons.httpclient.version>
       <commons-io.version>1.3.2_1-SNAPSHOT</commons-io.version>
       <commons-jxpath.version>1.2_1-SNAPSHOT</commons-jxpath.version>
       <commons.logging.version>1.1</commons.logging.version>
+      <commons.net.version>1.4.1_1-SNAPSHOT</commons.net.version>
       <commons.pool.version>1.4</commons.pool.version>
       <components.version>4.0-SNAPSHOT</components.version>
-      <cxf.version>2.1.1</cxf.version>
+      <cxf.version>2.1.2-SNAPSHOT</cxf.version>
       <depends.maven.plugin.version>1.0-SNAPSHOT</depends.maven.plugin.version>
       <fastinfoset.version>1.2.2_1-SNAPSHOT</fastinfoset.version>
       <features.maven.plugin.version>1.0-SNAPSHOT</features.maven.plugin.version>
@@ -111,13 +113,15 @@
       <jaxb.impl.version>2.1.6_1-SNAPSHOT</jaxb.impl.version>
       <jaxws.api.version>2.1</jaxws.api.version>
       <jencks.version>2.1_1-SNAPSHOT</jencks.version>
-      <jetty.version>6.1.9</jetty.version>
+      <jetty.version>6.1.11</jetty.version>
+      <jetty.client.version>6.1.11_1-SNAPSHOT</jetty.client.version>
       <jline.version>0.9.94</jline.version>
       <junit.version>4.4</junit.version>
       <log4j.version>1.2.14</log4j.version>
       <mina.version>1.1.6_1</mina.version>
       <mina.original.version>1.1.6</mina.original.version>
       <neethi.version>2.0.4_1-SNAPSHOT</neethi.version>
+      <oro.version>2.0.8_1-SNAPSHOT</oro.version>
       <openejb.version>3.0-beta-2</openejb.version>
       <openjpa.version>1.0.1</openjpa.version>
       <pax.logging.version>1.1.1</pax.logging.version>
@@ -125,6 +129,7 @@
       <pax.web.version>0.4.1</pax.web.version>
       <pax.web.extender.version>0.3.0</pax.web.extender.version>
       <saaj.impl.version>1.3_1-SNAPSHOT</saaj.impl.version>
+      <saxon.version>9.1.0.1_1-SNAPSHOT</saxon.version>
       <servicemix3.version>3.3-SNAPSHOT</servicemix3.version>
       <servicemix.legal.version>1.0</servicemix.legal.version>
       <servicemix.kernel.version>1.0.0-SNAPSHOT</servicemix.kernel.version>
@@ -156,7 +161,6 @@
       <servicemix-file-version>4.0-SNAPSHOT</servicemix-file-version>
       <servicemix-jbi-plugin-version>4.0-SNAPSHOT</servicemix-jbi-plugin-version>
 
-      
       <spring.version>2.5.5</spring.version>
       <spring.osgi.version>1.1.0</spring.osgi.version>
       <wsdl4j.version>1.6.1_1-SNAPSHOT</wsdl4j.version>
@@ -164,7 +168,9 @@
       <xstream.version>1.2.2</xstream.version>
       <xbean.version>3.4.3</xbean.version>
       <xmlschema.version>1.4.2_1-SNAPSHOT</xmlschema.version>
+      <xmlsec.version>1.3.0_1-SNAPSHOT</xmlsec.version>
       <xmlresolver.version>1.2_1-SNAPSHOT</xmlresolver.version>
+      <wss4j.version>1.5.4_1-SNAPSHOT</wss4j.version>
   </properties>
 
    <repositories>



Mime
View raw message