svn commit: r775963 - in /camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi: CamelContextFactory.java CamelContextFactoryBean.java

[ningjiang]

Author: ningjiang
Date: Mon May 18 14:12:43 2009
New Revision: 775963

URL: http://svn.apache.org/viewvc?rev=775963&view=rev
Log:
CAMEL-1622 set the OsgiFactoryFinder to the CamelContext in OSGi plateform

Modified:
    
camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactory.java
    
camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java

Modified: 
camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactory.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactory.java?rev=775963&r1=775962&r2=775963&view=diff
==============================================================================
--- 
camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactory.java
 (original)
+++ 
camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactory.java
 Mon May 18 14:12:43 2009
@@ -52,11 +52,13 @@
     public DefaultCamelContext createContext() {
         DefaultCamelContext context = new DefaultCamelContext();
         if (bundleContext != null) {
-            LOG.debug("The bundle context is not be null, let's setup the Osgi 
resolvers");
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("The bundle context is not be null, let's setup the 
Osgi resolvers");
+            }
+            context.setFactoryFinderClass(OsgiFactoryFinder.class);
             context.setComponentResolver(new OsgiComponentResolver());
             context.setLanguageResolver(new OsgiLanguageResolver());
-            addOsgiAnnotationTypeConverterLoader(context, bundleContext);
-            context.setFactoryFinderClass(OsgiFactoryFinder.class);
+            addOsgiAnnotationTypeConverterLoader(context, bundleContext);      
      
         }
         
         return context;

Modified: 
camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java?rev=775963&r1=775962&r2=775963&view=diff
==============================================================================
--- 
camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java
 (original)
+++ 
camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java
 Mon May 18 14:12:43 2009
@@ -52,13 +52,15 @@
     }
     
     protected SpringCamelContext createContext() {
-        SpringCamelContext context = super.createContext();
-        LOG.debug("The bundle context is " + bundleContext);
+        SpringCamelContext context = super.createContext();        
         if (bundleContext != null) {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("The bundle context is not be null, let's setup the 
Osgi resolvers");
+            }
+            context.setFactoryFinderClass(OsgiFactoryFinder.class);
             context.setComponentResolver(new OsgiComponentResolver());
             context.setLanguageResolver(new OsgiLanguageResolver());
-            addOsgiAnnotationTypeConverterLoader(context, bundleContext);
-            context.setFactoryFinderClass(OsgiFactoryFinder.class);
+            addOsgiAnnotationTypeConverterLoader(context, bundleContext);      
      
         }
         
         return context;