svn commit: r680386 - in /servicemix/components/engines/servicemix-camel/trunk/src/main: java/org/apache/servicemix/camel/ resources/META-INF/spring/

[gnodet]

Author: gnodet
Date: Mon Jul 28 09:07:37 2008
New Revision: 680386

URL: http://svn.apache.org/viewvc?rev=680386&view=rev
Log:
SM-1387: make servicemix-camel OSGi friendly

Modified:
    
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelJbiComponent.java
    
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelJbiEndpoint.java
    
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/ToJbiProcessor.java
    
servicemix/components/engines/servicemix-camel/trunk/src/main/resources/META-INF/spring/servicemix-camel.xml

Modified: 
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelJbiComponent.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelJbiComponent.java?rev=680386&r1=680385&r2=680386&view=diff
==============================================================================
--- 
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelJbiComponent.java
 (original)
+++ 
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelJbiComponent.java
 Mon Jul 28 09:07:37 2008
@@ -36,10 +36,10 @@
 import org.apache.servicemix.common.BaseServiceUnitManager;
 import org.apache.servicemix.common.DefaultComponent;
 import org.apache.servicemix.common.Deployer;
+import org.apache.servicemix.common.util.IntrospectionSupport;
+import org.apache.servicemix.common.util.URIResolver;
+import org.apache.servicemix.common.util.URISupport;
 import org.apache.servicemix.id.IdGenerator;
-import org.apache.servicemix.jbi.resolver.URIResolver;
-import org.apache.servicemix.jbi.util.IntrospectionSupport;
-import org.apache.servicemix.jbi.util.URISupport;
 
 /**
  * Deploys the camel endpoints within JBI

Modified: 
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelJbiEndpoint.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelJbiEndpoint.java?rev=680386&r1=680385&r2=680386&view=diff
==============================================================================
--- 
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelJbiEndpoint.java
 (original)
+++ 
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelJbiEndpoint.java
 Mon Jul 28 09:07:37 2008
@@ -26,7 +26,7 @@
 import org.apache.camel.Processor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.JbiConstants;
+import org.apache.servicemix.common.JbiConstants;
 import org.apache.servicemix.common.ServiceUnit;
 import org.apache.servicemix.common.endpoints.ProviderEndpoint;
 

Modified: 
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/ToJbiProcessor.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/ToJbiProcessor.java?rev=680386&r1=680385&r2=680386&view=diff
==============================================================================
--- 
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/ToJbiProcessor.java
 (original)
+++ 
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/ToJbiProcessor.java
 Mon Jul 28 09:07:37 2008
@@ -31,7 +31,7 @@
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
-import org.apache.servicemix.jbi.resolver.URIResolver;
+import org.apache.servicemix.common.util.URIResolver;
 
 /**
  * A

Modified: 
servicemix/components/engines/servicemix-camel/trunk/src/main/resources/META-INF/spring/servicemix-camel.xml
URL: 
http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/resources/META-INF/spring/servicemix-camel.xml?rev=680386&r1=680385&r2=680386&view=diff
==============================================================================
--- 
servicemix/components/engines/servicemix-camel/trunk/src/main/resources/META-INF/spring/servicemix-camel.xml
 (original)
+++ 
servicemix/components/engines/servicemix-camel/trunk/src/main/resources/META-INF/spring/servicemix-camel.xml
 Mon Jul 28 09:07:37 2008
@@ -32,7 +32,11 @@
     <bean id="servicemix-camel" 
class="org.apache.servicemix.camel.CamelJbiComponent">
     </bean>
 
-    <osgi:service ref="servicemix-camel" 
interface="javax.jbi.component.Component">
+    <osgi:service ref="servicemix-camel">
+        <osgi:interfaces>
+            <value>javax.jbi.component.Component</value>
+            <value>org.apache.camel.Component</value>
+        </osgi:interfaces>
         <osgi:service-properties>
             <entry key="NAME" value="servicemix-camel" />
             <entry key="TYPE" value="service-engine" />