You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2010/01/25 14:10:32 UTC

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

Author: gertv
Date: Mon Jan 25 13:10:32 2010
New Revision: 902802

URL: http://svn.apache.org/viewvc?rev=902802&view=rev
Log:
SMX4-467: Incomplete feature for servicemix-http

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

Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=902802&r1=902801&r2=902802&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Mon Jan 25 13:10:32 2010
@@ -475,11 +475,6 @@
             <version>${version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.cxf</groupId>
-            <artifactId>org.apache.servicemix.cxf.transport.osgi</artifactId>
-            <version>${version}</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.servicemix.war</groupId>
             <artifactId>org.apache.servicemix.war.deployer</artifactId>
             <version>${version}</version>
@@ -874,6 +869,11 @@
         </dependency>
         <dependency>
           <groupId>org.apache.camel</groupId>
+          <artifactId>camel-spring-osgi</artifactId>
+          <version>${camel.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.camel</groupId>
           <artifactId>camel-jms</artifactId>
           <version>${camel.version}</version>
         </dependency>

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=902802&r1=902801&r2=902802&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 Jan 25 13:10:32 2010
@@ -194,6 +194,7 @@
     </feature>
     <feature name="servicemix-http" version="${servicemix-http-version}">
         <feature version="${servicemix-shared-version}">servicemix-shared</feature>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons.httpclient.version}</bundle>
         <bundle>mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}</bundle>