[jboss-svn-commits] JBL Code SVN: r17320 - in labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product: install/conf and 13 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Dec 19 09:20:25 EST 2007


Author: tkirby
Date: 2007-12-19 09:20:25 -0500 (Wed, 19 Dec 2007)
New Revision: 17320

Added:
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/conf/jbossesb-properties.xml.template
Modified:
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/Deployment.txt
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/actions/StoreMessageToFile.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/LifecycleController.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_sql_action/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/static_router/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_consumer1/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_consumer1/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer1/MyResponseAction.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_consumer1/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer1/test/SendEsbMessage.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_consumer2/readme.txt
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_consumer2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer2/test/SendEsbMessage.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/trailblazer/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/trailblazer/client/resources/wstools-config.xml
Log:
merge from CP1

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/Deployment.txt
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/Deployment.txt	2007-12-19 13:33:35 UTC (rev 17319)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/Deployment.txt	2007-12-19 14:20:25 UTC (rev 17320)
@@ -8,8 +8,8 @@
 | Java                             	| 1.5 (Sun)                    | http://java.sun.com/javase/downloads/index.jsp
 | JavaMail                         	| 1.3.1                        | http://java.sun.com/products/javamail/
 |                                  	|                              | 
-| JBoss Application Server         	| 4.0.4.GA                     | http://labs.jboss.com/portal/jbossas/download
-| JBoss TS (Common)                	| 4.2.1 GA                     | http://labs.jboss.com/portal/jbosstm/downloads
+| JBoss Application Server         	| 4.2.1.GA                     | http://labs.jboss.com/portal/jbossas/download
+| JBoss TS (Common)                	| 4.2.1 SP5 GA                 | http://labs.jboss.com/portal/jbosstm/downloads
 |                                  	|                              |
 | Postgres Database Server         	| 8.1                          | http://www.postgresql.org/download/
 |                                  	|                              |
@@ -25,8 +25,8 @@
 | XStream                          	| 1.1.3                        | http://xstream.codehaus.org/
 | edtftpj                          	| 1.5.2                        | http://www.enterprisedt.com/products/edtftpj/download.html
 |                                  	|                              |
-| milyn-commons                    	| 0.7                          | http://milyn.codehaus.org/downloads
-| milyn-smooks-core                	| 0.8-SNAPSHOT                 | http://milyn.codehaus.org/downloads
-| milyn-smooks-misc                	| 0.2                          | http://milyn.codehaus.org/downloads
-| milyn-tinak                      	| 0.7.1                        | http://milyn.codehaus.org/downloads
+| milyn-commons                    	| 0.9                          | http://milyn.codehaus.org/downloads
+| milyn-smooks-core                	| 0.9                          | http://milyn.codehaus.org/downloads
+| milyn-smooks-misc                	| 0.2.1                        | http://milyn.codehaus.org/downloads
+| milyn-tinak                      	| 0.9                          | http://milyn.codehaus.org/downloads
 --------------------------------------------------------------------------------------------------------------------------------

