[jboss-svn-commits] JBL Code SVN: r29261 - in labs/jbossesb/trunk/product/samples/quickstarts: webservice_proxy_basic/src/org/jboss/soa/esb/samples/quickstart/webservice_proxy_basic/test and 4 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Sep 8 16:31:46 EDT 2009 

Author: dward
Date: 2009-09-08 16:31:45 -0400 (Tue, 08 Sep 2009)
New Revision: 29261

Modified:
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/readme.txt
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/src/org/jboss/soa/esb/samples/quickstart/webservice_proxy_basic/test/SendWSMessage.java
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/Proxy_Routed_Rules.drl
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/deployment.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/readme.txt
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/jboss-esb-template.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/readme.txt
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/readme.txt
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/src/org/jboss/soa/esb/samples/quickstart/webservice_proxy_versioning/test/SendWSMessage.java
Log:
Minor cleanup after webservice_proxy_* change to use new http-gateway: JBESB-2756


Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/build.xml	2009-09-08 20:24:08 UTC (rev 29260)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/build.xml	2009-09-08 20:31:45 UTC (rev 29261)
@@ -73,11 +73,11 @@
 		<antcall target="runinternal"/>
 	</target>
 
-	<target name="runjbr">
-		<echo>Calling JBossWS webservice via JBossRemotingGatewayListener and SOAPProxy.</echo>
+	<target name="runhttp">
+		<echo>Calling JBossWS webservice via HttpGatewayListener and SOAPProxy.</echo>
 		<property name="runtest.arg.url" value="http://localhost:8080/Quickstart_webservice_proxy_basic/http/Proxy_Basic/Proxy"/>
 		<antcall target="runinternal"/>
 	</target>
-	<target name="runtest" depends="runjbr"/>
+	<target name="runtest" depends="runhttp"/>
 
 </project>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/jboss-esb.xml	2009-09-08 20:24:08 UTC (rev 29260)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/jboss-esb.xml	2009-09-08 20:31:45 UTC (rev 29261)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.2.0.xsd" parameterReloadSecs="5">
 
-    <services>
+	<services>
 		<service category="Proxy_Basic" name="Proxy"
 				 description="Basic WebService Proxy"
-				 invmScope="GLOBAL" >
+				 invmScope="GLOBAL">
 			<listeners>
-                <http-gateway name="basicProxy"/>
+				<http-gateway name="Proxy_Basic-GwListener" />
 			</listeners>
 			<actions mep="RequestResponse">
 				<action name="echo-request"

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/readme.txt
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/readme.txt	2009-09-08 20:24:08 UTC (rev 29260)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/readme.txt	2009-09-08 20:31:45 UTC (rev 29261)
@@ -26,11 +26,11 @@
   'runws' target description:
   - This simply calls the target JBossWS webservice directly.
   - The request url is: http://localhost:8080/Quickstart_webservice_proxy_basic/HelloWorldWS
-  - Running it will create output similar to the runjbr output below.
+  - Running it will create output similar to the runhttp output below.
   
-  'runjbr' (alias 'runtest') target description:
+  'runhttp' (alias 'runtest') target description:
   - This will exercise the target webservice *via* the SOAPProxy, first going
-	through a JBoss Remoting Gateway Listener.
+	through a Http Gateway Listener.
   - The request url is: http://localhost:9090
   - Running it will create output like this in the server console:
 
@@ -66,7 +66,7 @@
 Project file descriptions:
 ==========================
 	jboss-esb.xml:
-	A JBoss Remoting Gateway Listener accepts the incoming HTTP call makes it available to the
+	A Http Gateway Listener accepts the incoming HTTP call makes it available to the
 	Proxy_Basic/Proxy service, who has a message exchange pattern of RequestResponse.  In the
 	action chain, there are 3 actions:
 	1) echo out the incoming SOAP request,
@@ -95,9 +95,8 @@
 		passes in and argument representing the *ORIGINAL* webservice endpoint
 		and an argument representing the string-based message to invoke the webservice with. 
 
-	*	the runjbr (also runtest) task calls the
+	*	the runhttp (also runtest) task calls the
 		org.jboss.soa.esb.samples.quickstart.webservice_proxy_basic.test.SendWSMessage class and
