Author: jbonofre
Date: Thu Feb 18 20:52:09 2010
New Revision: 911569
URL: http://svn.apache.org/viewvc?rev=911569&view=rev
Log:
[SMX4NMR-180] Upgrade to Camel 2.2.0.
Modified:
servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/CamelConverter.java
servicemix/smx4/nmr/trunk/pom.xml
Modified:
servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/CamelConverter.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/CamelConverter.java?rev=911569&r1=911568&r2=911569&view=diff
==============================================================================
---
servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/CamelConverter.java
(original)
+++
servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/CamelConverter.java
Thu Feb 18 20:52:09 2010
@@ -26,9 +26,16 @@
* A converter using Camel underneath
*/
class CamelConverter implements Converter {
+
+ final DefaultTypeConverter tc;
- final DefaultTypeConverter tc = new DefaultTypeConverter(new
DefaultPackageScanClassResolver(),
- new ReflectionInjector(), new
DefaultFactoryFinderResolver().resolveDefaultFactoryFinder(new
DefaultClassResolver()));
+ protected CamelConverter() throws Exception {
+ tc = new DefaultTypeConverter(
+ new DefaultPackageScanClassResolver(),
+ new ReflectionInjector(),
+ new
DefaultFactoryFinderResolver().resolveDefaultFactoryFinder(new
DefaultClassResolver()));
+ tc.start();
+ }
public <T> T convert(Object body, Class<T> type) {
return tc.convertTo(type, body);
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=911569&r1=911568&r2=911569&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Thu Feb 18 20:52:09 2010
@@ -81,10 +81,10 @@
<aopalliance.version>1.0_3</aopalliance.version>
<asm.version>2.2.3_1</asm.version>
<cglib.version>2.1_3_4</cglib.version>
- <camel.version>2.1.0</camel.version>
+ <camel.version>2.2.0</camel.version>
<commons.io.version>1.3.2_1</commons.io.version>
<commons.logging.version>1.1.1</commons.logging.version>
- <derby.version>10.4.2.0</derby.version>
+ <derby.version>10.5.3.0_1</derby.version>
<depends.maven.plugin.version>1.2</depends.maven.plugin.version>
<easymock.version>2.4</easymock.version>
<equinox.version>3.5.1.v20090827</equinox.version>