Added: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/conf/jbossesb-properties.xml.template
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/conf/jbossesb-properties.xml.template	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/conf/jbossesb-properties.xml.template	2007-12-19 14:20:25 UTC (rev 17320)
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  JBoss, Home of Professional Open Source
+  Copyright 2006, JBoss Inc., and others contributors as indicated 
+  by the @authors tag. All rights reserved. 
+  See the copyright.txt in the distribution for a
+  full listing of individual contributors. 
+  This copyrighted material is made available to anyone wishing to use,
+  modify, copy, or redistribute it subject to the terms and conditions
+  of the GNU Lesser General Public License, v. 2.1.
+  This program is distributed in the hope that it will be useful, but WITHOUT A 
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+  PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+  You should have received a copy of the GNU Lesser General Public License,
+  v.2.1 along with this distribution; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+  MA  02110-1301, USA.
+  
+  (C) 2005-2006,
+  @author JBoss Inc.
+-->
+<!-- $Id: jbossesb-unittest-properties.xml $ -->
+<!--
+  These options are described in the JBossESB manual.
+  Defaults are provided here for convenience only.
+ 
+  Please read through this file prior to using the system, and consider
+  updating the specified entries.
+-->
+<esb
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd">
+    <properties name="core">
+		<property name="org.jboss.soa.esb.jndi.server.type" value="jboss"/>
+		<property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
+		<property name="org.jboss.soa.esb.persistence.connection.factory" 	value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
+    </properties>
+    <properties name="registry">      
+    	<property name="org.jboss.soa.esb.registry.queryManagerURI"     		
+    		value="jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire"/>    		
+    	<property name="org.jboss.soa.esb.registry.lifeCycleManagerURI"     		
+    		value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#publish" />
+    	<property name="org.jboss.soa.esb.registry.implementationClass" 
+    		value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
+    	<property name="org.jboss.soa.esb.registry.factoryClass" 
+    		value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
+    	<property name="org.jboss.soa.esb.registry.user" 
+    		value="jbossesb"/>
+    	<property name="org.jboss.soa.esb.registry.password" 
+    	  value="password"/>
+    	<!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
+    	<property name="org.jboss.soa.esb.scout.proxy.transportClass" 
+    		value="org.apache.ws.scout.transport.RMITransport"/>
+    </properties>
+    <properties name="transports" depends="core">
+    	<property name="org.jboss.soa.esb.mail.smtp.host" value="localhost"/>
+    	<property name="org.jboss.soa.esb.mail.smtp.user" value="jbossesb"/>
+    	<property name="org.jboss.soa.esb.mail.smtp.password" value=""/>
+    	<property name="org.jboss.soa.esb.mail.smtp.port" value="25"/>
+    </properties>
+    <properties name="connection">
+    	<property name="min-pool-size" value="5"/>
+    	<property name="max-pool=size" value="10"/>
+    	<property name="blocking-timeout-millis" value="5000"/>
+    	<property name="abandoned-connection-timeout" value="10000"/>
+    	<property name="abandoned-connection-time-interval" value="30000"/>
+    </properties>
+    <properties name="dbstore">
+		<property name="org.jboss.soa.esb.persistence.db.connection.url" 	value="jdbc:hsqldb:hsql://localhost:9001/"/>
+		<property name="org.jboss.soa.esb.persistence.db.jdbc.driver" 		value="org.hsqldb.jdbcDriver"/>
+		<property name="org.jboss.soa.esb.persistence.db.user" 			value="sa"/>
+		<property name="org.jboss.soa.esb.persistence.db.pwd" 			value=""/>		
+		<property name="org.jboss.soa.esb.persistence.db.pool.initial.size"	value="2"/>
+		<property name="org.jboss.soa.esb.persistence.db.pool.min.size"	value="2"/>
+		<property name="org.jboss.soa.esb.persistence.db.pool.max.size"	value="5"/>
+		<!--table managed by pool to test for valid connections - created by pool automatically -->
+		<property name="org.jboss.soa.esb.persistence.db.pool.test.table"	value="pooltest"/>
+		<!-- # of milliseconds to timeout waiting for a connection from pool -->
+		<property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis"	value="5000"/> 
+                <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/>
+    </properties>
+    <properties name="messagerouting">
+    	<property name="org.jboss.soa.esb.routing.cbrClass" value="org.jboss.internal.soa.esb.services.routing.cbr.JBossRulesRouter"/>
+    </properties>
+	<properties name="filters">
+    	<property name="org.jboss.soa.esb.filter.1" value="org.jboss.internal.soa.esb.message.filter.MetaDataFilter"/>
+    	<property name="org.jboss.soa.esb.filter.2" value="org.jboss.internal.soa.esb.message.filter.GatewayFilter"/>
+    </properties>
+</esb>

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/actions/StoreMessageToFile.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/actions/StoreMessageToFile.java	2007-12-19 13:33:35 UTC (rev 17319)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/actions/StoreMessageToFile.java	2007-12-19 14:20:25 UTC (rev 17320)
@@ -115,7 +115,7 @@
         final Object contents;
 
         try {
-        	contents = payloadProxy.getPayload(message);
+            contents = payloadProxy.getPayload(message);
         } catch (MessageDeliverException e) {
             throw new ActionProcessingException(e);
         }

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java	2007-12-19 13:33:35 UTC (rev 17319)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java	2007-12-19 14:20:25 UTC (rev 17320)
@@ -38,9 +38,9 @@
 	/** Threading */
 	public static final String MAX_THREADS_TAG				= "maxThreads";
 