-		passes in and argument representing the *PROXIED* webservice endpoint (via JBoss Remoting)
+		passes in and argument representing the *PROXIED* webservice endpoint (via HTTP)
 		and an argument representing the string-based message to invoke the webservice with. 
 
-

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/src/org/jboss/soa/esb/samples/quickstart/webservice_proxy_basic/test/SendWSMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/src/org/jboss/soa/esb/samples/quickstart/webservice_proxy_basic/test/SendWSMessage.java	2009-09-08 20:24:08 UTC (rev 29260)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/src/org/jboss/soa/esb/samples/quickstart/webservice_proxy_basic/test/SendWSMessage.java	2009-09-08 20:31:45 UTC (rev 29261)
@@ -55,8 +55,7 @@
 			// for testing main method from Eclipse (build.xml passes these args in)
 			args = new String[2];
 			//args[0] = "http://localhost:8080/Quickstart_webservice_proxy_basic/HelloWorldWS"; // original ws ("ant runws")
-			args[0] = "http://localhost:9090"; // proxy via jbr gateway ("ant runjbr" or "ant runtest")
-			//args[0] = "http://localhost:9999/Proxy_Basic/HelloWorldWS/"; // proxy via http gateway ("ant runhttp")
+			args[0] = "http://localhost:8080/Quickstart_webservice_proxy_basic/http/Proxy_Basic/Proxy"; // proxy via jbr gateway ("ant runhttp" or "ant runtest")
 			args[1] = System.getProperty("user.name");
 		}
 		

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/Proxy_Routed_Rules.drl
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/Proxy_Routed_Rules.drl	2009-09-08 20:24:08 UTC (rev 29260)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/Proxy_Routed_Rules.drl	2009-09-08 20:31:45 UTC (rev 29261)
@@ -8,19 +8,17 @@
 global java.util.List destinations;
 
 rule "Hello Routing Rule"
-	
 	when
 		xpathMatch expr "/soapenv:Envelope/soapenv:Body/hello:sayHello" use namespaces "soapenv=http://schemas.xmlsoap.org/soap/envelope/,hello=http://webservice_proxy_routed/hello"
-	then 
-	    Log : "Routing to Hello...";
+	then
+		Log : "Routing to Hello...";
 		Destination : "hello";
-		
 end
 
 rule "Goodbye Routing Rule"
-    when
+	when
 		xpathMatch expr "/soapenv:Envelope/soapenv:Body/goodbye:sayGoodbye" use namespaces "soapenv=http://schemas.xmlsoap.org/soap/envelope/,goodbye=http://webservice_proxy_routed/goodbye"
-    then
-	    Log : "Routing to Goodbye...";
+	then
+		Log : "Routing to Goodbye...";
 		Destination : "goodbye";
 end

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/deployment.xml	2009-09-08 20:24:08 UTC (rev 29260)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/deployment.xml	2009-09-08 20:31:45 UTC (rev 29261)
@@ -5,6 +5,7 @@
 	<depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_proxy_routed_cbr_esb_reply</depends>
 	<depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_proxy_routed_hello_esb</depends>
 	<depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_proxy_routed_hello_esb_reply</depends>
+	<depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_proxy_routed_goodbye_esb</depends>
 	<depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_proxy_routed_goodbye_esb_reply</depends>
 </jbossesb-deployment>
 

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/jboss-esb.xml	2009-09-08 20:24:08 UTC (rev 29260)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/jboss-esb.xml	2009-09-08 20:31:45 UTC (rev 29261)
@@ -31,7 +31,7 @@
 		<service category="Proxy_Routed" name="Proxy_CBR"
 				 description="Routed WebService Proxy: CBR">
 			<listeners>
-                <http-gateway name="Proxy_CBR-GwListener" />
+				<http-gateway name="Proxy_CBR-GwListener"/>
 				<jms-listener
 					name="Proxy_CBR-EsbListener"
 					busidref="Proxy_CBR-EsbChannel"

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/readme.txt
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/readme.txt	2009-09-08 20:24:08 UTC (rev 29260)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/readme.txt	2009-09-08 20:31:45 UTC (rev 29261)
@@ -29,7 +29,7 @@
 
   'runhello' (alias 'runtest') target description:
   - This will exercise the Hello webservice *via* a SOAPProxy, first going
