svn commit: r756811 - in /servicemix/smx4/features/trunk: assembly/src/main/filtered-resources/features.xml camel/camel-features/pom.xml pom.xml

[ge...@apache.org]

Author: gertv
Date: Fri Mar 20 23:48:48 2009
New Revision: 756811

URL: http://svn.apache.org/viewvc?rev=756811&view=rev
Log:
Features generator includes wrong bundles for camel-jetty/camel-spring-integration

Modified:
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
    servicemix/smx4/features/trunk/camel/camel-features/pom.xml
    servicemix/smx4/features/trunk/pom.xml

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=756811&r1=756810&r2=756811&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 Fri Mar 20 23:48:48 2009
@@ -90,6 +90,21 @@
         <bundle>mvn:org.apache.camel/camel-osgi/${camel.version}</bundle>
         <bundle>mvn:org.apache.camel/camel-spring/${camel.version}</bundle>
     </feature>
+
+    <feature name='camel-jetty' version='${camel.version}'>
+        <feature version='${camel.version}'>camel-core</feature>
+        <feature version='${camel.version}'>camel-http</feature>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
+        <bundle>mvn:org.apache.camel/camel-jetty/${camel.version}</bundle>  
+    </feature> 
+
+    <feature name='camel-spring-integration' version='${camel.version}'>
+        <feature version='${camel.version}'>camel-core</feature>
+        <feature version='${camel.version}'>camel-spring</feature>
+        <bundle>mvn:org.springframework.integration/org.springframework.integration/${spring.integration.version}</bundle>
+        <bundle>mvn:org.apache.camel/camel-spring-integration/${camel.version}</bundle>
+    </feature>
+
     <!--
 	  -
 	  -  Examples

Modified: servicemix/smx4/features/trunk/camel/camel-features/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/camel-features/pom.xml?rev=756811&r1=756810&r2=756811&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/camel-features/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/camel-features/pom.xml Fri Mar 20 23:48:48 2009
@@ -133,11 +133,12 @@
        <artifactId>camel-mina</artifactId>
        <version>${camel.version}</version>
      </dependency>
+<!-- is in the assembly's features.xml - generator includes the discovered bundle instead of our fixed one    
      <dependency>
        <groupId>org.apache.camel</groupId>
        <artifactId>camel-jetty</artifactId>
        <version>${camel.version}</version>
-     </dependency>
+     </dependency> -->
      <dependency>
        <groupId>org.apache.camel</groupId>
        <artifactId>camel-jms</artifactId>
@@ -296,11 +297,12 @@
        <artifactId>camel-script</artifactId>
        <version>${camel.version}</version>
      </dependency>
+<!-- is in the assembly's features.xml - the 1.0.1.RELEASE version used requires a later version of spring
      <dependency>
        <groupId>org.apache.camel</groupId>
        <artifactId>camel-spring-integration</artifactId>
        <version>${camel.version}</version>
-     </dependency>
+     </dependency> -->
      <dependency>
        <groupId>org.apache.camel</groupId>
        <artifactId>camel-sql</artifactId>

Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=756811&r1=756810&r2=756811&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Fri Mar 20 23:48:48 2009
@@ -209,6 +209,7 @@
       <smack.version>3.0.4_1</smack.version>
       <snmp4j.version>1.8.1_1</snmp4j.version>
       <spring.version>2.5.6</spring.version>
+      <spring.integration.version>1.0.0.RC2</spring.integration.version>
       <spring.osgi.version>1.2.0-m2</spring.osgi.version>
       <stringtemplate.version>3.2_1-SNAPSHOT</stringtemplate.version>
       <velocity.version>1.5_1</velocity.version>