Return-Path: Delivered-To: apmail-camel-commits-archive@www.apache.org Received: (qmail 98382 invoked from network); 29 Mar 2010 10:48:42 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 29 Mar 2010 10:48:42 -0000 Received: (qmail 25861 invoked by uid 500); 29 Mar 2010 10:48:42 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 25808 invoked by uid 500); 29 Mar 2010 10:48:40 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 25796 invoked by uid 99); 29 Mar 2010 10:48:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Mar 2010 10:48:39 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Mar 2010 10:48:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4830123888A2; Mon, 29 Mar 2010 10:48:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r928707 - /camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java Date: Mon, 29 Mar 2010 10:48:16 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100329104816.4830123888A2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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; }