camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r950563 - in /camel/trunk: components/ components/camel-osgi/src/test/java/org/apache/camel/core/ components/camel-osgi/src/test/java/org/apache/camel/osgi/ components/camel-osgi/src/test/resources/META-INF/services/ components/camel-osgi/s...
Date Wed, 02 Jun 2010 13:34:44 GMT
Author: gnodet
Date: Wed Jun  2 13:34:43 2010
New Revision: 950563

URL: http://svn.apache.org/viewvc?rev=950563&view=rev
Log:
CAMEL-2781: Merge camel-spring-osgi and camel-osgi into camel-spring

Added:
    camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/
      - copied from r950380, camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/
    camel/trunk/components/camel-spring/src/main/resources/camel-osgi.xsd
      - copied unchanged from r950380, camel/trunk/components/camel-osgi/src/main/resources/camel-osgi.xsd
    camel/trunk/components/camel-spring/src/main/resources/org/apache/camel/osgi/
      - copied from r950380, camel/trunk/components/camel-osgi/src/main/resources/org/apache/camel/osgi/
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/core/
      - copied from r950380, camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/osgi/
      - copied from r950380, camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/
    camel/trunk/components/camel-spring/src/test/resources/META-INF/services/
      - copied from r950380, camel/trunk/components/camel-osgi/src/test/resources/META-INF/services/
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/osgi/
      - copied from r950380, camel/trunk/components/camel-osgi/src/test/resources/org/apache/camel/osgi/
Removed:
    camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/
    camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/
    camel/trunk/components/camel-osgi/src/test/resources/META-INF/services/
    camel/trunk/components/camel-osgi/src/test/resources/org/apache/camel/osgi/
    camel/trunk/components/camel-spring-osgi/
Modified:
    camel/trunk/components/camel-spring/pom.xml
    camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
    camel/trunk/components/camel-spring/src/main/resources/META-INF/spring.handlers
    camel/trunk/components/camel-spring/src/main/resources/META-INF/spring.schemas
    camel/trunk/components/pom.xml
    camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml
    camel/trunk/platforms/karaf/features/src/main/resources/features.xml
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/VelocityTest.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterSpringTest.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java
    camel/trunk/tests/pom.xml

Modified: camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=950563&r1=950562&r2=950563&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/pom.xml (original)
+++ camel/trunk/components/camel-spring/pom.xml Wed Jun  2 13:34:43 2010
@@ -33,16 +33,20 @@
   <properties>
       <camel.osgi.import>
         !org.apache.camel.spring.*,
+        !org.apache.camel.osgi.*,
         !org.apache.camel.component,
         !org.apache.camel.component.event,
         !org.apache.camel.component.validator,
         !org.apache.camel.component.xslt,
         org.apache.camel.*;${camel.osgi.import.strict.version},
+        org.osgi.framework;version="[1.3,2)",
+        org.springframework.osgi.*;version="[1.2,2)",
         org.springframework.*;version="[2.5,4)",
         *
       </camel.osgi.import>
       <camel.osgi.export>
         org.apache.camel.spring.*;${camel.osgi.version},
+        org.apache.camel.osgi.*;${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},
         org.apache.camel.component.test;${camel.osgi.split.pkg};${camel.osgi.version},
@@ -50,11 +54,12 @@
         org.apache.camel.component.xslt;${camel.osgi.split.pkg};${camel.osgi.version}
       </camel.osgi.export>
       <camel.osgi.private.pkg>
+        org.apache.camel.core.osgi*,
         org.apache.camel.core.xml*
       </camel.osgi.private.pkg>
-      <camel.osgi.dynamic>
-          org.apache.camel.osgi;${camel.osgi.import.strict.version}
-      </camel.osgi.dynamic>
+      <camel.osgi.activator>
+        org.apache.camel.core.osgi.Activator
+      </camel.osgi.activator>
   </properties>
 
   <dependencies>
