camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r949956 - in /camel/trunk: components/camel-blueprint/src/test/resources/ components/camel-spring-osgi/ components/camel-spring/ platforms/karaf/features/src/main/resources/
Date Tue, 01 Jun 2010 07:47:31 GMT
Author: gnodet
Date: Tue Jun  1 07:47:30 2010
New Revision: 949956

URL: http://svn.apache.org/viewvc?rev=949956&view=rev
Log:
CAMEL-2702: fix camel-spring(-osgi) to include the right packages, fix karaf features descriptor

Modified:
    camel/trunk/components/camel-blueprint/src/test/resources/test.xml
    camel/trunk/components/camel-spring-osgi/pom.xml
    camel/trunk/components/camel-spring/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/components/camel-blueprint/src/test/resources/test.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/test/resources/test.xml?rev=949956&r1=949955&r2=949956&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/test/resources/test.xml (original)
+++ camel/trunk/components/camel-blueprint/src/test/resources/test.xml Tue Jun  1 07:47:30
2010
@@ -27,3 +27,4 @@
     </camelContext>
 
 </blueprint>
+

Modified: camel/trunk/components/camel-spring-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-osgi/pom.xml?rev=949956&r1=949955&r2=949956&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-osgi/pom.xml (original)
+++ camel/trunk/components/camel-spring-osgi/pom.xml Tue Jun  1 07:47:30 2010
@@ -28,7 +28,6 @@
         *
       </camel.osgi.import>
       <camel.osgi.export>
-        org.apache.camel.osgi.*;${camel.osgi.version},
         org.apache.camel.spring.*;${camel.osgi.version},
         org.apache.camel.component;${camel.osgi.split.pkg};${camel.osgi.version},
         org.apache.camel.component.event;${camel.osgi.split.pkg};${camel.osgi.version},
@@ -36,6 +35,10 @@
         org.apache.camel.component.validator;${camel.osgi.split.pkg};${camel.osgi.version},
         org.apache.camel.component.xslt;${camel.osgi.split.pkg};${camel.osgi.version}
       </camel.osgi.export>
+      <camel.osgi.private.pkg>
+        org.apache.camel.core.xml*,
+        org.apache.camel.core.osgi*
+      </camel.osgi.private.pkg>
       <camel.osgi.activator>
         org.apache.camel.core.osgi.Activator
       </camel.osgi.activator>

Modified: camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=949956&r1=949955&r2=949956&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/pom.xml (original)
+++ camel/trunk/components/camel-spring/pom.xml Tue Jun  1 07:47:30 2010
@@ -42,7 +42,6 @@
         *
       </camel.osgi.import>
       <camel.osgi.export>
-        org.apache.camel.xml.*;${camel.osgi.version},
         org.apache.camel.spring.*;${camel.osgi.version},
         org.apache.camel.component;${camel.osgi.split.pkg};${camel.osgi.version},
         org.apache.camel.component.event;${camel.osgi.split.pkg};${camel.osgi.version},
@@ -50,6 +49,9 @@
         org.apache.camel.component.validator;${camel.osgi.split.pkg};${camel.osgi.version},
         org.apache.camel.component.xslt;${camel.osgi.split.pkg};${camel.osgi.version}
       </camel.osgi.export>
+      <camel.osgi.private.pkg>
+        org.apache.camel.core.xml*
+      </camel.osgi.private.pkg>
       <camel.osgi.dynamic>
           org.apache.camel.osgi;${camel.osgi.import.strict.version}
       </camel.osgi.dynamic>

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=949956&r1=949955&r2=949956&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 Tue Jun 
1 07:47:30 2010
@@ -47,8 +47,6 @@
     <feature version='${spring-osgi-version}'>spring-dm</feature>
     <bundle>mvn:org.springframework/spring-tx/${spring3-version}</bundle>
     <feature version='${pom.version}'>camel-core</feature>
-    <bundle>mvn:org.apache.camel/camel-core-xml/${pom.version}</bundle>
-    <bundle>mvn:org.apache.camel/camel-core-osgi/${pom.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-spring-osgi/${pom.version}</bundle>
   </feature>
   <feature name='camel-test' version='${pom.version}'>

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=949956&r1=949955&r2=949956&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue Jun  1 07:47:30
2010
@@ -47,10 +47,12 @@
     <feature version='${spring-osgi-version}'>spring-dm</feature>
     <bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
     <feature version='${pom.version}'>camel-core</feature>
-    <bundle>mvn:org.apache.camel/camel-core-xml/${pom.version}</bundle>
-    <bundle>mvn:org.apache.camel/camel-core-osgi/${pom.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-spring-osgi/${pom.version}</bundle>
   </feature>
+  <feature name='camel-blueprint' version='${pom.version}'>
+    <feature version='${pom.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-blueprint/${pom.version}</bundle>
+  </feature>
   <feature name='camel-test' version='${pom.version}'>
     <feature version='${pom.version}'>camel-spring-osgi</feature>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle>
   



Mime
View raw message