svn commit: r928707 - /camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java

[davsclaus]

Author: davsclaus
Date: Mon Mar 29 10:48:15 2010
New Revision: 928707

URL: http://svn.apache.org/viewvc?rev=928707&view=rev
Log:
CAMEL-2586: Applied patch with thanks to Johan Edstrom.

Modified:
    
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java

Modified: 
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java?rev=928707&r1=928706&r2=928707&view=diff
==============================================================================
--- 
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
 (original)
+++ 
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
 Mon Mar 29 10:48:15 2010
@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
@@ -53,6 +52,7 @@ import org.apache.camel.model.RouteDefin
 import org.apache.camel.model.TransactedDefinition;
 import org.apache.camel.model.config.PropertiesDefinition;
 import org.apache.camel.model.dataformat.DataFormatsDefinition;
+import org.apache.camel.osgi.OsgiAnnotationTypeConverterLoader;
 import org.apache.camel.osgi.OsgiCamelContextHelper;
 import org.apache.camel.osgi.OsgiClassResolver;
 import org.apache.camel.osgi.OsgiComponentResolver;
@@ -799,6 +799,13 @@ public class CamelContextFactoryBean ext
         ctx.setComponentResolver(new OsgiComponentResolver());
         ctx.setLanguageResolver(new OsgiLanguageResolver());
 
+        OsgiAnnotationTypeConverterLoader typeConverterLoader = new 
OsgiAnnotationTypeConverterLoader(new 
OsgiPackageScanClassResolver(bundleContext));
+        try {
+            typeConverterLoader.load(ctx.getTypeConverterRegistry());
+        } catch (Exception e) {
+            throw ObjectHelper.wrapRuntimeCamelException(e);
+        }
+
         return ctx;
     }