@@ -66,6 +71,7 @@
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core-xml</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -79,6 +85,23 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core-osgi</artifactId>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.osgi</groupId>
+      <artifactId>spring-osgi-core</artifactId>
+      <optional>true</optional>
+    </dependency>
 
     <!-- for testing -->
     <dependency>
@@ -122,6 +145,11 @@
       <artifactId>log4j</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-script</artifactId>
+      <scope>test</scope>
+    </dependency>
 
       <!-- for testing Spring AOP at class level -->
       <dependency>
@@ -149,6 +177,13 @@
         <scope>test</scope>
       </dependency>
 
+      <!-- for testing with osgi -->
+      <dependency>
+        <groupId>org.springframework.osgi</groupId>
+        <artifactId>spring-osgi-mock</artifactId>
+        <scope>test</scope>
+      </dependency>
+
   </dependencies>
 
   <repositories>

Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java?rev=950563&r1=950562&r2=950563&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
(original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
Wed Jun  2 13:34:43 2010
@@ -114,9 +114,16 @@ public class CamelNamespaceHandler exten
         boolean osgi = false;
         Class cl = CamelContextFactoryBean.class;
         try {
-            cl = Class.forName("org.apache.camel.osgi.CamelContextFactoryBean");
-            osgi = true;
+            Class c = Class.forName("org.apache.camel.core.osgi.Activator");
+            Method mth = c.getDeclaredMethod("getBundle");
+            mth.setAccessible(true);
+            Object bundle = mth.invoke(null);
+            if (bundle != null) {
+                cl = Class.forName("org.apache.camel.osgi.CamelContextFactoryBean");
+                osgi = true;
+            }
         } catch (Throwable t) {
+            t.printStackTrace();
             // not running with camel-osgi so we fallback to the regular factory bean
             LOG.trace("Cannot find class so assuming not running in OSGi container: " + t.getMessage());
         }

Modified: camel/trunk/components/camel-spring/src/main/resources/META-INF/spring.handlers
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/resources/META-INF/spring.handlers?rev=950563&r1=950562&r2=950563&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/resources/META-INF/spring.handlers (original)
+++ camel/trunk/components/camel-spring/src/main/resources/META-INF/spring.handlers Wed Jun
 2 13:34:43 2010
@@ -17,3 +17,4 @@
 
 http\://camel.apache.org/schema/spring=org.apache.camel.spring.handler.CamelNamespaceHandler
 http\://camel.apache.org/schema/spring/v${camel.schema.version}=org.apache.camel.spring.handler.CamelNamespaceHandler
+http\://camel.apache.org/schema/osgi=org.apache.camel.osgi.CamelNamespaceHandler

Modified: camel/trunk/components/camel-spring/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/resources/META-INF/spring.schemas?rev=950563&r1=950562&r2=950563&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/resources/META-INF/spring.schemas (original)
+++ camel/trunk/components/camel-spring/src/main/resources/META-INF/spring.schemas Wed Jun
 2 13:34:43 2010
@@ -27,3 +27,14 @@ http\://camel.apache.org/schema/spring/c
 http\://camel.apache.org/schema/spring/camel-spring-2.2.0.xsd=camel-spring.xsd
 http\://camel.apache.org/schema/spring/camel-spring-2.3.0.xsd=camel-spring.xsd
 http\://camel.apache.org/schema/spring/camel-spring-${pom.version}.xsd=camel-spring.xsd
+
+http\://camel.apache.org/schema/osgi/camel-osgi.xsd=camel-osgi.xsd
+
+http\://camel.apache.org/schema/osgi/camel-osgi-2.0-M1.xsd=camel-osgi.xsd
+http\://camel.apache.org/schema/osgi/camel-osgi-2.0-M2.xsd=camel-osgi.xsd
+http\://camel.apache.org/schema/osgi/camel-osgi-2.0-M3.xsd=camel-osgi.xsd
+http\://camel.apache.org/schema/osgi/camel-osgi-2.0.0.xsd=camel-osgi.xsd
+http\://camel.apache.org/schema/osgi/camel-osgi-2.1.0.xsd=camel-osgi.xsd
+http\://camel.apache.org/schema/osgi/camel-osgi-2.2.0.xsd=camel-osgi.xsd
+http\://camel.apache.org/schema/osgi/camel-osgi-2.3.0.xsd=camel-osgi.xsd
+http\://camel.apache.org/schema/osgi/camel-osgi-${pom.version}.xsd=camel-osgi.xsd

Modified: camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=950563&r1=950562&r2=950563&view=diff
==============================================================================
--- camel/trunk/components/pom.xml (original)
+++ camel/trunk/components/pom.xml Wed Jun  2 13:34:43 2010
@@ -85,7 +85,6 @@
     <module>camel-ode</module>
 -->
     <module>camel-ognl</module>
-    <module>camel-osgi</module>
     <module>camel-printer</module>
     <module>camel-protobuf</module>
     <module>camel-quartz</module>
@@ -104,7 +103,6 @@
     <module>camel-spring</module>
     <module>camel-spring-integration</module>
     <module>camel-spring-javaconfig</module>
-    <module>camel-spring-osgi</module>
     <module>camel-spring-security</module>
     <module>camel-sql</module>
     <module>camel-stringtemplate</module>

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=950563&r1=950562&r2=950563&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 Wed Jun 
2 13:34:43 2010
@@ -30,7 +30,7 @@
   </feature>
   <feature name='camel' version='${pom.version}'>
     <feature version='${pom.version}'>camel-core</feature>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
   </feature>
   <feature name='camel-core' version='${pom.version}'>
     <feature version="${spring3-version}">spring</feature>
@@ -41,16 +41,16 @@
     <bundle>mvn:org.fusesource.commonman/commons-management/${commons-management-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-core/${pom.version}</bundle>
   </feature>
-  <feature name='camel-spring-osgi' version='${pom.version}'>
+  <feature name='camel-spring' version='${pom.version}'>
     <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
     <feature version='${spring3-version}'>spring</feature>
     <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-spring-osgi/${pom.version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-spring/${pom.version}</bundle>
   </feature>
   <feature name='camel-test' version='${pom.version}'>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle>
   
     <bundle>mvn:org.apache.camel/camel-test/${pom.version}</bundle>
   </feature> 
@@ -94,7 +94,7 @@
     <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata-spec-version}</bundle>
     <bundle>mvn:org.apache.cxf/cxf-bundle/${cxf-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io-bundle-version}</bundle>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
     <feature version='${pom.version}'>http</feature>
     <bundle>mvn:org.apache.camel/camel-cxf/${pom.version}</bundle>
   </feature>
@@ -233,13 +233,13 @@
   </feature>
   <feature name='camel-flatpack' version='${pom.version}'>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jexcelapi/${jexcelapi-bundle-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.flatpack/${flatpack-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-flatpack/${pom.version}</bundle>
   </feature>
   <feature name='camel-freemarker' version='${pom.version}'>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.freemarker/${freemarker-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-freemarker/${pom.version}</bundle>
   </feature>
@@ -283,7 +283,7 @@
     <bundle>mvn:org.apache.camel/camel-hawtdb/${pom.version}</bundle>
   </feature>	  
   <feature name='camel-ibatis' version='${pom.version}'>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
     <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
     <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle>
@@ -314,7 +314,7 @@
     <bundle>mvn:org.apache.camel/camel-jcr/${pom.version}</bundle>
   </feature>
   <feature name='camel-jing' version='${pom.version}'>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax-bundle-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jing/${jing-bundle-version}</bundle>
@@ -387,7 +387,7 @@
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-msv/${pom.version}</bundle>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
   </feature>
   <feature name='camel-mvel' version='${pom.version}'>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/${mvel-bundle-version}</bundle>
@@ -446,7 +446,7 @@
     <bundle>mvn:org.apache.camel/camel-rss/${pom.version}</bundle>
   </feature>
   <feature name='camel-saxon' version='${pom.version}'>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-saxon/${pom.version}</bundle>
   </feature>
@@ -479,12 +479,12 @@
   </feature>  
   <feature name='camel-spring-integration' version='${pom.version}'>
     <bundle>mvn:http://repository.springsource.com/maven/bundles/release!org.springframework.integration/org.springframework.integration/${spring-integration-version}</bundle>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.apache.camel/camel-spring-integration/${pom.version}</bundle>
   </feature>
   <feature name='camel-spring-javaconfig' version='${pom.version}'>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.springframework/spring-test/${spring3-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-spring-javaconfig/${pom.version}</bundle>
   </feature>
@@ -500,7 +500,7 @@
     <bundle>mvn:org.apache.camel/camel-stream/${pom.version}</bundle>
   </feature>
   <feature name='camel-string-template' version='${pom.version}'>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.stringtemplate/${stringtemplate-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-stringtemplate/${pom.version}</bundle>
@@ -520,7 +520,7 @@
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.werken-xpath/${werken-xpath-bundle-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity-bundle-version}</bundle>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.apache.camel/camel-velocity/${pom.version}</bundle>
   </feature>
   <feature name='camel-xmlbeans' 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=950563&r1=950562&r2=950563&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed Jun  2 13:34:43
2010
@@ -30,7 +30,7 @@
   </feature>
   <feature name='camel' version='${pom.version}'>
     <feature version='${pom.version}'>camel-core</feature>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
   </feature>
   <feature name='camel-core' version='${pom.version}'>
     <feature version="${spring-version}">spring</feature>
@@ -41,20 +41,20 @@
     <bundle>mvn:org.fusesource.commonman/commons-management/${commons-management-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-core/${pom.version}</bundle>
   </feature>
-  <feature name='camel-spring-osgi' version='${pom.version}'>
+  <feature name='camel-spring' version='${pom.version}'>
     <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
     <feature version='${spring-version}'>spring</feature>
     <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-spring-osgi/${pom.version}</bundle>
+    <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.apache.camel/camel-blueprint/${pom.version}</bundle>
   </feature>
   <feature name='camel-test' version='${pom.version}'>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle>
   
     <bundle>mvn:org.apache.camel/camel-test/${pom.version}</bundle>
   </feature> 
@@ -98,7 +98,7 @@
     <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata-spec-version}</bundle>
     <bundle>mvn:org.apache.cxf/cxf-bundle/${cxf-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io-bundle-version}</bundle>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
     <feature version='${pom.version}'>http</feature>
     <bundle>mvn:org.apache.camel/camel-cxf/${pom.version}</bundle>
   </feature>
@@ -237,13 +237,13 @@
   </feature>
   <feature name='camel-flatpack' version='${pom.version}'>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jexcelapi/${jexcelapi-bundle-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.flatpack/${flatpack-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-flatpack/${pom.version}</bundle>
   </feature>
   <feature name='camel-freemarker' version='${pom.version}'>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.freemarker/${freemarker-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-freemarker/${pom.version}</bundle>
   </feature>
@@ -287,7 +287,7 @@
     <bundle>mvn:org.apache.camel/camel-hawtdb/${pom.version}</bundle>
   </feature>	  
   <feature name='camel-ibatis' version='${pom.version}'>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
     <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
     <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle>
@@ -318,7 +318,7 @@
     <bundle>mvn:org.apache.camel/camel-jcr/${pom.version}</bundle>
   </feature>
   <feature name='camel-jing' version='${pom.version}'>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax-bundle-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jing/${jing-bundle-version}</bundle>
@@ -391,7 +391,7 @@
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-msv/${pom.version}</bundle>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
   </feature>
   <feature name='camel-mvel' version='${pom.version}'>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/${mvel-bundle-version}</bundle>
@@ -450,7 +450,7 @@
     <bundle>mvn:org.apache.camel/camel-rss/${pom.version}</bundle>
   </feature>
   <feature name='camel-saxon' version='${pom.version}'>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-saxon/${pom.version}</bundle>
   </feature>
@@ -483,7 +483,7 @@
   </feature>  
   <feature name='camel-spring-integration' version='${pom.version}'>
     <bundle>mvn:http://repository.springsource.com/maven/bundles/release!org.springframework.integration/org.springframework.integration/${spring-integration-version}</bundle>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.apache.camel/camel-spring-integration/${pom.version}</bundle>
   </feature>
   <!-- current camel-spring-javaconfig need to use spring 3.0.0.RELEASE, so we comment
it out
@@ -492,7 +492,7 @@
     <bundle>mvn:http://repository.springsource.com/maven/bundles/release!org.springframework/org.springframework.test/${spring-version}</bundle>
     <bundle>mvn:http://svn.apache.org/repos/asf/camel/m2-repo!org.springframework.javaconfig/org.springframework.config.java/${spring-javaconfig-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.apache.camel/camel-spring-javaconfig/${pom.version}</bundle>
   </feature-->
   <feature name='camel-sql' version='${pom.version}'>
@@ -507,7 +507,7 @@
     <bundle>mvn:org.apache.camel/camel-stream/${pom.version}</bundle>
   </feature>
   <feature name='camel-string-template' version='${pom.version}'>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.stringtemplate/${stringtemplate-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-stringtemplate/${pom.version}</bundle>
@@ -527,7 +527,7 @@
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.werken-xpath/${werken-xpath-bundle-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity-bundle-version}</bundle>
-    <feature version='${pom.version}'>camel-spring-osgi</feature>
+    <feature version='${pom.version}'>camel-spring</feature>
     <bundle>mvn:org.apache.camel/camel-velocity/${pom.version}</bundle>
   </feature>
   <feature name='camel-xmlbeans' version='${pom.version}'>

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java?rev=950563&r1=950562&r2=950563&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java
Wed Jun  2 13:34:43 2010
@@ -132,7 +132,7 @@ public class MailRouteTest extends OSGiI
             // using the features to install the camel components             
             scanFeatures(mavenBundle().groupId("org.apache.camel.karaf").
                          artifactId("apache-camel").versionAsInProject().type("xml/features"),
                        
-                          "camel-core", "camel-spring-osgi", "camel-test"),
+                          "camel-core", "camel-spring", "camel-test"),
             
             // using the java mail API bundle
             mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.javamail-api-1.4").version("1.3.0"),

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java?rev=950563&r1=950562&r2=950563&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
Wed Jun  2 13:34:43 2010
@@ -71,7 +71,7 @@ public class OSGiIntegrationTestSupport 
             // using the features to install the camel components             
             scanFeatures(mavenBundle().groupId("org.apache.camel.karaf").
                          artifactId("apache-camel").versionAsInProject().type("xml/features"),
                        
-                          "camel-core", "camel-spring-osgi", "camel-test"),
+                          "camel-core", "camel-spring", "camel-test"),
             
             workingDirectory("target/paxrunner/"),
 

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/VelocityTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/VelocityTest.java?rev=950563&r1=950562&r2=950563&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/VelocityTest.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/VelocityTest.java
Wed Jun  2 13:34:43 2010
@@ -84,7 +84,7 @@ public class VelocityTest extends OSGiIn
             // using the features to install the camel components             
             scanFeatures(mavenBundle().groupId("org.apache.camel.karaf").
                          artifactId("apache-camel").versionAsInProject().type("xml/features").versionAsInProject().type("xml/features"),
                        
-                          "camel-core", "camel-spring-osgi", "camel-test", "camel-velocity"),
+                          "camel-core", "camel-spring", "camel-test", "camel-velocity"),
             
             workingDirectory("target/paxrunner/"),
 

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterSpringTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterSpringTest.java?rev=950563&r1=950562&r2=950563&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterSpringTest.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterSpringTest.java
Wed Jun  2 13:34:43 2010
@@ -68,7 +68,7 @@ public class JaxbFallbackConverterSpring
             // using the features to install the camel components             
             scanFeatures(mavenBundle().groupId("org.apache.camel.karaf").
                          artifactId("apache-camel").versionAsInProject().type("xml/features"),
                        
-                          "camel-core", "camel-spring-osgi", "camel-test", "camel-jaxb"),

+                          "camel-core", "camel-spring", "camel-test", "camel-jaxb"),
             
             workingDirectory("target/paxrunner/"),
 

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java?rev=950563&r1=950562&r2=950563&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java
Wed Jun  2 13:34:43 2010
@@ -75,7 +75,7 @@ public class JaxbFallbackConverterTest e
             // using the features to install the camel components             
             scanFeatures(mavenBundle().groupId("org.apache.camel.karaf").
                          artifactId("apache-camel").versionAsInProject().type("xml/features"),
                        
-                          "camel-core", "camel-spring-osgi", "camel-test", "camel-jaxb"),
+                          "camel-core", "camel-spring", "camel-test", "camel-jaxb"),
             
             workingDirectory("target/paxrunner/"),
 

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java?rev=950563&r1=950562&r2=950563&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
Wed Jun  2 13:34:43 2010
@@ -136,7 +136,7 @@ public class JpaRouteTest extends OSGiIn
             // using the features to install the camel components             
             scanFeatures(mavenBundle().groupId("org.apache.camel.karaf").
                          artifactId("apache-camel").versionAsInProject().type("xml/features"),
                        
-                          "camel-core", "camel-spring-osgi", "camel-test", "camel-jpa"),
+                          "camel-core", "camel-spring", "camel-test", "camel-jpa"),
            
             /* This the camel-jpa needed bundles 
             mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.java-persistence-api-1.1.1").version("1.4-SNAPSHOT"),

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java?rev=950563&r1=950562&r2=950563&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java
Wed Jun  2 13:34:43 2010
@@ -127,7 +127,7 @@ public class ProtobufRouteTest extends O
             // using the features to install the camel components             
             scanFeatures(mavenBundle().groupId("org.apache.camel.karaf").
                          artifactId("apache-camel").versionAsInProject().type("xml/features"),
                        
-                          "camel-core", "camel-spring-osgi", "camel-test", "camel-protobuf"),
+                          "camel-core", "camel-spring", "camel-test", "camel-protobuf"),
             
             workingDirectory("target/paxrunner/"),
 

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java?rev=950563&r1=950562&r2=950563&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java
Wed Jun  2 13:34:43 2010
@@ -60,7 +60,7 @@ public class ServletComponentTest extend
             // using the features to install the camel components             
             scanFeatures(mavenBundle().groupId("org.apache.camel.karaf").
                          artifactId("apache-camel").versionAsInProject().type("xml/features"),
                        
-                          "camel-core", "camel-spring-osgi", "camel-test", "camel-http",
"camel-servlet"),
+                          "camel-core", "camel-spring", "camel-test", "camel-http", "camel-servlet"),
           
                 
             workingDirectory("target/paxrunner/"),

Modified: camel/trunk/tests/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/pom.xml?rev=950563&r1=950562&r2=950563&view=diff
==============================================================================
--- camel/trunk/tests/pom.xml (original)
+++ camel/trunk/tests/pom.xml Wed Jun  2 13:34:43 2010
@@ -35,6 +35,7 @@
     <module>camel-itest</module>
     <module>camel-itest-spring-2.0</module>
     <module>camel-partial-classpath-test</module>
+    <module>camel-itest-osgi</module>
   </modules>
 
   <profiles>
@@ -42,7 +43,6 @@
       <!-- default profile enables checkstyle and Xlint stuff -->
       <id>osgi.test</id>
       <modules>
-        <module>camel-itest-osgi</module>
         <module>camel-itest-karaf</module>
       </modules>
     </profile>



Mime
View raw message