-	through a JBoss Remoting Gateway Listener, then a ContentBasedRouter
+	through a Http Gateway Listener, then a ContentBasedRouter
 	to know whih proxied web service to invoke, which in this case is HelloWS.
   - The request url is: http://localhost:9090
   - Running it will create output like this in the server console:
@@ -67,7 +67,7 @@
 
   'rungoodbye' target description:
   - This will exercise the Goodbye webservice *via* a SOAPProxy, first going
-	through a JBoss Remoting Gateway Listener, then a ContentBasedRouter
+	through a Http Gateway Listener, then a ContentBasedRouter
 	to know whih proxied web service to invoke, which in this case is GoodbyeWS.
   - The request url is: http://localhost:9090
   - Running it will create output like this in the server console:
@@ -106,7 +106,7 @@
 Project file descriptions:
 ==========================
 	jboss-esb.xml:
-	A JBoss Remoting Gateway Listener accepts the incoming HTTP call makes it available to the
+	A Http Gateway Listener accepts the incoming HTTP call makes it available to the
 	Proxy_Routed/Proxy_CBR service, who uses a ContentBasedRouter configured with a drools rules
 	file.
 	
@@ -127,7 +127,7 @@
 
 	*	the runhello (also runtest) task calls the
 		org.jboss.soa.esb.samples.quickstart.webservice_proxy_routed.test.SendWSMessage class and
-		passes in and argument representing the *PROXIED* webservice endpoint (via JBoss Remoting)
+		passes in and argument representing the *PROXIED* webservice endpoint (via HTTP)
 		and an argument representing the string-based message to invoke the webservice with. 
 		SendWSMessage will submit a soap request which the CBR will determine to route to the proxied
 		(via SOAPProxy) HelloWS.

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/build.xml	2009-09-08 20:24:08 UTC (rev 29260)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/build.xml	2009-09-08 20:31:45 UTC (rev 29261)
@@ -129,7 +129,7 @@
 	 </target>  
 
 	<target name="runhttps" depends="compile">
-		<echo>Calling JBossWS webservice via HttpsGatewayListener and SOAPProxy.</echo>
+		<echo>Calling JBossWS webservice via HttpGatewayListener and SOAPProxy.</echo>
 		<property name="runtest.arg.url" value="https://localhost:9443/Proxy_Security/HelloWorldWS/"/>
 	    <property name="runtest.arg.http" value="${build.dir}/httpclient-httpgateway-9443.properties"/>
 		<antcall target="runinternal"/>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/jboss-esb-template.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/jboss-esb-template.xml	2009-09-08 20:24:08 UTC (rev 29260)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/jboss-esb-template.xml	2009-09-08 20:31:45 UTC (rev 29261)
@@ -15,7 +15,7 @@
 	<services>
 		<service category="Proxy_Security" name="Proxy"
 				 description="Security WebService Proxy"
-				 invmScope="GLOBAL" >
+				 invmScope="GLOBAL">
 			<listeners>
 				<http-listener name="HTTP-GATEWAY"
 					busidref="HTTP-BUS"

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/readme.txt
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/readme.txt	2009-09-08 20:24:08 UTC (rev 29260)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/readme.txt	2009-09-08 20:31:45 UTC (rev 29261)
@@ -39,7 +39,7 @@
   
   'runhttps' (alias 'runtest') target description:
   - This will exercise the target webservice *via* the SOAPProxy, first going
-	through a HTTP Gateway Listener.
+	through a Http Gateway Listener.
   - The request url is: https://localhost:9443/Proxy_Security/HelloWorldWS/
   - Running it will create output like this in the server console:
 
@@ -76,7 +76,7 @@
 Project file descriptions:
 ==========================
 	jboss-esb-template.xml (transformed to build/jboss-esb.xml after "genkey" target):
-	A HTTP Gateway Listener accepts the incoming HTTPS call and makes it available to the
+	A Http Gateway Listener accepts the incoming HTTPS call and makes it available to the
 	Proxy_Security/Proxy service, who has a message exchange pattern of RequestResponse.  In the
 	action chain, there are 3 actions:
 	1) echo out the incoming SOAP request,
@@ -113,7 +113,7 @@
 
 	*	the runhttps (also runtest) task calls the
 		org.jboss.soa.esb.samples.quickstart.webservice_proxy_security.test.SendWSMessage class and
