servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r901569 - /servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
Date Thu, 21 Jan 2010 06:48:31 GMT
Author: ffang
Date: Thu Jan 21 06:48:22 2010
New Revision: 901569

URL: http://svn.apache.org/viewvc?rev=901569&view=rev
Log:
[SMX4-426]reuse karaf http feature in features web-core

Modified:
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.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=901569&r1=901568&r2=901569&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 Thu Jan
21 06:48:22 2010
@@ -19,6 +19,7 @@
 <features>
     <repository>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</repository>
     <repository>mvn:org.apache.camel.karaf/features/${camel.version}/xml/features</repository>
+    <repository>mvn:org.apache.felix.karaf/apache-felix-karaf/${felix.karaf.version}/xml/features</repository>
     <feature name="connector" version="${version}">
         <feature version="${servicemix.nmr.version}">transaction</feature>
         <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo.j2ee.connector.version}</bundle>
@@ -29,13 +30,8 @@
         <bundle>mvn:org.jencks/jencks/${jencks.version}</bundle>
     </feature>
     <feature name="web-core" version="${version}">
-        <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.jetty-bundle/${jetty.bundle.version}</bundle>
+        <feature version="${felix.karaf.version}">http</feature>
         <bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
-        <bundle>mvn:org.ops4j.pax.web/pax-web-api/${pax.web.version}</bundle>
-        <bundle>mvn:org.ops4j.pax.web/pax-web-spi/${pax.web.version}</bundle>
-        <bundle>mvn:org.ops4j.pax.web/pax-web-runtime/${pax.web.version}</bundle>
-        <bundle>mvn:org.ops4j.pax.web/pax-web-jetty/${pax.web.version}</bundle>
     </feature>
     <feature name="web" version="${version}">
         <feature version="${version}">web-core</feature>



Mime
View raw message