[jboss-svn-commits] JBL Code SVN: r33078 - in labs/jbossesb/workspace/dward/JBESB_4_8_Camel_Gateway/product: rosetta/src/org/jboss/soa/esb/listeners/gateway/camel and 1 other directories.

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

Author: dward
Date: 2010-05-25 17:59:03 -0400 (Tue, 25 May 2010)
New Revision: 33078

Modified:
   labs/jbossesb/workspace/dward/JBESB_4_8_Camel_Gateway/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers130/CamelGatewayMapper.java
   labs/jbossesb/workspace/dward/JBESB_4_8_Camel_Gateway/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/camel/JBossESBComponent.java
   labs/jbossesb/workspace/dward/JBESB_4_8_Camel_Gateway/product/samples/quickstarts/camel_helloworld/jboss-esb-unfiltered.xml
Log:
figured out why sync wasn't working... duh!


Modified: labs/jbossesb/workspace/dward/JBESB_4_8_Camel_Gateway/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers130/CamelGatewayMapper.java
===================================================================
--- labs/jbossesb/workspace/dward/JBESB_4_8_Camel_Gateway/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers130/CamelGatewayMapper.java	2010-05-25 20:33:26 UTC (rev 33077)
+++ labs/jbossesb/workspace/dward/JBESB_4_8_Camel_Gateway/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers130/CamelGatewayMapper.java	2010-05-25 21:59:03 UTC (rev 33078)
@@ -136,20 +136,18 @@
 		} else if (bus != null && bus.isSetAsync()) {
 			async = bus.getAsync();
 		} else {
-			async = true;
+			async = false;
 		}
 		toParams.put(JBossESBComponent.ASYNC, String.valueOf(async));
-		if (!async) {
-			long timeout;
-			if (gateway.isSetTimeout()) {
-				timeout = gateway.getTimeout();
-			} else if (bus != null && bus.isSetTimeout()) {
-				timeout = bus.getTimeout();
-			} else {
-				timeout = 30000L;
-			}
-			toParams.put(JBossESBComponent.TIMEOUT, String.valueOf(timeout));
+		long timeout;
+		if (gateway.isSetTimeout()) {
+			timeout = gateway.getTimeout();
+		} else if (bus != null && bus.isSetTimeout()) {
+			timeout = bus.getTimeout();
+		} else {
+			timeout = 30000L;
 		}
+		toParams.put(JBossESBComponent.TIMEOUT, String.valueOf(timeout));
 		try {
 			return JBossESBComponent.createEndpointURI(JBossESBComponent.SERVICE, toParams);
 		} catch (Exception e) {

Modified: labs/jbossesb/workspace/dward/JBESB_4_8_Camel_Gateway/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/camel/JBossESBComponent.java
===================================================================
--- labs/jbossesb/workspace/dward/JBESB_4_8_Camel_Gateway/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/camel/JBossESBComponent.java	2010-05-25 20:33:26 UTC (rev 33077)
+++ labs/jbossesb/workspace/dward/JBESB_4_8_Camel_Gateway/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/camel/JBossESBComponent.java	2010-05-25 21:59:03 UTC (rev 33078)
@@ -54,7 +54,7 @@
 		{
 			String category = getAndRemoveParameter(parameters, CATEGORY, String.class);
 			String name = getAndRemoveParameter(parameters, NAME, String.class);
-			boolean async = getAndRemoveParameter(parameters, ASYNC, Boolean.class, Boolean.TRUE);
+			boolean async = getAndRemoveParameter(parameters, ASYNC, Boolean.class, Boolean.FALSE);
 			long timeout = getAndRemoveParameter(parameters, TIMEOUT, Long.class, 30000L);
 			processor = new ServiceProcessor(new Service(category, name), async, timeout);
 		}

Modified: labs/jbossesb/workspace/dward/JBESB_4_8_Camel_Gateway/product/samples/quickstarts/camel_helloworld/jboss-esb-unfiltered.xml
===================================================================
--- labs/jbossesb/workspace/dward/JBESB_4_8_Camel_Gateway/product/samples/quickstarts/camel_helloworld/jboss-esb-unfiltered.xml	2010-05-25 20:33:26 UTC (rev 33077)
+++ labs/jbossesb/workspace/dward/JBESB_4_8_Camel_Gateway/product/samples/quickstarts/camel_helloworld/jboss-esb-unfiltered.xml	2010-05-25 21:59:03 UTC (rev 33078)
@@ -1,15 +1,21 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.3.0.xsd" parameterReloadSecs="5">
 
+	<providers>
+		<camel-provider name="provider1">
+			<camel-bus busid="bus1">
+				<from uri="file://@INPUTDIR1@?delete=true"/>
+				<from uri="file://@INPUTDIR2@?delete=true"/>
+			</camel-bus>
+		</camel-provider>
+	</providers>
+
 	<services>
 		<service category="camel_helloworld" name="service1" description="Hello World" invmScope="GLOBAL">
 			<listeners>
-				<camel-gateway name="gateway1">
-					<from uri="file://@INPUTDIR1@?delete=true"/>
-					<from uri="file://@INPUTDIR2@?delete=true"/>
-				</camel-gateway>
+				<camel-gateway name="gateway1" busidref="bus1"/>
 			</listeners>
-			<actions mep="OneWay">
+			<actions>
 				<action name="action1" class="org.jboss.soa.esb.actions.SystemPrintln"/>
 			</actions>
 		</service>