[jboss-svn-commits] JBL Code SVN: r38075 - 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-05-08 12:45:48 -0400 (Tue, 08 May 2012)
New Revision: 38075

Modified:
   labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers130/CamelGatewayMapper.java
   labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/camel/CamelGateway.java
Log:
JBESB-3795
Make sure we URI-encode, but decode the spaces before we send the URI out to Camel.


Modified: labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers130/CamelGatewayMapper.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers130/CamelGatewayMapper.java	2012-05-08 16:24:40 UTC (rev 38074)
+++ labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers130/CamelGatewayMapper.java	2012-05-08 16:45:48 UTC (rev 38075)
@@ -21,6 +21,8 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -209,7 +211,7 @@
 					}
 					newFromURI.append(tokens[i]);
 				}
-				fromURI = URI.create(newFromURI.toString());
+				fromURI = createURI(newFromURI.toString());
 			}
 			
 			if(timerURIBuilder != null) {

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-05-08 16:24:40 UTC (rev 38074)
+++ labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/camel/CamelGateway.java	2012-05-08 16:45:48 UTC (rev 38075)
@@ -23,7 +23,10 @@
 import java.io.StringWriter;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Properties;
 import java.util.Set;
 
@@ -45,6 +48,9 @@
 import org.apache.camel.impl.DefaultPackageScanClassResolver;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.model.Constants;
+import org.apache.camel.model.FromDefinition;
+import org.apache.camel.model.ProcessorDefinition;
+import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.model.RoutesDefinition;
 import org.apache.camel.spi.PackageScanClassResolver;
 import org.apache.camel.spi.TypeConverterRegistry;
@@ -133,8 +139,10 @@
 		}
 		if (routesXML == null || routesXML.length() == 0) {
 			throw new ConfigurationException("property [" + ROUTES + "] missing or empty");
-		} else {
+		} else {	
+			//routesXML = URLDecoder.decode(routesXML);
 			routesXML = routesXML.replaceAll("&", "&");
+			routesXML = routesXML.replaceAll("%20", " ");
 		}
 		jndiEnvironment = JndiUtil.parseEnvironmentProperties(config);
 		jndiEnvironment.setProperty(Context.PROVIDER_URL, config.getAttribute(JMSEpr.JNDI_URL_TAG, Configuration.getJndiServerURL()));
@@ -152,7 +160,7 @@
 		// this allows us to use Camel's property replacement via ref:{{jndiName}} - actually (ref:%7B%7BjndiName%7D%7D)
 		camelContext = new DefaultCamelContext(new JndiRegistry(jndiContext));
 		// we need to disable JMX so we don't depend on Spring classes
-		camelContext.disableJMX();
+		camelContext.disableJMX();	
 		// configure correct classloading
 		DefaultPackageScanClassResolver packageScanClassResolver = null;
 		if (isAS4) {
@@ -221,6 +229,16 @@
 			Unmarshaller um = jaxbContext.createUnmarshaller();
 			RoutesDefinition rd = (RoutesDefinition)um.unmarshal(new StringReader(routesXML));
 			
+			List<RouteDefinition> unEscapedRoutes = rd.getRoutes();
+			for (RouteDefinition route : unEscapedRoutes) {
+				for (FromDefinition input : route.getInputs() ) {
+					System.out.println(input.getShortName());
+				}
+				for (ProcessorDefinition pd : route.getOutputs()) {
+					System.out.println(pd.getShortName());			
+				}
+			}
+				
 			camelContext.addRouteDefinitions(rd.getRoutes());
 		} catch (Exception e) {
 			throw new ManagedLifecycleException("problem adding routes", e);