[jboss-svn-commits] JBL Code SVN: r38259 - in labs/jbossesb/branches/JBESB_4_11_CP/product: rosetta/src/org/jboss/soa/esb/listeners/gateway/camel and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: tcunning
Date: 2012-12-03 19:38:35 -0500 (Mon, 03 Dec 2012)
New Revision: 38259

Modified:
   labs/jbossesb/branches/JBESB_4_11_CP/product/ivy.xml
   labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/camel/CamelGateway.java
Log:
JBESB-3887
Upgrade camel to 2.10.2 using Adam Kovari's patch.


Modified: labs/jbossesb/branches/JBESB_4_11_CP/product/ivy.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP/product/ivy.xml	2012-12-03 17:49:44 UTC (rev 38258)
+++ labs/jbossesb/branches/JBESB_4_11_CP/product/ivy.xml	2012-12-04 00:38:35 UTC (rev 38259)
@@ -40,7 +40,7 @@
 
         <dependency org="org.apache.ws.scout" name="jaxr-api" rev="1.0"/>
         <dependency org="org.apache.juddi.scout" name="scout" rev="1.2.6"/>
-        <dependency org="org.apache.camel" name="camel-core" rev="2.4.0"/>
+        <dependency org="org.apache.camel" name="camel-core" rev="2.10.2"/>
         <dependency org="org.fusesource.commonman" name="commons-management" rev="1.0"/>
 
         <dependency org="jboss.aop" name="jboss-aop-jdk50" rev="1.5.6.GA"/>

Modified: labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/camel/CamelGateway.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/camel/CamelGateway.java	2012-12-03 17:49:44 UTC (rev 38258)
+++ labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/camel/CamelGateway.java	2012-12-04 00:38:35 UTC (rev 38259)
@@ -328,7 +328,14 @@
 		public <T> T mandatoryConvertTo(Class<T> type, Exchange exchange, Object value) throws NoTypeConversionAvailableException {
 			return convertTo(type, value);
 		}
+		
+		public <T> T tryConvertTo(Class<T> type, Object value) {
+			return convertTo(type, value);
+		}
 
+		public <T> T tryConvertTo(Class<T> type, Exchange exchange, Object value) {
+			return convertTo(type, value);
+		}
 	}
 
 }