-	/* Reloading */
-    public static final String RELOAD_SECONDS_TAG = "parameterReloadSecs";
-    public static final String END_TIME_TAG = "endTime";
+        /* Reloading */
+        public static final String RELOAD_SECONDS_TAG = "parameterReloadSecs";
+        public static final String END_TIME_TAG = "endTime";
 
 	/** Registry */
     public static final String SERVICE_CATEGORY_NAME_TAG    = "service-category";
@@ -53,18 +53,16 @@
 	public static final String TARGET_SERVICE_NAME_TAG	    = "target-service-name";
 	public static final String GATEWAY_CLASS_TAG            = "gatewayClass";
 	public static final String IS_GATEWAY_TAG				= "is-gateway";
-	public static final String GATEWAY_NAME_TAG				= "gateway-name";
 	
 	/** Listeners */
-	public static final String LISTENER_CLASS_TAG           = "listenerClass";
-    public static final String TRANSACTED_TAG            	= "transacted";
-    public static final String LISTENER_NAME_TAG			= "listener-name";
+	public static final String LISTENER_CLASS_TAG            = "listenerClass";
+        public static final String TRANSACTED_TAG            = "transacted";
     
 	/** Deployment */
 	public static final String DEPLOYMENT_NAME_TAG 			= "deployment";
 	
 	/** ActionProcessingPipeline */
-    public static final String MEP_ATTRIBUTE_TAG            = "mep";
+    public static final String MEP_ATTRIBUTE_TAG                    = "mep";
     public static final String ACTION_ELEMENT_TAG		    = "action";
     public static final String ACTION_CLASS_TAG			    = "class";
     public static final String PROCESS_METHOD_TAG		    = "process";

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/LifecycleController.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/LifecycleController.java	2007-12-19 13:33:35 UTC (rev 17319)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/LifecycleController.java	2007-12-19 14:20:25 UTC (rev 17320)
@@ -167,7 +167,6 @@
 		try {
 			String categoryName = m_config.getAttribute(ListenerTagNames.SERVICE_CATEGORY_NAME_TAG);
 			String serviceName = m_config.getAttribute(ListenerTagNames.SERVICE_NAME_TAG);
-			String deployment = m_config.getParent().getAttribute(ListenerTagNames.DEPLOYMENT_NAME_TAG);
 			String listenerName = m_config.getName();
 
 			StringBuffer objectName = new StringBuffer();
@@ -175,13 +174,6 @@
 				objectName.append(ListenerTagNames.SERVICE_CATEGORY_NAME_TAG + "=" + categoryName);
 			}
 			
