camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r950862 - in /camel/trunk/platforms/karaf/features: pom.xml src/main/resources/features-spring3.xml src/main/resources/features.xml
Date Thu, 03 Jun 2010 03:38:23 GMT
Author: ningjiang
Date: Thu Jun  3 03:38:23 2010
New Revision: 950862

URL: http://svn.apache.org/viewvc?rev=950862&view=rev
Log:
Updated the apache camel features file according to recent osgi changes

Modified:
    camel/trunk/platforms/karaf/features/pom.xml
    camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml
    camel/trunk/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=950862&r1=950861&r2=950862&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Thu Jun  3 03:38:23 2010
@@ -97,6 +97,7 @@
       <openjpa-bundle-version>1.2.1_2</openjpa-bundle-version>
       <opensaml-version>1.1_3</opensaml-version>
       <oscache-bundle-version>2.4_3</oscache-bundle-version>
+      <osgi.compendium.version>4.2.0</osgi.compendium.version>
       <protobuf-java-bundle-version>2.2.0_1</protobuf-java-bundle-version>
       <pax.web.version>0.7.2</pax.web.version>
       <quartz-bundle-version>1.6.6_1</quartz-bundle-version>

Modified: camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml?rev=950862&r1=950861&r2=950862&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml Thu Jun 
3 03:38:23 2010
@@ -22,7 +22,7 @@
     </config>
     <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty6-bundle-version}</bundle>
-    <bundle>mvn:org.osgi/org.osgi.compendium/4.2.0</bundle>
+    <bundle>mvn:org.osgi/org.osgi.compendium/${osgi.compendium.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>
@@ -49,6 +49,12 @@
     <feature version='${pom.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-spring/${pom.version}</bundle>
   </feature>
+  <feature name='camel-blueprint' version='${pom.version}'>
+     <feature version='${pom.version}'>camel-core</feature>
+     <bundle>mvn:org.osgi/org.osgi.compendium/${osgi.compendium.version}</bundle>
+     <bundle>mvn:org.apache.camel/camel-blueprint/${pom.version}</bundle>
+     <bundle>mvn:org.apache.aries.blueprint/org.apache.aries.blueprint/${aries-blueprint-version}</bundle>
+  </feature>
   <feature name='camel-test' version='${pom.version}'>
     <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle>
   

Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=950862&r1=950861&r2=950862&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu Jun  3 03:38:23
2010
@@ -22,7 +22,7 @@
     </config>
     <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty6-bundle-version}</bundle>
-    <bundle>mvn:org.osgi/org.osgi.compendium/4.2.0</bundle>
+    <bundle>mvn:org.osgi/org.osgi.compendium/${osgi.compendium.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>
@@ -51,7 +51,9 @@
   </feature>
   <feature name='camel-blueprint' version='${pom.version}'>
     <feature version='${pom.version}'>camel-core</feature>
+    <bundle>mvn:org.osgi/org.osgi.compendium/${osgi.compendium.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-blueprint/${pom.version}</bundle>
+    <bundle>mvn:org.apache.aries.blueprint/org.apache.aries.blueprint/${aries-blueprint-version}</bundle>
   </feature>
   <feature name='camel-test' version='${pom.version}'>
     <feature version='${pom.version}'>camel-spring</feature>



Mime
View raw message