-		passes in and argument representing the *PROXIED* webservice endpoint (via HTTP Gateway)
+		passes in and argument representing the *PROXIED* webservice endpoint (via HTTP)
 		and an argument representing the string-based message to invoke the webservice with. 
 
 

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/jboss-esb.xml	2009-09-08 20:24:08 UTC (rev 29260)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/jboss-esb.xml	2009-09-08 20:31:45 UTC (rev 29261)
@@ -5,9 +5,9 @@
 
 		<service category="Proxy_Versioning" name="Proxy-OldVersion"
 				 description="The old version of the WebService (legacy support)"
-				 invmScope="GLOBAL" >
+				 invmScope="GLOBAL">
 			<listeners>
-                <http-gateway name="JBR-GATEWAY-OldVersion" />
+				<http-gateway name="HTTP-GATEWAY-OldVersion" />
 			</listeners>
 			<actions mep="RequestResponse">
 				<action name="echo-old-request"
@@ -41,9 +41,9 @@
 
 		<service category="Proxy_Versioning" name="Proxy-NewVersion"
 				 description="The new version of the WebService (latest and greatest)"
-				 invmScope="GLOBAL" >
+				 invmScope="GLOBAL">
 			<listeners>
-				<http-gateway name="JBR-GATEWAY-NewVersion" />
+				<http-gateway name="HTTP-GATEWAY-NewVersion" />
 			</listeners>
 			<actions mep="RequestResponse">
 				<action name="echo-request"

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/readme.txt
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/readme.txt	2009-09-08 20:24:08 UTC (rev 29260)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/readme.txt	2009-09-08 20:31:45 UTC (rev 29261)
@@ -33,7 +33,7 @@
   - Running it will create output similar to the runnew output below.
   
   'runold' (alias 'runtest') target description:
-  - This will exercise the target webservice *via* the SOAPProxy, first going through a JBoss Remoting Gateway Listener
+  - This will exercise the target webservice *via* the SOAPProxy, first going through a Http Gateway Listener
     and having it's incoming SOAP request be *transformed* and having a <processDate> elemented added to the body!
   - Note that the wsl is transformed as well (see "Project file descriptions" below)!
   - The request url is: http://localhost:9090
@@ -80,7 +80,7 @@
      [java] **** RESPONSE BODY: <env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><ns2:processInvoiceResponse xmlns:ns2="http://webservice_proxy_versioning/invoicing"><success>true</success></ns2:processInvoiceResponse></env:Body></env:Envelope>
 
   'runnew' target description:
-  - This will exercise the target webservice *via* the SOAPProxy, first going through a JBoss Remoting Gateway Listener.
+  - This will exercise the target webservice *via* the SOAPProxy, first going through a Http Gateway Listener.
   - Nothing interesting here; it is just like the webservice_proxy_basic quickstart.
   - The request url is: http://localhost:9090
   - Running it will create output like this in the server console:

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/src/org/jboss/soa/esb/samples/quickstart/webservice_proxy_versioning/test/SendWSMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/src/org/jboss/soa/esb/samples/quickstart/webservice_proxy_versioning/test/SendWSMessage.java	2009-09-08 20:24:08 UTC (rev 29260)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/src/org/jboss/soa/esb/samples/quickstart/webservice_proxy_versioning/test/SendWSMessage.java	2009-09-08 20:31:45 UTC (rev 29261)
@@ -54,9 +54,10 @@
 			// for testing main method from Eclipse (build.xml passes these args in)
 			args = new String[2];
 			//args[0] = "http://localhost:8080/Quickstart_webservice_proxy_versioning/InvoicingWS"; // original ws ("ant runws")
-			args[0] = "http://localhost:9090"; // the old ws format ("ant runold" or "ant runtest")
-			//args[0] = "http://localhost:9999"; // the new ws format ("ant runnew")
+			args[0] = "http://localhost:8080/Quickstart_webservice_proxy_versioning/http/Proxy_Versioning/Proxy-OldVersion"; // the old ws format ("ant runold" or "ant runtest")
 			args[1] = "old";
+			//args[0] = "http://localhost:8080/Quickstart_webservice_proxy_versioning/http/Proxy_Versioning/Proxy-NewVersion"; // the new ws format ("ant runnew")
+			//args[1] = "new";
 		}
 		
 		String url = args[0];

More information about the jboss-svn-commits mailing list