-			if (deployment != null) {
-				if (objectName.length() > 0) {
-					objectName.append(",");
-				}
-				objectName.append(ListenerTagNames.DEPLOYMENT_NAME_TAG).append("=").append(deployment);
-			}
-			
 			if (serviceName != null) {
 				if (objectName.length() > 0) {
 					objectName.append(",");

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml	2007-12-19 13:33:35 UTC (rev 17319)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml	2007-12-19 14:20:25 UTC (rev 17320)
@@ -109,42 +109,24 @@
             <actions>
                 <action name="spy1" 
                     class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.MessageSpy"/>
-		<action name="testStore" class="org.jboss.soa.esb.actions.TestMessageStore"/>
+		        <action name="testStore" class="org.jboss.soa.esb.actions.TestMessageStore"/>
                 <!-- move the body.getContents() into jBPM -->    
                 <action name="create_new_process_instance" 
                     class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
-                    <property name="command" value="NewProcessInstanceCommand" />
+                    <property name="command" value="StartProcessInstanceCommand" />
                     <property name="process-definition-name" value="processDefinition2"/>   
                     <property name="actor" value="FrankSinatra"/>                                                 
                     <property name="esbToBpmVars">
                       <!-- esb-name maps to getBody().get("eVar1") -->
                         <mapping esb="eVar1" bpm="counter" value="45" />
                         <mapping esb="BODY_CONTENT" bpm="theBody" />
-                    </property>
-                                 
-                 </action>  
-
-                <action name="displayProcessInfo" 
-                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.ProcessInfo"/>
-
-                <action name="spy2" 
-                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.MessageSpy"/>
-                 
-                 <action  name="signal_the_new_process_instance" 
-                   class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
-                    <property name="command" value="SignalCommand" />
-                    <property name="process-definition-name" value="processDefinition2"/>   
-                    <property name="esbToBpmVars">
-                      <!-- esb-name maps to getBody().get("eVar1") -->
-                        <mapping esb="eVar1" bpm="counter"  value="45" />  
-                        <mapping esb="BODY_CONTENT" bpm="theBody" />
-                    </property>                    
+                    </property>             
                  </action>
 
-                <action name="spy3" 
-                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.MessageSpy"/>
+                 <action name="spy2" 
+                   class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.MessageSpy"/>
 
-            </actions>
+              </actions>
         </service>
         
         <service category="BPM_Orchestration_Service1" name="Service1"

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_sql_action/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_sql_action/build.xml	2007-12-19 13:33:35 UTC (rev 17319)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_sql_action/build.xml	2007-12-19 14:20:25 UTC (rev 17320)
@@ -56,6 +56,10 @@
 			</sql>
 	</target>  
 
+	<target name="deploy-jms-dests">
+		<echo message="This quickstart doesn't use any JMS Destinations.  No JMS deployments required." />
+    </target>
+	
     <target name="undeploy-jms-dests">
         <echo message="This quickstart doesn't use any JMS Destinations.  No JMS undeployments required." />
     </target>

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/static_router/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/static_router/build.xml	2007-12-19 13:33:35 UTC (rev 17319)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/static_router/build.xml	2007-12-19 14:20:25 UTC (rev 17320)
@@ -41,7 +41,7 @@
 		<antcall target="filter_jboss-esb.xml"/>
 		<copy file="log4j.xml" tofile="build/log4j.xml"/>
 	</target>
-
+	
 	<target name="runtest" depends="compile" description="runs the Test FTP file creator">
 		<echo>Runs Test FTP File creator</echo>
 		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.staticrouter.test.CreateTestFile" failonerror="true">

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_consumer1/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_consumer1/jboss-esb.xml	2007-12-19 13:33:35 UTC (rev 17319)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_consumer1/jboss-esb.xml	2007-12-19 14:20:25 UTC (rev 17320)
@@ -44,7 +44,6 @@
 					class="org.jboss.soa.esb.actions.soap.SOAPClient">
 					<property name="wsdl"
 						value="http://127.0.0.1:8080/Quickstart_webservice_consumer1/HelloWorldWS?wsdl" />
-					<property name="operation" value="sayHello" />
 					<property name="responseAsOgnlMap" value="true" />	
 					<property name="SOAPAction" value="sayHello"/>				
 				</action>

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_consumer1/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer1/MyResponseAction.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_consumer1/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer1/MyResponseAction.java	2007-12-19 13:33:35 UTC (rev 17319)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_consumer1/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer1/MyResponseAction.java	2007-12-19 14:20:25 UTC (rev 17320)
@@ -51,8 +51,7 @@
 
       // The "responseLocation" property was set in jboss-esb.xml to
       // "helloworld-response"
-      Map responseMsg = (Map) message.getBody()
-            .get("helloworld-response");
+      Map responseMsg = (Map) message.getBody().get(Body.DEFAULT_LOCATION);
       System.out.println("Response Map is: " + responseMsg);
 
       logFooter();

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_consumer1/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer1/test/SendEsbMessage.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_consumer1/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer1/test/SendEsbMessage.java	2007-12-19 13:33:35 UTC (rev 17319)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_consumer1/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer1/test/SendEsbMessage.java	2007-12-19 14:20:25 UTC (rev 17320)
@@ -53,8 +53,7 @@
 
       // Deliver the request message synchronously - timeout after 20
       // seconds...
-      Message replyMessage = deliveryAdapter.deliverSync(requestMessage, 20000);
-      
+      deliveryAdapter.deliverAsync(requestMessage);
    }
    
    public static void main(String args[]) throws Exception

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_consumer2/readme.txt
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_consumer2/readme.txt	2007-12-19 13:33:35 UTC (rev 17319)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_consumer2/readme.txt	2007-12-19 14:20:25 UTC (rev 17320)
@@ -89,7 +89,7 @@
 	org.jboss.soa.esb.actions.soap.SOAPClient
 	This class is used to make the call to the webservice. It will take the
 	parameters that MyRequestAction set in "paramsLocation", call the webservice, then place
-	the response in "responseLocation". This is zero Java code ESB wiring in jboss-esb.xml.
+	the response in the default location. 
 	
 	src/../MyResponseAction.java
 	Retrieve the webservice response and display it on the console.	The response location name

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_consumer2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer2/test/SendEsbMessage.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_consumer2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer2/test/SendEsbMessage.java	2007-12-19 13:33:35 UTC (rev 17319)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_consumer2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer2/test/SendEsbMessage.java	2007-12-19 14:20:25 UTC (rev 17320)
@@ -49,7 +49,7 @@
       
       // Deliver the request message synchronously - timeout after 20
       // seconds...
-      Message replyMessage = deliveryAdapter.deliverSync(requestMessage, 20000);
+      deliveryAdapter.deliverAsync(requestMessage);
 
       // need to cleanup connection pool for service invoker
       //deliveryAdapter.close();

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/trailblazer/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/trailblazer/build.xml	2007-12-19 13:33:35 UTC (rev 17319)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/trailblazer/build.xml	2007-12-19 14:20:25 UTC (rev 17320)
@@ -121,31 +121,6 @@
 		<delete dir="${esb.samples.trailblazer.client.dest}"/>
 	</target>
 
-
-	<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
-		<classpath>
-			<pathelement location="client/lib/ext/jboss-jaxws.jar"/>
-			<pathelement location="client/lib/ext/jbossws-core.jar"/>	
-			<pathelement location="${esb.home.dir}/lib/ext/activation.jar"/>
-			<pathelement location="${esb.home.dir}/lib/ext/jbossall-client.jar"/>
-			<pathelement location="${esb.home.dir}/lib/ext/mail.jar"/>
-			<pathelement path="${esb.samples.trailblazer.client.classes.dir}"/>
-			<pathelement path="${org.jboss.esb.server.home}/lib/jboss-xml-binding.jar"/>	
-			<pathelement path="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossws.sar/jboss-jaxrpc.jar"/>
-		</classpath>
-	</taskdef>
- 
-	<target name="wstools">
-		<wstools
-			verbose="true"
-			dest="client/WEB-INF"
-			config="client/resources/wstools-config.xml"
-		/>
-	</target>
-
-
-
-
     <target name="messaging-config">
 		<property name="org.jboss.esb.server.deploy.dir"
 			value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/trailblazer/client/resources/wstools-config.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/trailblazer/client/resources/wstools-config.xml	2007-12-19 13:33:35 UTC (rev 17319)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/trailblazer/client/resources/wstools-config.xml	2007-12-19 14:20:25 UTC (rev 17320)
@@ -7,15 +7,12 @@
 <configuration xmlns="http://www.jboss.org/jbossws-tools"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
-
-  <global>
-	<package-namespace package="org.jboss.soa.esb.trailblazer"
-		namespace="http://www.jboss.org/support/trailblazer"/>
-  </global>
   
-  <wsdl-java location="client/resources/wsdl/LoanBrokerService.wsdl" parameter-style="bare">
+  <java-wsdl>
+    <service name="LoanBrokerService" style="rpc" endpoint="org.jboss.soa.esb.samples.trailblazer.web.LoanBrokerInterface"/>
+    <namespaces target-namespace="http://org.jboss.ws/samples/rpcstyle" type-namespace="http://org.jboss.ws/samples/rpcstyle/types"/>
     <mapping file="jaxrpc-mapping.xml"/>
-    <webservices servlet-link="LoanBrokerInterface"/>
-  </wsdl-java>
+    <webservices servlet-link="LoanBrokerEndpoint"/>
+  </java-wsdl>
   
 </configuration>




More information about the jboss-svn-commits mailing list