You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2010/08/18 00:37:18 UTC
svn commit: r986513 - in
/servicemix/components/engines/servicemix-camel/trunk/src/main:
java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java
resources/OSGI-INF/blueprint/servicemix-camel.xml
Author: gertv
Date: Tue Aug 17 22:37:18 2010
New Revision: 986513
URL: http://svn.apache.org/viewvc?rev=986513&view=rev
Log:
SMXCOMP-777: Fix blueprint implementation for servicemix-camel
Modified:
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java
servicemix/components/engines/servicemix-camel/trunk/src/main/resources/OSGI-INF/blueprint/servicemix-camel.xml
Modified: servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java?rev=986513&r1=986512&r2=986513&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java Tue Aug 17 22:37:18 2010
@@ -52,7 +52,7 @@ import org.springframework.osgi.util.Bun
* make sure the CamelContextFactoryBean will replace the regular ResolverUtils
* with OSGi ResolverUtils
*/
-public class OsgiCamelJbiComponent extends CamelJbiComponent implements BundleContextAware {
+public class OsgiCamelJbiComponent extends CamelJbiComponent {
private static final Log LOG = LogFactory.getLog(OsgiCamelJbiComponent.class);
private BundleContext bundleContext;
Modified: servicemix/components/engines/servicemix-camel/trunk/src/main/resources/OSGI-INF/blueprint/servicemix-camel.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/resources/OSGI-INF/blueprint/servicemix-camel.xml?rev=986513&r1=986512&r2=986513&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/main/resources/OSGI-INF/blueprint/servicemix-camel.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/main/resources/OSGI-INF/blueprint/servicemix-camel.xml Tue Aug 17 22:37:18 2010
@@ -29,6 +29,7 @@
</cm:property-placeholder>
<bean id="servicemix-camel" class="org.apache.servicemix.camel.osgi.OsgiCamelJbiComponent">
+ <property name="bundleContext" ref="blueprintBundleContext"/>
<property name="shutdownTimeout" value="${shutdownTimeout}"/>
</bean>