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 2009/09/23 09:26:10 UTC
svn commit: r817990 - in /servicemix/smx4/nmr/trunk:
nmr/core/src/main/java/org/apache/servicemix/nmr/core/CamelConverter.java
pom.xml
Author: gertv
Date: Wed Sep 23 07:26:09 2009
New Revision: 817990
URL: http://svn.apache.org/viewvc?rev=817990&view=rev
Log:
SMX4-367: Upgrade the NMR to use Camel 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=817990&r1=817989&r2=817990&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 Wed Sep 23 07:26:09 2009
@@ -16,6 +16,9 @@
*/
package org.apache.servicemix.nmr.core;
+import org.apache.camel.impl.DefaultClassResolver;
+import org.apache.camel.impl.DefaultFactoryFinderResolver;
+import org.apache.camel.impl.DefaultPackageScanClassResolver;
import org.apache.camel.impl.converter.DefaultTypeConverter;
import org.apache.camel.util.ReflectionInjector;
@@ -24,7 +27,8 @@
*/
class CamelConverter implements Converter {
- final DefaultTypeConverter tc = new DefaultTypeConverter(new ReflectionInjector());
+ final DefaultTypeConverter tc = new DefaultTypeConverter(new DefaultPackageScanClassResolver(),
+ new ReflectionInjector(), new DefaultFactoryFinderResolver().resolveDefaultFactoryFinder(new DefaultClassResolver()));
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=817990&r1=817989&r2=817990&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Wed Sep 23 07:26:09 2009
@@ -59,6 +59,21 @@
<prerequisites>
<maven>2.0.9</maven>
</prerequisites>
+
+ <distributionManagement>
+ <repository>
+ <id>apache.releases.https</id>
+ <name>Apache Release Distribution Repository</name>
+ <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
+ </repository>
+ <snapshotRepository>
+ <uniqueVersion>false</uniqueVersion>
+ <id>apache.snapshots.https</id>
+ <name>Apache Development Snapshot Repository</name>
+ <url>https://repository.apache.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+
<properties>
<activemq.version>5.2.0</activemq.version>
@@ -66,7 +81,7 @@
<aopalliance.version>1.0_1</aopalliance.version>
<asm.version>2.2.3_1</asm.version>
<cglib.version>2.1_3_2</cglib.version>
- <camel.version>1.6.0</camel.version>
+ <camel.version>2.0.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>
@@ -108,7 +123,7 @@
<servicemix.jsr181.version>2008.01</servicemix.jsr181.version>
<servicemix.shared.version>2008.01</servicemix.shared.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
- <servicemix.specs.version>1.3.0</servicemix.specs.version>
+ <servicemix.specs.version>1.4-SNAPSHOT</servicemix.specs.version>
<servicemix.utils.version>1.2.0-SNAPSHOT</servicemix.utils.version>
<sshd.version>0.2.0</sshd.version>
<spring.osgi.version>1.2.0</spring.osgi.version>