[jboss-svn-commits] JBL Code SVN: r13442 - in labs/jbossesb/workspace/dbevenius/wslistener/product: install and 33 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Jul 13 07:33:43 EDT 2007


Author: beve
Date: 2007-07-13 07:33:43 -0400 (Fri, 13 Jul 2007)
New Revision: 13442

Added:
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/naming/FileNameGeneratorActionUnitTest.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterIntegrationTest.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/StringTemplateProcessorUnitTest.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/stringtemplate.st
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/testfile1.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/persistence/
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactoryUnitTest.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerUnitTest.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/deployment.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/processDefinition/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/processDefinition/gpd.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/processDefinition/processdefinition.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/processDefinition/processimage.jpg
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition/gpd.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition/processdefinition.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition/processimage.jpg
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/build.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/deployment.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jbossesb-properties.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jndi.properties
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/juddi.properties
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/lib/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/log4j.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/readme.txt
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction2.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/QsHashtable.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/ReceiveJMSMessage.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/SendJMSMessage.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandlerUnitTest.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/lib/ext/build-time/jbossws-jboss42.jar
   labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/src/main/java/org/jboss/soa/esb/jbossws/
   labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/src/main/java/org/jboss/soa/esb/jbossws/ESBWebMetaDataAdapter.java
Removed:
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterUnitTest.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/StringTemplateProcessorUnitTest.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/stringtemplate.st
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/testfile1.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactoryUnitTest.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerUnitTest.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/processDefinition/gpd.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/processDefinition/processdefinition.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/processDefinition/processimage.jpg
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/processDefinition1/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/processDefinition2/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition/gpd.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition/processdefinition.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition/processimage.jpg
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition1/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/build.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/deployment.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jbossesb-properties.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jndi.properties
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/juddi.properties
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/lib/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/log4j.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/readme.txt
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction2.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/QsHashtable.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/ReceiveJMSMessage.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/SendJMSMessage.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbAction2.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbAction2UnitTest.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandlerUnitTest.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/src/main/java/org/jboss/soa/esb/jbossws/ESBWebMetaDataAdapter.java
Modified:
   labs/jbossesb/workspace/dbevenius/wslistener/product/extras/jaxbintros/
   labs/jbossesb/workspace/dbevenius/wslistener/product/install/build.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/GatewayFilter.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/actions/naming/FileNameGeneratorAction.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/build.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GatewayFilterUnitTest.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/build.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/build.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_bpel/README.TXT
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_bpel/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_jbossws_adapter_01/readme.txt
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_war1/readme.txt
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_war1/src/org/jboss/soa/esb/samples/quickstart/webservicewar1/test/SendJMSMessage.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/test/resources/testMappingDefinition.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/base-project-build.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/lib/ext/build-time/jboss-jaxws.jar
   labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/lib/ext/build-time/jbossws-core.jar
   labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/lib/ext/build-time/jbossws-spi.jar
Log:
Merge from main 13393:13441


Property changes on: labs/jbossesb/workspace/dbevenius/wslistener/product/extras/jaxbintros
___________________________________________________________________
Name: svn:ignore
   + target


Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/install/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/install/build.xml	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/install/build.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -118,6 +118,9 @@
             <fileset dir="${org.jboss.esb.dist.lib}/soap.esb"
               excludes="${messaging.excludes}"/>
           </copy>
+
+          <!-- soapui-client.sar -->
+          <copy file="${org.jboss.esb.dist.lib}/soapui-client.sar" todir="${deploy.dir}" />
         </target>
 
         <property name="org.jboss.esb.tomcat.55lib"

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/GatewayFilter.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/GatewayFilter.java	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/GatewayFilter.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -70,6 +70,8 @@
 	    ConfigTree config = (ConfigTree) params
 		    .get(Environment.GATEWAY_CONFIG);
 
+	    String notPresent = "not present";  // Ugly, but needed because 'default value of null' in ListenerUtil means throw exception!
+	    
 	    if (config != null)
 	    {
 		try
@@ -77,7 +79,7 @@
         		String url = ListenerUtil.obtainAtt(config, JDBCEpr.URL_TAG,
         			null);
         
-        		if (url != null)
+        		if ((url != null) && (url != notPresent))
         		    msg.getProperties().setProperty(
         			    Environment.ORIGINAL_URL_PROP, url);
 		}
@@ -89,9 +91,9 @@
 		try
 		{
         		String queueName = ListenerUtil.obtainAtt(config,
-        			JMSEpr.DESTINATION_NAME_TAG, null);
+        			JMSEpr.DESTINATION_NAME_TAG, "not present");
         
-        		if (queueName != null)
+        		if ((queueName != null) && (queueName != notPresent))
         		    msg.getProperties()
         			    .setProperty(
         				    Environment.ORIGINAL_QUEUE_NAME_MSG_PROP,

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/actions/naming/FileNameGeneratorAction.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/actions/naming/FileNameGeneratorAction.java	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/actions/naming/FileNameGeneratorAction.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -33,7 +33,6 @@
 import org.jboss.soa.esb.actions.BeanConfiguredAction;
 import org.jboss.soa.esb.actions.naming.strategy.FileNamingStrategy;
 import org.jboss.soa.esb.common.Environment;
-import org.jboss.soa.esb.listeners.gateway.AbstractFileGateway;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.util.ClassUtil;
 import org.w3c.dom.DOMException;

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/build.xml	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/build.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="build.rosetta.tests" default="org.jboss.esb.rosetta.tests.compile" basedir=".">
 
-	<property name="org.jboss.esb.internal.dest" location="../../../build"/>
+    <property name="org.jboss.esb.internal.dest" location="../../../build"/>
     <property name="org.jboss.esb.module.src.dir" location="../src"/>
     <property name="org.jboss.esb.module.classes.dir" location="${org.jboss.esb.internal.dest}/classes/rosetta"/>
     <property name="org.jboss.esb.module.tests.src.dir" location="src"/>
@@ -116,6 +116,10 @@
                 </fileset>
             </batchtest>
             <classpath>
+			<!-- c3p0 location -->
+		<fileset dir="${org.jboss.esb.ext.lib.dir}/standalone">
+			<include name="*.jar"/>
+		</fileset>
         		<!-- log4j location  -->
                 <pathelement location="${basedir}/resources/etc"/>
         		<!-- using instrumented code for code coverage -->
@@ -203,6 +207,9 @@
 	                <pathelement location="${org.jboss.esb.tests.classes.dir}"/>
 	            	<!-- Need the tests src folder because there may be non-compiled test resources -->
 	                <pathelement location="${org.jboss.esb.module.tests.src.dir}"/>
+					<fileset dir="${org.jboss.esb.ext.lib.dir}/standalone">
+						<include name="*.jar"/>
+					</fileset>
 	                <path refid="org.jboss.esb.tests.base.classpath"/>
 	            </classpath>
 				<!-- emma jvm args -->

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -26,9 +26,6 @@
 import java.io.FileFilter;
 import java.io.PrintStream;
 import java.net.URI;
-import java.util.Enumeration;
-import java.util.Properties;
-import java.util.TreeMap;
 import java.util.UUID;
 
 import junit.framework.Assert;
@@ -39,7 +36,6 @@
 import org.jboss.soa.esb.addressing.eprs.FileEpr;
 import org.jboss.soa.esb.common.Environment;
 import org.jboss.soa.esb.common.ModulePropertyManager;
-import org.jboss.soa.esb.common.tests.propertymanager.PropertyManagerUnitTest;
 import org.jboss.soa.esb.couriers.CourierFactory;
 import org.jboss.soa.esb.couriers.CourierUtil;
 import org.jboss.soa.esb.couriers.TwoWayCourier;

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/naming/FileNameGeneratorActionUnitTest.java (from rev 13441, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/naming/FileNameGeneratorActionUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/naming/FileNameGeneratorActionUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/naming/FileNameGeneratorActionUnitTest.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,102 @@
+/*
+ * 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
+ *  */
+package org.jboss.soa.esb.actions.naming;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.actions.ActionProcessingException;
+import org.jboss.soa.esb.addressing.eprs.HTTPEpr;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.message.format.MessageType;
+
+import junit.framework.TestCase;
+
+/**
+ * Test the file name generator action.    This class contains tests for the
+ * getters and setters, tests processing a message, and tests creating strategies
+ * from valid and invalid file naming strategy XML.
+ * 
+ * @author tcunning at redhat.com
+ */
+public class FileNameGeneratorActionUnitTest extends TestCase {
+	private static final Logger logger = Logger.getLogger(FileNameGeneratorActionUnitTest.class);
+	private static final String FILENAME = "word";
+	private static final String SUFFIX = "doc";
+	private static final String NEWSUFFIX = "esbout";
+	private static final String FILENAME_PROPERTY = "filename_property";
+	private static final String RESULT_PROPERTY = "result_property";
+
+	public void testGetters() {
+		FileNameGeneratorAction fnga = new FileNameGeneratorAction();
+		String test = new String("test");
+		
+		fnga.setResultProperty(test);
+		assertEquals(test, fnga.getResultProperty());
+		
+		fnga.setFileNameProperty(test);
+		assertEquals(test, fnga.getFileNameProperty());
+	}
+	
+	public void testStrategies() {
+		// Test a valid FileNamingStrategy
+		String strategies = "<xml><strategy class=\"org.jboss.soa.esb.actions.naming.strategy.ChangeSuffixNamingStrategy\">blah</strategy></xml>";
+		FileNameGeneratorAction fnga = new FileNameGeneratorAction();
+		fnga.setStrategies(strategies);
+		fnga.setFileNameProperty(FILENAME_PROPERTY);
+		fnga.setResultProperty(RESULT_PROPERTY);
+		logger.debug("FileNameStrategy : [" + fnga.getStrategies() + "]");
+		
+		// Test processing a message
+		Message msg1 = MessageFactory.getInstance().getMessage(MessageType.JAVA_SERIALIZED);
+		msg1.getBody().add("foo", "bar");
+		try {
+			msg1.getHeader().getCall().setTo(new HTTPEpr("http://foo.bar"));
+			msg1.getHeader().getCall().setMessageID(new URI("urn:1234"));
+			msg1.getProperties().setProperty(FILENAME_PROPERTY, FILENAME + "." + SUFFIX);
+			@SuppressWarnings("unused")
+			Message result = fnga.process(msg1);
+			String filename = (String) result.getProperties().getProperty(RESULT_PROPERTY);
+			logger.debug("Filename=[" + filename + "]");
+			assertEquals(filename, FILENAME + "." + NEWSUFFIX);
+		} catch (URISyntaxException e1) {
+			logger.error("", e1);
+			fail(e1.getMessage());
+		} catch (ActionProcessingException ape) {
+			logger.error("", ape);
+			fail(ape.getMessage());
+		} catch (Exception e) {
+			logger.error("", e);
+			fail(e.getMessage());
+		}
+		
+		
+		// Test an invalid FileNamingStrategy class
+		strategies = "<xml><strategy class=\"foobar\">blah</strategy></xml>";
+		try {
+			fnga = new FileNameGeneratorAction();
+			fnga.setStrategies(strategies);
+			fail("Setting the strategy on an invalid class should result in an Exception.");
+		} catch (RuntimeException re) {
+		}
+		logger.debug("FileNameStrategy : [" + fnga.getStrategies() + "]");
+	}
+}

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterIntegrationTest.java (from rev 13441, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterIntegrationTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterIntegrationTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterIntegrationTest.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.actions.routing;
+
+import junit.framework.TestCase;
+
+import org.jboss.soa.esb.actions.ActionProcessingException;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+
+public class JmsRouterIntegrationTest extends TestCase
+{
+	public JmsRouterIntegrationTest ()
+	{
+	}
+
+	public void testRouter () throws Exception
+	{
+		ConfigTree tree = new ConfigTree("test");
+		
+		tree.setAttribute("jndiName", "foobar");
+		
+		JMSRouter router = new JMSRouter(tree);
+		boolean exception = false;
+		
+		Message msg = MessageFactory.getInstance().getMessage();
+		
+		msg.getBody().setByteArray("hello world".getBytes());
+		
+		try
+		{
+			router.route(msg);
+		}
+		catch (ActionProcessingException ex)
+		{
+			exception = true;
+		}
+		
+		if (!exception)
+			fail();
+		
+		router.unwrap = true;
+		
+		try
+		{
+			msg.getBody().add("org.jboss.soa.esb.actions.current.after", "hello world");
+			router.process(msg);
+		}
+		catch (ActionProcessingException ex)
+		{
+			exception = true;
+		}
+
+		if (!exception)
+			fail();
+		
+		router.getErrorNotification(null);
+		router.getOkNotification(null);
+	}
+	
+}

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterUnitTest.java	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterUnitTest.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,82 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY 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 along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.soa.esb.actions.routing;
-
-import junit.framework.TestCase;
-
-import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-
-public class JmsRouterUnitTest extends TestCase
-{
-	public JmsRouterUnitTest ()
-	{
-	}
-
-	public void testRouter () throws Exception
-	{
-		ConfigTree tree = new ConfigTree("test");
-		
-		tree.setAttribute("jndiName", "foobar");
-		
-		JMSRouter router = new JMSRouter(tree);
-		boolean exception = false;
-		
-		Message msg = MessageFactory.getInstance().getMessage();
-		
-		msg.getBody().setByteArray("hello world".getBytes());
-		
-		try
-		{
-			router.route(msg);
-		}
-		catch (ActionProcessingException ex)
-		{
-			exception = true;
-		}
-		
-		if (!exception)
-			fail();
-		
-		router.unwrap = true;
-		
-		try
-		{
-			msg.getBody().add("org.jboss.soa.esb.actions.current.after", "hello world");
-			router.process(msg);
-		}
-		catch (ActionProcessingException ex)
-		{
-			exception = true;
-		}
-
-		if (!exception)
-			fail();
-		
-		router.getErrorNotification(null);
-		router.getOkNotification(null);
-	}
-	
-}

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating (from rev 13441, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating)

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/StringTemplateProcessorUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/StringTemplateProcessorUnitTest.java	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/StringTemplateProcessorUnitTest.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,60 +0,0 @@
-package org.jboss.soa.esb.actions.templating;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.addressing.eprs.HTTPEpr;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.message.format.MessageType;
-import org.xml.sax.SAXException;
-
-import junit.framework.TestCase;
-
-public class StringTemplateProcessorUnitTest extends TestCase {
-	
-    private InputStream getStream(String sName) {
-    	InputStream oRet =getClass().getResourceAsStream(sName);
-    	if (null==oRet)
-    		try { oRet = new FileInputStream(sName); }
-    		catch(IOException e) { /* OK  Just fall through */}
-    	return oRet;
-    }
-	
-	public void testProcessor() {
-		ConfigTree confTree = null;
-		try {
-			confTree = ConfigTree.fromInputStream(getStream("testfile1.xml"));
-		} catch (SAXException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		StringTemplateProcessor stp = new StringTemplateProcessor(confTree);
-		
-		Message msg1 = MessageFactory.getInstance().getMessage(MessageType.JAVA_SERIALIZED);
-		msg1.getBody().add("foo", "bar");
-		try {
-			msg1.getHeader().getCall().setTo(new HTTPEpr("http://foo.bar"));
-			msg1.getHeader().getCall().setMessageID(new URI("urn:1234"));
-			Message msg = stp.process(msg1); 
-			if (msg == null) {
-				fail("Message returned is null");
-			}
-			
-		} catch (URISyntaxException e1) {
-			e1.printStackTrace();
-			fail(e1.getMessage());
-		} catch (ActionProcessingException e) {
-			e.printStackTrace();
-			fail(e.getMessage());
-		}
-	}
-}

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/StringTemplateProcessorUnitTest.java (from rev 13441, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/StringTemplateProcessorUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/StringTemplateProcessorUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/StringTemplateProcessorUnitTest.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,60 @@
+package org.jboss.soa.esb.actions.templating;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.jboss.soa.esb.actions.ActionProcessingException;
+import org.jboss.soa.esb.addressing.eprs.HTTPEpr;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.message.format.MessageType;
+import org.xml.sax.SAXException;
+
+import junit.framework.TestCase;
+
+public class StringTemplateProcessorUnitTest extends TestCase {
+	
+    private InputStream getStream(String sName) {
+    	InputStream oRet =getClass().getResourceAsStream(sName);
+    	if (null==oRet)
+    		try { oRet = new FileInputStream(sName); }
+    		catch(IOException e) { /* OK  Just fall through */}
+    	return oRet;
+    }
+	
+	public void testProcessor() {
+		ConfigTree confTree = null;
+		try {
+			confTree = ConfigTree.fromInputStream(getStream("testfile1.xml"));
+		} catch (SAXException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		StringTemplateProcessor stp = new StringTemplateProcessor(confTree);
+		
+		Message msg1 = MessageFactory.getInstance().getMessage(MessageType.JAVA_SERIALIZED);
+		msg1.getBody().add("foo", "bar");
+		try {
+			msg1.getHeader().getCall().setTo(new HTTPEpr("http://foo.bar"));
+			msg1.getHeader().getCall().setMessageID(new URI("urn:1234"));
+			Message msg = stp.process(msg1); 
+			if (msg == null) {
+				fail("Message returned is null");
+			}
+			
+		} catch (URISyntaxException e1) {
+			e1.printStackTrace();
+			fail(e1.getMessage());
+		} catch (ActionProcessingException e) {
+			e.printStackTrace();
+			fail(e.getMessage());
+		}
+	}
+}

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/stringtemplate.st
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/stringtemplate.st	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/stringtemplate.st	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,7 +0,0 @@
-                <order-item>
-                        <index>$orderItem.position$</index>
-                        <quantity>$orderItem.quantity$</quantity>
-                        <product>$orderItem.productId$</product>
-                        <title>$orderItem.title$</title>
-                        <price>$orderItem.price$</price>
-                </order-item>
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/stringtemplate.st (from rev 13441, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/stringtemplate.st)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/stringtemplate.st	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/stringtemplate.st	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,7 @@
+                <order-item>
+                        <index>$orderItem.position$</index>
+                        <quantity>$orderItem.quantity$</quantity>
+                        <product>$orderItem.productId$</product>
+                        <title>$orderItem.title$</title>
+                        <price>$orderItem.price$</price>
+                </order-item>
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/testfile1.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/testfile1.xml	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/testfile1.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,7 +0,0 @@
-<test template="org/jboss/soa/esb/actions/templating/stringtemplate" encoding="UTF-8">
-	<el index="1"/>
-	<el index="2">
-		<el index="2.1"/>
-		And some text...
-	</el>
-</test>
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/testfile1.xml (from rev 13441, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/testfile1.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/testfile1.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/actions/templating/testfile1.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,7 @@
+<test template="org/jboss/soa/esb/actions/templating/stringtemplate" encoding="UTF-8">
+	<el index="1"/>
+	<el index="2">
+		<el index="2.1"/>
+		And some text...
+	</el>
+</test>
\ No newline at end of file

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GatewayFilterUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GatewayFilterUnitTest.java	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GatewayFilterUnitTest.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -23,33 +23,18 @@
 package org.jboss.soa.esb.listeners.gateway;
 
 import java.io.File;
-import java.io.FileFilter;
-import java.io.PrintStream;
-import java.net.URI;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Properties;
-import java.util.TreeMap;
-import java.util.UUID;
 
 import junit.framework.Assert;
 import junit.framework.JUnit4TestAdapter;
 
-import org.apache.log4j.Logger;
-import org.jboss.soa.esb.addressing.Call;
-import org.jboss.soa.esb.addressing.eprs.FileEpr;
 import org.jboss.soa.esb.common.Environment;
 import org.jboss.soa.esb.common.ModulePropertyManager;
-import org.jboss.soa.esb.common.tests.propertymanager.PropertyManagerUnitTest;
-import org.jboss.soa.esb.couriers.CourierFactory;
-import org.jboss.soa.esb.couriers.CourierUtil;
-import org.jboss.soa.esb.couriers.TwoWayCourier;
 import org.jboss.soa.esb.filter.FilterManager;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.message.format.MessageFactory;
-import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/persistence (from rev 13441, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/persistence)

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager (from rev 13441, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager)

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactoryUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactoryUnitTest.java	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactoryUnitTest.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,114 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY 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 along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.soa.esb.persistence.manager;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.apache.log4j.Logger;
-import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
-import org.jboss.soa.esb.common.Configuration;
-import org.jboss.soa.esb.common.Environment;
-import org.jboss.soa.esb.common.ModulePropertyManager;
-import org.jboss.soa.esb.common.tests.BaseTest;
-import org.jboss.soa.esb.common.tests.MockDataSource;
-import org.mockejb.jndi.MockContextFactory;
-
-/**
- * Test of the ConnectionManagerFactory - test whether it throws exceptions
- * correctly and whether it can successfully instantiate a ConnectionManagerFactory
- * instance.
- * 
- * @author tcunning at redhat.com
- */
-public class ConnectionManagerFactoryUnitTest extends BaseTest {
-    private static final String TEST_STRING = "test0123456789";
-    private static final Logger logger = Logger.getLogger(ConnectionManagerFactoryUnitTest.class);
-	
-	protected void setUp() throws Exception {
-        MockContextFactory.setAsInitial();
-    }
-	
-	
-	public void testFactory() {
-		Context ctx = null;
-		com.arjuna.common.util.propertyservice.PropertyManager pm = ModulePropertyManager.getPropertyManager(ModulePropertyManager.DBSTORE_MODULE);
-		pm.setProperty(Environment.MSG_STORE_DB_DATASOURCE_NAME, "blah");
-		
-        // Grab the connection created and do a simple Query - we expect a result
-    	try {
-    		ctx = new InitialContext();
-    		MockDataSource mds = new MockDataSource(this);
-    		String dataSourcename = Configuration.getStoreDBDatasourceName();
-    		ctx.rebind(dataSourcename, mds);
-
-    	} catch (NamingException e) {
-			logger.debug("", e);
-    		fail(e.getMessage());
-    	} catch (Exception e) {
-			logger.debug("", e);
-    		fail(e.getMessage());		
-    	}
-		
-		try {
-			ConnectionManager cmf = ConnectionManagerFactory.getConnectionManager();
-			if (cmf == null) {
-				fail ("ConnectionManager returned should not be null.");
-			}
-		} catch (ConnectionManagerException e) {
-			logger.debug("", e);
-			fail(e.getMessage());
-		}		
-	}
-	
-	
-	public void testExceptions() {
-		Context ctx = null;
-		com.arjuna.common.util.propertyservice.PropertyManager pm = ModulePropertyManager.getPropertyManager(ModulePropertyManager.DBSTORE_MODULE);
-		pm.setProperty(Environment.MSG_STORE_DB_DATASOURCE_NAME, TEST_STRING);
-		pm.setProperty(Environment.MSG_STORE_DB_CONN_MANAGER, TEST_STRING);
-   
-		// Grab the connection created and do a simple Query - we expect a result
-    	try {
-    		ctx = new InitialContext();
-    		MockDataSource mds = new MockDataSource(this);
-    		String dataSourcename = Configuration.getStoreDBDatasourceName();
-    		ctx.rebind(dataSourcename, mds);
-    		
-    	} catch (NamingException e) {
-			logger.debug("", e);
-    		fail(e.getMessage());
-    	} catch (Exception e) {
-			logger.debug("", e);
-    		fail(e.getMessage());		
-    	}
-		
-		try {
-			@SuppressWarnings("unused")
-			ConnectionManager cmf = ConnectionManagerFactory.getConnectionManager();
-			fail("Fake ConnectionManager class name should have thrown an exception");
-		} catch (ConnectionManagerException e) {
-		}		
-	}
-}

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactoryUnitTest.java (from rev 13441, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactoryUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactoryUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactoryUnitTest.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,114 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.persistence.manager;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
+import org.jboss.soa.esb.common.Configuration;
+import org.jboss.soa.esb.common.Environment;
+import org.jboss.soa.esb.common.ModulePropertyManager;
+import org.jboss.soa.esb.common.tests.BaseTest;
+import org.jboss.soa.esb.common.tests.MockDataSource;
+import org.mockejb.jndi.MockContextFactory;
+
+/**
+ * Test of the ConnectionManagerFactory - test whether it throws exceptions
+ * correctly and whether it can successfully instantiate a ConnectionManagerFactory
+ * instance.
+ * 
+ * @author tcunning at redhat.com
+ */
+public class ConnectionManagerFactoryUnitTest extends BaseTest {
+    private static final String TEST_STRING = "test0123456789";
+    private static final Logger logger = Logger.getLogger(ConnectionManagerFactoryUnitTest.class);
+	
+	protected void setUp() throws Exception {
+        MockContextFactory.setAsInitial();
+    }
+	
+	
+	public void testFactory() {
+		Context ctx = null;
+		com.arjuna.common.util.propertyservice.PropertyManager pm = ModulePropertyManager.getPropertyManager(ModulePropertyManager.DBSTORE_MODULE);
+		pm.setProperty(Environment.MSG_STORE_DB_DATASOURCE_NAME, "blah");
+		
+        // Grab the connection created and do a simple Query - we expect a result
+    	try {
+    		ctx = new InitialContext();
+    		MockDataSource mds = new MockDataSource(this);
+    		String dataSourcename = Configuration.getStoreDBDatasourceName();
+    		ctx.rebind(dataSourcename, mds);
+
+    	} catch (NamingException e) {
+			logger.debug("", e);
+    		fail(e.getMessage());
+    	} catch (Exception e) {
+			logger.debug("", e);
+    		fail(e.getMessage());		
+    	}
+		
+		try {
+			ConnectionManager cmf = ConnectionManagerFactory.getConnectionManager();
+			if (cmf == null) {
+				fail ("ConnectionManager returned should not be null.");
+			}
+		} catch (ConnectionManagerException e) {
+			logger.debug("", e);
+			fail(e.getMessage());
+		}		
+	}
+	
+	
+	public void testExceptions() {
+		Context ctx = null;
+		com.arjuna.common.util.propertyservice.PropertyManager pm = ModulePropertyManager.getPropertyManager(ModulePropertyManager.DBSTORE_MODULE);
+		pm.setProperty(Environment.MSG_STORE_DB_DATASOURCE_NAME, TEST_STRING);
+		pm.setProperty(Environment.MSG_STORE_DB_CONN_MANAGER, TEST_STRING);
+   
+		// Grab the connection created and do a simple Query - we expect a result
+    	try {
+    		ctx = new InitialContext();
+    		MockDataSource mds = new MockDataSource(this);
+    		String dataSourcename = Configuration.getStoreDBDatasourceName();
+    		ctx.rebind(dataSourcename, mds);
+    		
+    	} catch (NamingException e) {
+			logger.debug("", e);
+    		fail(e.getMessage());
+    	} catch (Exception e) {
+			logger.debug("", e);
+    		fail(e.getMessage());		
+    	}
+		
+		try {
+			@SuppressWarnings("unused")
+			ConnectionManager cmf = ConnectionManagerFactory.getConnectionManager();
+			fail("Fake ConnectionManager class name should have thrown an exception");
+		} catch (ConnectionManagerException e) {
+		}		
+	}
+}

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerUnitTest.java	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerUnitTest.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,126 +0,0 @@
-/*
- * 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
- *  */
-package org.jboss.soa.esb.persistence.manager;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.apache.log4j.Logger;
-import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
-import org.jboss.soa.esb.common.Configuration;
-import org.jboss.soa.esb.common.Environment;
-import org.jboss.soa.esb.common.ModulePropertyManager;
-import org.jboss.soa.esb.common.tests.BaseTest;
-import org.jboss.soa.esb.common.tests.MockDataSource;
-import org.mockejb.jndi.MockContextFactory;
-
-/**
- * Test the Standalone and the J2EE Connection Managers.
- * @author tcunning at redhat.com
- */
-public class ConnectionManagerUnitTest extends BaseTest {
-    private static final String JEE_CONNECTIONMGR_CLASS = "org.jboss.soa.esb.persistence.manager.J2eeConnectionManager";
-    private static final String STANDALONE_CONNECTIONMGR_CLASS = "org.jboss.soa.esb.persistence.manager.StandaloneConnectionManager";
-    private static final Logger logger = Logger.getLogger(ConnectionManagerFactoryUnitTest.class);
-	
-	protected void setUp() throws Exception {
-        MockContextFactory.setAsInitial();
-    }
-	
-	public void testJ2EEConnectionManager() {
-		Context ctx = null;
-		com.arjuna.common.util.propertyservice.PropertyManager pm = ModulePropertyManager.getPropertyManager(ModulePropertyManager.DBSTORE_MODULE);
-		pm.setProperty(Environment.MSG_STORE_DB_DATASOURCE_NAME, "datasource");
-		pm.setProperty(Environment.MSG_STORE_DB_CONN_MANAGER, JEE_CONNECTIONMGR_CLASS);
-   
-    	try {
-    		ctx = new InitialContext();
-    		MockDataSource mds = new MockDataSource(this);
-    		String dataSourcename = Configuration.getStoreDBDatasourceName();
-    		ctx.rebind(dataSourcename, mds);
-    		
-    	} catch (NamingException e) {
-    		e.printStackTrace();
-    		logger.debug("", e);
-    		fail(e.getMessage());
-    	} catch (Exception e) {
-			logger.debug("", e);
-    		fail(e.getMessage());		
-    	}
-		
-		try {
-			ConnectionManager cmf = ConnectionManagerFactory.getConnectionManager();
-			@SuppressWarnings("unused")
-			ConnectionManager test = cmf.getInstance();
-			Connection conn = cmf.getConnection();
-			if (conn == null) {
-				fail("Connection returned by StandaloneConnectionManager should not be null");
-			}
-		} catch (ConnectionManagerException e) {
-			logger.debug("", e);
-			fail(e.getMessage());
-		} catch (SQLException e) {
-			logger.debug("", e);
-			fail(e.getMessage());
-		}	
-	}
-	
-	public void testStandaloneConnectionManager() {
-		Context ctx = null;
-		com.arjuna.common.util.propertyservice.PropertyManager pm = ModulePropertyManager.getPropertyManager(ModulePropertyManager.DBSTORE_MODULE);
-		pm.setProperty(Environment.MSG_STORE_DB_DATASOURCE_NAME, "datasource");
-		pm.setProperty(Environment.MSG_STORE_DB_CONN_MANAGER, STANDALONE_CONNECTIONMGR_CLASS);
-		pm.setProperty(Environment.MSG_STORE_DB_POOL_MAX_SIZE, "1");
-		pm.setProperty(Environment.MSG_STORE_DB_POOL_MIN_SIZE, "1");
-		pm.setProperty(Environment.MSG_STORE_DB_POOL_INITIAL_SIZE, "1");
-		pm.setProperty(Environment.MSG_STORE_DB_POOL_TIMEOUT_MILLIS, "20000");
-		
-    	try {
-    		ctx = new InitialContext();
-    		MockDataSource mds = new MockDataSource(this);
-    		String dataSourcename = Configuration.getStoreDBDatasourceName();
-    		ctx.rebind(dataSourcename, mds);
-    		
-    	} catch (NamingException e) {
-    		e.printStackTrace();
-
-			logger.debug("", e);
-    		fail(e.getMessage());
-    	} catch (Exception e) {
-			logger.debug("", e);
-    		fail(e.getMessage());		
-    	}
-		
-		try {
-			ConnectionManager cmf = ConnectionManagerFactory.getConnectionManager();
-			@SuppressWarnings("unused")
-			ConnectionManager test = cmf.getInstance();
-		} catch (ConnectionManagerException e) {
-			logger.debug("", e);
-			fail(e.getMessage());
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail(e.getMessage());
-		}
-	}
-}

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerUnitTest.java (from rev 13441, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerUnitTest.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,126 @@
+/*
+ * 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
+ *  */
+package org.jboss.soa.esb.persistence.manager;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
+import org.jboss.soa.esb.common.Configuration;
+import org.jboss.soa.esb.common.Environment;
+import org.jboss.soa.esb.common.ModulePropertyManager;
+import org.jboss.soa.esb.common.tests.BaseTest;
+import org.jboss.soa.esb.common.tests.MockDataSource;
+import org.mockejb.jndi.MockContextFactory;
+
+/**
+ * Test the Standalone and the J2EE Connection Managers.
+ * @author tcunning at redhat.com
+ */
+public class ConnectionManagerUnitTest extends BaseTest {
+    private static final String JEE_CONNECTIONMGR_CLASS = "org.jboss.soa.esb.persistence.manager.J2eeConnectionManager";
+    private static final String STANDALONE_CONNECTIONMGR_CLASS = "org.jboss.soa.esb.persistence.manager.StandaloneConnectionManager";
+    private static final Logger logger = Logger.getLogger(ConnectionManagerFactoryUnitTest.class);
+	
+	protected void setUp() throws Exception {
+        MockContextFactory.setAsInitial();
+    }
+	
+	public void testJ2EEConnectionManager() {
+		Context ctx = null;
+		com.arjuna.common.util.propertyservice.PropertyManager pm = ModulePropertyManager.getPropertyManager(ModulePropertyManager.DBSTORE_MODULE);
+		pm.setProperty(Environment.MSG_STORE_DB_DATASOURCE_NAME, "datasource");
+		pm.setProperty(Environment.MSG_STORE_DB_CONN_MANAGER, JEE_CONNECTIONMGR_CLASS);
+   
+    	try {
+    		ctx = new InitialContext();
+    		MockDataSource mds = new MockDataSource(this);
+    		String dataSourcename = Configuration.getStoreDBDatasourceName();
+    		ctx.rebind(dataSourcename, mds);
+    		
+    	} catch (NamingException e) {
+    		e.printStackTrace();
+    		logger.debug("", e);
+    		fail(e.getMessage());
+    	} catch (Exception e) {
+			logger.debug("", e);
+    		fail(e.getMessage());		
+    	}
+		
+		try {
+			ConnectionManager cmf = ConnectionManagerFactory.getConnectionManager();
+			@SuppressWarnings("unused")
+			ConnectionManager test = cmf.getInstance();
+			Connection conn = cmf.getConnection();
+			if (conn == null) {
+				fail("Connection returned by StandaloneConnectionManager should not be null");
+			}
+		} catch (ConnectionManagerException e) {
+			logger.debug("", e);
+			fail(e.getMessage());
+		} catch (SQLException e) {
+			logger.debug("", e);
+			fail(e.getMessage());
+		}	
+	}
+	
+	public void testStandaloneConnectionManager() {
+		Context ctx = null;
+		com.arjuna.common.util.propertyservice.PropertyManager pm = ModulePropertyManager.getPropertyManager(ModulePropertyManager.DBSTORE_MODULE);
+		pm.setProperty(Environment.MSG_STORE_DB_DATASOURCE_NAME, "datasource");
+		pm.setProperty(Environment.MSG_STORE_DB_CONN_MANAGER, STANDALONE_CONNECTIONMGR_CLASS);
+		pm.setProperty(Environment.MSG_STORE_DB_POOL_MAX_SIZE, "1");
+		pm.setProperty(Environment.MSG_STORE_DB_POOL_MIN_SIZE, "1");
+		pm.setProperty(Environment.MSG_STORE_DB_POOL_INITIAL_SIZE, "1");
+		pm.setProperty(Environment.MSG_STORE_DB_POOL_TIMEOUT_MILLIS, "20000");
+		
+    	try {
+    		ctx = new InitialContext();
+    		MockDataSource mds = new MockDataSource(this);
+    		String dataSourcename = Configuration.getStoreDBDatasourceName();
+    		ctx.rebind(dataSourcename, mds);
+    		
+    	} catch (NamingException e) {
+    		e.printStackTrace();
+
+			logger.debug("", e);
+    		fail(e.getMessage());
+    	} catch (Exception e) {
+			logger.debug("", e);
+    		fail(e.getMessage());		
+    	}
+		
+		try {
+			ConnectionManager cmf = ConnectionManagerFactory.getConnectionManager();
+			@SuppressWarnings("unused")
+			ConnectionManager test = cmf.getInstance();
+		} catch (ConnectionManagerException e) {
+			logger.debug("", e);
+			fail(e.getMessage());
+		} catch (Exception e) {
+			e.printStackTrace();
+			fail(e.getMessage());
+		}
+	}
+}

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/build.xml	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/build.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -12,7 +12,7 @@
 
   <property name="jbossesb.inputdir" location="${build.dir}/inputdir"/>
 
-  <property name="project.process.dir" value="processDefinition1"/>
+  <property name="project.process.dir" value="processDefinition"/>
 
   <target name="config">
     <delete dir="${jbossesb.inputdir}" quiet="true"/>

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/deployment.xml (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/deployment.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbossesb-deployment>
+  <depends>jboss.esb:deployment=jbpm.esb</depends>
+</jbossesb-deployment>
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/processDefinition (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/processDefinition)

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/processDefinition/gpd.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/processDefinition/gpd.xml	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/processDefinition/gpd.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<process-diagram name="processDefinition2" width="688" height="577">
-  <node name="start" x="0" y="0" width="140" height="40">
-    <transition name="">
-      <label x="5" y="-10"/>
-    </transition>
-  </node>
-  <node name="node1" x="0" y="0" width="140" height="40">
-    <transition name="">
-      <label x="5" y="-10"/>
-    </transition>
-  </node>
-  <node name="node2" x="0" y="0" width="140" height="40">
-    <transition name="">
-      <label x="5" y="-10"/>
-    </transition>
-  </node>
-  <node name="node3" x="0" y="0" width="140" height="40">
-    <transition name="">
-      <label x="5" y="-10"/>
-    </transition>
-  </node>
-  <node name="end1" x="0" y="0" width="140" height="40"/>
-  <node name="Send Results" x="0" y="0" width="140" height="40">
-    <transition name="">
-      <label x="5" y="-10"/>
-    </transition>
-  </node>
-</process-diagram>

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/processDefinition/gpd.xml (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/processDefinition/gpd.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/processDefinition/gpd.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/processDefinition/gpd.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-diagram name="processDefinition2" width="688" height="577">
+  <node name="start" x="0" y="0" width="140" height="40">
+    <transition name="">
+      <label x="5" y="-10"/>
+    </transition>
+  </node>
+  <node name="node1" x="0" y="0" width="140" height="40">
+    <transition name="">
+      <label x="5" y="-10"/>
+    </transition>
+  </node>
+  <node name="node2" x="0" y="0" width="140" height="40">
+    <transition name="">
+      <label x="5" y="-10"/>
+    </transition>
+  </node>
+  <node name="node3" x="0" y="0" width="140" height="40">
+    <transition name="">
+      <label x="5" y="-10"/>
+    </transition>
+  </node>
+  <node name="end1" x="0" y="0" width="140" height="40"/>
+  <node name="Send Results" x="0" y="0" width="140" height="40">
+    <transition name="">
+      <label x="5" y="-10"/>
+    </transition>
+  </node>
+</process-diagram>

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/processDefinition/processdefinition.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/processDefinition/processdefinition.xml	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/processDefinition/processdefinition.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<process-definition
-  xmlns=""  name="processDefinition2">
-   <start-state name="start">
-      <event type="node-enter">
-         <action name="action1" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.process_actions.MyBPMActionHandler" config-type="bean"></action>
-      </event>
-      <transition name="" to="node1"></transition>
-   </start-state>
-
-   <node name="node1">
-      <event type="node-enter">
-         <action name="action2" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
-            <esbCategoryName>BPM_Orchestration_Service1</esbCategoryName>
-            <esbServiceName>Service1</esbServiceName>
-            <millisToWaitForResponse>5000</millisToWaitForResponse>
-            <jbpmToEsbVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </jbpmToEsbVars>
-            <returnVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </returnVars>
-         </action>
-      </event>
-      <transition name="" to="node2"></transition>
-   </node>
-   <node name="node2">
-      <event type="node-enter">
-         <action name="action2" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
-            <esbCategoryName>BPM_Orchestration_Service2</esbCategoryName>
-            <esbServiceName>Service2</esbServiceName>
-            <millisToWaitForResponse>5000</millisToWaitForResponse>
-            <jbpmToEsbVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </jbpmToEsbVars>
-            <returnVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </returnVars>
-         </action>
-      </event>
-      <transition name="" to="node3"></transition>
-   </node>
-   <node name="node3">
-      <event type="node-enter">
-         <action name="action2" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
-            <esbCategoryName>BPM_Orchestration_Service3</esbCategoryName>
-            <esbServiceName>Service3</esbServiceName>         
-            <millisToWaitForResponse>5000</millisToWaitForResponse>            
-            <jbpmToEsbVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </jbpmToEsbVars>
-            <returnVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </returnVars>
-         </action>
-      </event>
-      <transition name="" to="Send Results"></transition>
-   </node>
-   <end-state name="end1"></end-state>
-   <node name="Send Results">
-         <event type="node-enter">
-         <action name="action1" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.process_actions.MyBPMActionHandler" config-type="bean"></action>
-         <action name="action2" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
-            <esbCategoryName>BPM_Orchestration_ResultsService</esbCategoryName>
-            <esbServiceName>ResultsService</esbServiceName>         
-            <millisToWaitForResponse>5000</millisToWaitForResponse>            
-            <jbpmToEsbVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </jbpmToEsbVars>
-            <returnVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </returnVars>
-         </action>
-      </event>
-   
-      <transition name="" to="end1"></transition>
-   </node>
-</process-definition>
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/processDefinition/processdefinition.xml (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/processDefinition/processdefinition.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/processDefinition/processdefinition.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/processDefinition/processdefinition.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition
+  xmlns=""  name="processDefinition2">
+   <start-state name="start">
+      <event type="node-enter">
+         <action name="action1" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.process_actions.MyBPMActionHandler" config-type="bean"></action>
+      </event>
+      <transition name="" to="node1"></transition>
+   </start-state>
+
+   <node name="node1">
+      <event type="node-enter">
+         <action name="action2" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
+            <esbCategoryName>BPM_Orchestration_Service1</esbCategoryName>
+            <esbServiceName>Service1</esbServiceName>
+            <millisToWaitForResponse>5000</millisToWaitForResponse>
+            <jbpmToEsbVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </jbpmToEsbVars>
+            <returnVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </returnVars>
+         </action>
+      </event>
+      <transition name="" to="node2"></transition>
+   </node>
+   <node name="node2">
+      <event type="node-enter">
+         <action name="action2" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
+            <esbCategoryName>BPM_Orchestration_Service2</esbCategoryName>
+            <esbServiceName>Service2</esbServiceName>
+            <millisToWaitForResponse>5000</millisToWaitForResponse>
+            <jbpmToEsbVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </jbpmToEsbVars>
+            <returnVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </returnVars>
+         </action>
+      </event>
+      <transition name="" to="node3"></transition>
+   </node>
+   <node name="node3">
+      <event type="node-enter">
+         <action name="action2" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
+            <esbCategoryName>BPM_Orchestration_Service3</esbCategoryName>
+            <esbServiceName>Service3</esbServiceName>         
+            <millisToWaitForResponse>5000</millisToWaitForResponse>            
+            <jbpmToEsbVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </jbpmToEsbVars>
+            <returnVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </returnVars>
+         </action>
+      </event>
+      <transition name="" to="Send Results"></transition>
+   </node>
+   <end-state name="end1"></end-state>
+   <node name="Send Results">
+         <event type="node-enter">
+         <action name="action1" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.process_actions.MyBPMActionHandler" config-type="bean"></action>
+         <action name="action2" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
+            <esbCategoryName>BPM_Orchestration_ResultsService</esbCategoryName>
+            <esbServiceName>ResultsService</esbServiceName>         
+            <millisToWaitForResponse>5000</millisToWaitForResponse>            
+            <jbpmToEsbVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </jbpmToEsbVars>
+            <returnVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </returnVars>
+         </action>
+      </event>
+   
+      <transition name="" to="end1"></transition>
+   </node>
+</process-definition>
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/processDefinition/processimage.jpg
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration1/processDefinition/processimage.jpg (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/processDefinition/processimage.jpg)
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2
___________________________________________________________________
Name: svn:ignore
   + build


Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/build.xml	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/build.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -10,7 +10,7 @@
   <!-- Import the base Ant build script... -->
   <import file="../conf/base-build.xml"/>
   
-  <property name="project.process.dir" value="processDefinition1"/>
+  <property name="project.process.dir" value="processDefinition"/>
 	
   <target name="quickstart-specific-dependencies">
   	<path id="quickstart-dependencies-classpath">

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/processDefinition)

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition/gpd.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/processDefinition/gpd.xml	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition/gpd.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<process-diagram name="processDefinition1" width="546" height="540">
-  <node name="start" x="225" y="10" width="140" height="40">
-    <transition name="">
-      <label x="5" y="-10"/>
-    </transition>
-  </node>
-  <node name="Receive Order" x="114" y="81" width="140" height="40">
-    <transition name="">
-      <label x="5" y="-10"/>
-    </transition>
-  </node>
-  <node name="Validate Order" x="336" y="79" width="140" height="40">
-    <transition name="">
-      <label x="5" y="-10"/>
-    </transition>
-  </node>
-  <node name="fork1" x="170" y="234" width="325" height="25">
-    <transition name="">
-      <label x="5" y="-10"/>
-    </transition>
-    <transition name="tr2">
-      <label x="5" y="-10"/>
-    </transition>
-    <transition name="tr3">
-      <label x="5" y="-10"/>
-    </transition>
-  </node>
-  <node name="Los Angeles WHSE" x="49" y="294" width="140" height="40">
-    <transition name="">
-      <label x="5" y="-10"/>
-    </transition>
-  </node>
-  <node name="Dallas WHSE" x="235" y="295" width="140" height="40">
-    <transition name="">
-      <label x="5" y="-10"/>
-    </transition>
-  </node>
-  <node name="Atlanta WHSE" x="405" y="297" width="140" height="40">
-    <transition name="">
-      <label x="5" y="-10"/>
-    </transition>
-  </node>
-  <node name="join1" x="143" y="379" width="341" height="25">
-    <transition name="">
-      <label x="5" y="-10"/>
-    </transition>
-  </node>
-  <node name="Shipment Notice" x="246" y="432" width="140" height="40">
-    <transition name="">
-      <label x="5" y="-10"/>
-    </transition>
-  </node>
-  <node name="end1" x="246" y="499" width="140" height="40"/>
-  <node name="Credit Check" x="116" y="155" width="140" height="40">
-    <transition name="">
-      <label x="5" y="-10"/>
-    </transition>
-  </node>
-  <node name="Inventory Check" x="335" y="156" width="140" height="40">
-    <transition name="">
-      <label x="5" y="-10"/>
-    </transition>
-  </node>
-</process-diagram>

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition/gpd.xml (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/processDefinition/gpd.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition/gpd.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition/gpd.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-diagram name="processDefinition1" width="546" height="540">
+  <node name="start" x="225" y="10" width="140" height="40">
+    <transition name="">
+      <label x="5" y="-10"/>
+    </transition>
+  </node>
+  <node name="Receive Order" x="114" y="81" width="140" height="40">
+    <transition name="">
+      <label x="5" y="-10"/>
+    </transition>
+  </node>
+  <node name="Validate Order" x="336" y="79" width="140" height="40">
+    <transition name="">
+      <label x="5" y="-10"/>
+    </transition>
+  </node>
+  <node name="fork1" x="170" y="234" width="325" height="25">
+    <transition name="">
+      <label x="5" y="-10"/>
+    </transition>
+    <transition name="tr2">
+      <label x="5" y="-10"/>
+    </transition>
+    <transition name="tr3">
+      <label x="5" y="-10"/>
+    </transition>
+  </node>
+  <node name="Los Angeles WHSE" x="49" y="294" width="140" height="40">
+    <transition name="">
+      <label x="5" y="-10"/>
+    </transition>
+  </node>
+  <node name="Dallas WHSE" x="235" y="295" width="140" height="40">
+    <transition name="">
+      <label x="5" y="-10"/>
+    </transition>
+  </node>
+  <node name="Atlanta WHSE" x="405" y="297" width="140" height="40">
+    <transition name="">
+      <label x="5" y="-10"/>
+    </transition>
+  </node>
+  <node name="join1" x="143" y="379" width="341" height="25">
+    <transition name="">
+      <label x="5" y="-10"/>
+    </transition>
+  </node>
+  <node name="Shipment Notice" x="246" y="432" width="140" height="40">
+    <transition name="">
+      <label x="5" y="-10"/>
+    </transition>
+  </node>
+  <node name="end1" x="246" y="499" width="140" height="40"/>
+  <node name="Credit Check" x="116" y="155" width="140" height="40">
+    <transition name="">
+      <label x="5" y="-10"/>
+    </transition>
+  </node>
+  <node name="Inventory Check" x="335" y="156" width="140" height="40">
+    <transition name="">
+      <label x="5" y="-10"/>
+    </transition>
+  </node>
+</process-diagram>

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition/processdefinition.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/processDefinition/processdefinition.xml	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition/processdefinition.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<process-definition
-  xmlns="urn:jbpm.org:jpdl-3.1"  name="processDefinition1">
-   <start-state name="start">
-      <event type="node-enter">
-         <action name="action1" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.process_actions.MyBPMActionHandler" config-type="bean"></action>
-      </event>
-      <transition name="" to="Receive Order"></transition>
-   </start-state>
-
-   <node name="Receive Order">
-      <event type="node-enter">
-         <action name="esbAction" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
-            <esbCategoryName>BPM_Orchestration2_Service1</esbCategoryName>
-            <esbServiceName>Service1</esbServiceName>
-            <millisToWaitForResponse>5000</millisToWaitForResponse>
-		    <jbpmToEsbVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </jbpmToEsbVars>
-            <returnVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </returnVars>
-         </action>
-      </event>
-      <transition name="" to="Validate Order"></transition>
-   </node>
-   <node name="Validate Order">
-      <event type="node-enter">
-         <action name="esbAction" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
-            <esbCategoryName>BPM_Orchestration2_Service2</esbCategoryName>
-            <esbServiceName>Service2</esbServiceName>
-            <millisToWaitForResponse>5000</millisToWaitForResponse>
-            <jbpmToEsbVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </jbpmToEsbVars>
-            <returnVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </returnVars>           
-         </action>
-      </event>
-      <transition name="" to="Credit Check"></transition>
-   </node>
-   
-   <fork name="fork1">
-      <transition name="" to="Los Angeles WHSE"></transition>
-      <transition name="tr2" to="Dallas WHSE"></transition>
-      <transition name="tr3" to="Atlanta WHSE"></transition>
-   </fork>
-   <node name="Los Angeles WHSE">
-      <event type="node-enter">
-         <action name="esbAction" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
-            <esbCategoryName>BPM_Orchestration2_Service5</esbCategoryName>
-            <esbServiceName>Service5</esbServiceName>         
-            <millisToWaitForResponse>5000</millisToWaitForResponse>            
-			<jbpmToEsbVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </jbpmToEsbVars>
-            <returnVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </returnVars>            
-         </action>
-       </event>
-      <transition name="" to="join1"></transition>
-   </node>
-   <node name="Dallas WHSE">
-      <event type="node-enter">
-         <action name="esbAction" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
-            <esbCategoryName>BPM_Orchestration2_Service6</esbCategoryName>
-            <esbServiceName>Service6</esbServiceName>         
-            <millisToWaitForResponse>5000</millisToWaitForResponse>            
-			<jbpmToEsbVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </jbpmToEsbVars>
-            <returnVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </returnVars>           
-         </action>
-		</event>
-      <transition name="" to="join1"></transition>
-   </node>
-   
-   <node name="Atlanta WHSE">
-      <event type="node-enter">
-         <action name="esbAction" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
-            <esbCategoryName>BPM_Orchestration2_Service7</esbCategoryName>
-            <esbServiceName>Service7</esbServiceName>         
-            <millisToWaitForResponse>5000</millisToWaitForResponse>            
-			<jbpmToEsbVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </jbpmToEsbVars>
-            <returnVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </returnVars>           
-         </action>
-		</event>
-      <transition name="" to="join1"></transition>   
-   </node>
-     
-   <join name="join1">
-      <transition name="" to="Shipment Notice"></transition>
-   </join>
-   
-   <node name="Shipment Notice">
-         <event type="node-enter">
-         <action name="action1" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.process_actions.MyBPMActionHandler" config-type="bean"></action>
-         <action name="esbAction" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
-            <esbCategoryName>BPM_Orchestration2_ResultsService</esbCategoryName>
-            <esbServiceName>ResultsService</esbServiceName>                 
-			<jbpmToEsbVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </jbpmToEsbVars>
-            <returnVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </returnVars>         
-         </action>
-      </event>
-   
-      <transition name="" to="end1"></transition>
-   </node>
-   
-   <end-state name="end1"></end-state>
-   <node name="Credit Check">
-         <event type="node-enter">
-         <action name="esbAction" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
-            <esbCategoryName>BPM_Orchestration2_Service3</esbCategoryName>
-            <esbServiceName>Service3</esbServiceName>         
-            <millisToWaitForResponse>5000</millisToWaitForResponse>            
-			<jbpmToEsbVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </jbpmToEsbVars>
-            <returnVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </returnVars>         
-         </action>
-       </event>
-      <transition name="" to="Inventory Check"></transition>
-   </node>
-   <node name="Inventory Check">
-      <event type="node-enter">
-         <action name="esbAction" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
-            <esbCategoryName>BPM_Orchestration2_Service4</esbCategoryName>
-            <esbServiceName>Service4</esbServiceName>         
-            <millisToWaitForResponse>5000</millisToWaitForResponse>            
-			<jbpmToEsbVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </jbpmToEsbVars>
-            <returnVars>
-            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
-            </returnVars>            
-         </action>
-       </event>
-      <transition name="" to="fork1"></transition>
-   </node>
- 
-</process-definition>
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition/processdefinition.xml (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/processDefinition/processdefinition.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition/processdefinition.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition/processdefinition.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition
+  xmlns="urn:jbpm.org:jpdl-3.1"  name="processDefinition1">
+   <start-state name="start">
+      <event type="node-enter">
+         <action name="action1" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.process_actions.MyBPMActionHandler" config-type="bean"></action>
+      </event>
+      <transition name="" to="Receive Order"></transition>
+   </start-state>
+
+   <node name="Receive Order">
+      <event type="node-enter">
+         <action name="esbAction" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
+            <esbCategoryName>BPM_Orchestration2_Service1</esbCategoryName>
+            <esbServiceName>Service1</esbServiceName>
+            <millisToWaitForResponse>5000</millisToWaitForResponse>
+		    <jbpmToEsbVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </jbpmToEsbVars>
+            <returnVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </returnVars>
+         </action>
+      </event>
+      <transition name="" to="Validate Order"></transition>
+   </node>
+   <node name="Validate Order">
+      <event type="node-enter">
+         <action name="esbAction" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
+            <esbCategoryName>BPM_Orchestration2_Service2</esbCategoryName>
+            <esbServiceName>Service2</esbServiceName>
+            <millisToWaitForResponse>5000</millisToWaitForResponse>
+            <jbpmToEsbVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </jbpmToEsbVars>
+            <returnVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </returnVars>           
+         </action>
+      </event>
+      <transition name="" to="Credit Check"></transition>
+   </node>
+   
+   <fork name="fork1">
+      <transition name="" to="Los Angeles WHSE"></transition>
+      <transition name="tr2" to="Dallas WHSE"></transition>
+      <transition name="tr3" to="Atlanta WHSE"></transition>
+   </fork>
+   <node name="Los Angeles WHSE">
+      <event type="node-enter">
+         <action name="esbAction" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
+            <esbCategoryName>BPM_Orchestration2_Service5</esbCategoryName>
+            <esbServiceName>Service5</esbServiceName>         
+            <millisToWaitForResponse>5000</millisToWaitForResponse>            
+			<jbpmToEsbVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </jbpmToEsbVars>
+            <returnVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </returnVars>            
+         </action>
+       </event>
+      <transition name="" to="join1"></transition>
+   </node>
+   <node name="Dallas WHSE">
+      <event type="node-enter">
+         <action name="esbAction" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
+            <esbCategoryName>BPM_Orchestration2_Service6</esbCategoryName>
+            <esbServiceName>Service6</esbServiceName>         
+            <millisToWaitForResponse>5000</millisToWaitForResponse>            
+			<jbpmToEsbVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </jbpmToEsbVars>
+            <returnVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </returnVars>           
+         </action>
+		</event>
+      <transition name="" to="join1"></transition>
+   </node>
+   
+   <node name="Atlanta WHSE">
+      <event type="node-enter">
+         <action name="esbAction" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
+            <esbCategoryName>BPM_Orchestration2_Service7</esbCategoryName>
+            <esbServiceName>Service7</esbServiceName>         
+            <millisToWaitForResponse>5000</millisToWaitForResponse>            
+			<jbpmToEsbVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </jbpmToEsbVars>
+            <returnVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </returnVars>           
+         </action>
+		</event>
+      <transition name="" to="join1"></transition>   
+   </node>
+     
+   <join name="join1">
+      <transition name="" to="Shipment Notice"></transition>
+   </join>
+   
+   <node name="Shipment Notice">
+         <event type="node-enter">
+         <action name="action1" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.process_actions.MyBPMActionHandler" config-type="bean"></action>
+         <action name="esbAction" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
+            <esbCategoryName>BPM_Orchestration2_ResultsService</esbCategoryName>
+            <esbServiceName>ResultsService</esbServiceName>                 
+			<jbpmToEsbVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </jbpmToEsbVars>
+            <returnVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </returnVars>         
+         </action>
+      </event>
+   
+      <transition name="" to="end1"></transition>
+   </node>
+   
+   <end-state name="end1"></end-state>
+   <node name="Credit Check">
+         <event type="node-enter">
+         <action name="esbAction" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
+            <esbCategoryName>BPM_Orchestration2_Service3</esbCategoryName>
+            <esbServiceName>Service3</esbServiceName>         
+            <millisToWaitForResponse>5000</millisToWaitForResponse>            
+			<jbpmToEsbVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </jbpmToEsbVars>
+            <returnVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </returnVars>         
+         </action>
+       </event>
+      <transition name="" to="Inventory Check"></transition>
+   </node>
+   <node name="Inventory Check">
+      <event type="node-enter">
+         <action name="esbAction" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
+            <esbCategoryName>BPM_Orchestration2_Service4</esbCategoryName>
+            <esbServiceName>Service4</esbServiceName>         
+            <millisToWaitForResponse>5000</millisToWaitForResponse>            
+			<jbpmToEsbVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </jbpmToEsbVars>
+            <returnVars>
+            	<mapping jbpm-name="theBody" esb-name="BODY_CONTENT" />
+            </returnVars>            
+         </action>
+       </event>
+      <transition name="" to="fork1"></transition>
+   </node>
+ 
+</process-definition>
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition/processimage.jpg
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition/processimage.jpg (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/processDefinition/processimage.jpg)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router)

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/build.xml	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/build.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,48 +0,0 @@
-<project name="Quickstart_dynamic_router" default="runtest" basedir=".">
-	
-    <description> 
-            ${ant.project.name}
-            ${line.separator}
-    </description>
-
-    <property name="additional.deploys" value="MyESBRules-XPath.drl"/>
-
-    <!-- Import the base Ant build script... -->
-    <import file="../conf/base-build.xml"/>
-
-    <target name="runtest" depends="compile">
-        <echo>Runs JMS Sender - to destination channels</echo>
-        <java fork="yes" classname="quickstart.dynamicRouter.test.SendJMSMessage" failonerror="true">
-            <arg value="ESB dynamic router pattern quickstart - sending message to destination channels"/>
-            <classpath refid="exec-classpath"/>
-        </java>
-    </target>  
-
-    <target name="receive-destination3" depends="compile">
-	        <echo>Runs Test destination message receiver</echo>
-	        <java fork="yes" classname="quickstart.dynamicRouter.test.ReceiveJMSMessage" failonerror="true">
-	            <arg value="queue/qsdynamicrouter_3_Request"/>  
-	            <arg value=":OK"/>
-	            <classpath refid="exec-classpath"/>
-	        </java>
-	    </target>	
-	
-    <target name="receive-destination1" depends="compile">
-	        <echo>Runs Test destination 1 message receiver</echo>
-	        <java fork="yes" classname="quickstart.dynamicRouter.test.ReceiveJMSMessage" failonerror="true">
-	            <arg value="queue/qsdynamicrouter_1_Request"/>  
-	            <arg value=":OK"/>
-	            <classpath refid="exec-classpath"/>
-	        </java>
-	    </target>		
-	
-	   <target name="receive-destination2" depends="compile">
-		        <echo>Runs Test destination 2 message receiver</echo>
-		        <java fork="yes" classname="quickstart.dynamicRouter.test.ReceiveJMSMessage" failonerror="true">
-		            <arg value="queue/qsdynamicrouter_2_Request"/>  
-		            <arg value=":OK"/>
-		            <classpath refid="exec-classpath"/>
-		        </java>
-		    </target>		
-
-</project>

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/build.xml (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/build.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/build.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/build.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,48 @@
+<project name="Quickstart_dynamic_router" default="runtest" basedir=".">
+	
+    <description> 
+            ${ant.project.name}
+            ${line.separator}
+    </description>
+
+    <property name="additional.deploys" value="MyESBRules-XPath.drl"/>
+
+    <!-- Import the base Ant build script... -->
+    <import file="../conf/base-build.xml"/>
+
+    <target name="runtest" depends="compile">
+        <echo>Runs JMS Sender - to destination channels</echo>
+        <java fork="yes" classname="quickstart.dynamicRouter.test.SendJMSMessage" failonerror="true">
+            <arg value="ESB dynamic router pattern quickstart - sending message to destination channels"/>
+            <classpath refid="exec-classpath"/>
+        </java>
+    </target>  
+
+    <target name="receive-destination3" depends="compile">
+	        <echo>Runs Test destination message receiver</echo>
+	        <java fork="yes" classname="quickstart.dynamicRouter.test.ReceiveJMSMessage" failonerror="true">
+	            <arg value="queue/qsdynamicrouter_3_Request"/>  
+	            <arg value=":OK"/>
+	            <classpath refid="exec-classpath"/>
+	        </java>
+	    </target>	
+	
+    <target name="receive-destination1" depends="compile">
+	        <echo>Runs Test destination 1 message receiver</echo>
+	        <java fork="yes" classname="quickstart.dynamicRouter.test.ReceiveJMSMessage" failonerror="true">
+	            <arg value="queue/qsdynamicrouter_1_Request"/>  
+	            <arg value=":OK"/>
+	            <classpath refid="exec-classpath"/>
+	        </java>
+	    </target>		
+	
+	   <target name="receive-destination2" depends="compile">
+		        <echo>Runs Test destination 2 message receiver</echo>
+		        <java fork="yes" classname="quickstart.dynamicRouter.test.ReceiveJMSMessage" failonerror="true">
+		            <arg value="queue/qsdynamicrouter_2_Request"/>  
+		            <arg value=":OK"/>
+		            <classpath refid="exec-classpath"/>
+		        </java>
+		    </target>		
+
+</project>

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/deployment.xml	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/deployment.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,4 +0,0 @@
-<jbossesb-deployment>
-  <depends>jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_Input_Request</depends>
-  <depends>jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_Control_Request</depends>
-</jbossesb-deployment>

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/deployment.xml (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/deployment.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,4 @@
+<jbossesb-deployment>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_Input_Request</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_Control_Request</depends>
+</jbossesb-deployment>

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/jbm-queue-service.xml	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jbm-queue-service.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_Input_Request"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-  </mbean>
-
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_Control_Request"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-  </mbean>
-  
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_1_Request"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-  </mbean>
-  
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_2_Request"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-  </mbean>
-
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_3_Request"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-  </mbean>
-
-</server>

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jbm-queue-service.xml (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/jbm-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jbm-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jbm-queue-service.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_Input_Request"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+  </mbean>
+
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_Control_Request"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+  </mbean>
+  
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_1_Request"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+  </mbean>
+  
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_2_Request"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+  </mbean>
+
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_3_Request"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+  </mbean>
+
+</server>

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/jbmq-queue-service.xml	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jbmq-queue-service.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-    name="jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_Control_Request">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-    name="jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_3_Request">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-    name="jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_1_Request">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-    name="jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_2_Request">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-    name="jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_Input_Request">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-
-
-
-</server>

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jbmq-queue-service.xml (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jbmq-queue-service.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_Control_Request">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_3_Request">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_1_Request">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_2_Request">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=qsdynamicrouter_Input_Request">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+
+
+
+</server>

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/jboss-esb.xml	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jboss-esb.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,60 +0,0 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
-
-    <providers>
-        <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
-     
-            <jms-bus busid="dynamicrouterChannel1">
-                <jms-message-filter dest-type="QUEUE" dest-name="queue/B" />
-            </jms-bus>   
-
-            <jms-bus busid="dynamicrouterChannel2">
-                <jms-message-filter dest-type="QUEUE" dest-name="queue/C" />
-            </jms-bus>
-
-            <jms-bus busid="dynamicrouterInputChannel">
-                <jms-message-filter dest-type="QUEUE" dest-name="queue/qsdynamicrouter_Input_Request" />
-            </jms-bus>
-
-            <jms-bus busid="dynamicrouterControlChannel">
-                <jms-message-filter dest-type="QUEUE" dest-name="queue/qsdynamicrouter_Control_Request" />
-            </jms-bus>
-  
-          
-            <!-- Note that only queues that are listened to (input) require jms-provider 
-                 definitions. jms-provider definitions are not required for these queues as 
-                 the quickstart only notifies the queues (output): queue/qsdynamicrouter_3_Request, 
-                 queue/qsdynamicrouter_1_Request, queue/qsdynamicrouter_2_Request -->
-           
-          </jms-provider>
-      </providers>
-      
-      <services>
-     
-      <service category="incomingCategory1" name="incomingService" description="incoming service">
-            <listeners>
-                 <jms-listener name="incoming-Gateway" busidref="dynamicrouterInputChannel" maxThreads="1" is-gateway="true" />
-                 <jms-listener name="native1" busidref="dynamicrouterChannel1" maxThreads="1" /> 
-            </listeners>
-            <actions>             
-                <action name="action1" 
-                class="quickstart.dynamicRouter.MyDynamicRouterAction" 
-                process="processMessage"  />      
-            </actions>   
-        </service>
-        
-              <service category="incomingCategory2" name="controlService" description="control service">
-            <listeners>
-                 <jms-listener name="control-Gateway" busidref="dynamicrouterControlChannel" maxThreads="1" is-gateway="true" />
-                 <jms-listener name="native2" busidref="dynamicrouterChannel2" maxThreads="1" /> 
-            </listeners>
-            <actions>             
-                <action name="action2" 
-                class="quickstart.dynamicRouter.MyControlAction" 
-                process="processControlMessage"  />      
-            </actions>   
-        </service>
-     
-      </services>     
-     
-</jbossesb>

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jboss-esb.xml (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/jboss-esb.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jboss-esb.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jboss-esb.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,60 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
+
+    <providers>
+        <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
+     
+            <jms-bus busid="dynamicrouterChannel1">
+                <jms-message-filter dest-type="QUEUE" dest-name="queue/B" />
+            </jms-bus>   
+
+            <jms-bus busid="dynamicrouterChannel2">
+                <jms-message-filter dest-type="QUEUE" dest-name="queue/C" />
+            </jms-bus>
+
+            <jms-bus busid="dynamicrouterInputChannel">
+                <jms-message-filter dest-type="QUEUE" dest-name="queue/qsdynamicrouter_Input_Request" />
+            </jms-bus>
+
+            <jms-bus busid="dynamicrouterControlChannel">
+                <jms-message-filter dest-type="QUEUE" dest-name="queue/qsdynamicrouter_Control_Request" />
+            </jms-bus>
+  
+          
+            <!-- Note that only queues that are listened to (input) require jms-provider 
+                 definitions. jms-provider definitions are not required for these queues as 
+                 the quickstart only notifies the queues (output): queue/qsdynamicrouter_3_Request, 
+                 queue/qsdynamicrouter_1_Request, queue/qsdynamicrouter_2_Request -->
+           
+          </jms-provider>
+      </providers>
+      
+      <services>
+     
+      <service category="incomingCategory1" name="incomingService" description="incoming service">
+            <listeners>
+                 <jms-listener name="incoming-Gateway" busidref="dynamicrouterInputChannel" maxThreads="1" is-gateway="true" />
+                 <jms-listener name="native1" busidref="dynamicrouterChannel1" maxThreads="1" /> 
+            </listeners>
+            <actions>             
+                <action name="action1" 
+                class="quickstart.dynamicRouter.MyDynamicRouterAction" 
+                process="processMessage"  />      
+            </actions>   
+        </service>
+        
+              <service category="incomingCategory2" name="controlService" description="control service">
+            <listeners>
+                 <jms-listener name="control-Gateway" busidref="dynamicrouterControlChannel" maxThreads="1" is-gateway="true" />
+                 <jms-listener name="native2" busidref="dynamicrouterChannel2" maxThreads="1" /> 
+            </listeners>
+            <actions>             
+                <action name="action2" 
+                class="quickstart.dynamicRouter.MyControlAction" 
+                process="processControlMessage"  />      
+            </actions>   
+        </service>
+     
+      </services>     
+     
+</jbossesb>

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/jbossesb-properties.xml	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jbossesb-properties.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,84 +0,0 @@
-<?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/jbossesb"/>
-		<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"/> 
-    </properties>
-    <properties name="messagerouting">
-    	<property name="org.jboss.soa.esb.routing.cbrClass" value="org.jboss.internal.soa.esb.services.routing.cbr.JBossRulesRouter"/>
-    </properties>
-</esb>

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jbossesb-properties.xml (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/jbossesb-properties.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jbossesb-properties.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jbossesb-properties.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,84 @@
+<?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/jbossesb"/>
+		<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"/> 
+    </properties>
+    <properties name="messagerouting">
+    	<property name="org.jboss.soa.esb.routing.cbrClass" value="org.jboss.internal.soa.esb.services.routing.cbr.JBossRulesRouter"/>
+    </properties>
+</esb>

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jndi.properties
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/jndi.properties	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jndi.properties	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,5 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-java.naming.factory.url.pkgs=org.jnp.interfaces
-

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jndi.properties (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/jndi.properties)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jndi.properties	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/jndi.properties	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,5 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming
+java.naming.factory.url.pkgs=org.jnp.interfaces
+

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/juddi.properties
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/juddi.properties	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/juddi.properties	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,69 +0,0 @@
-# jUDDI Registry Properties (used by RegistryServer)
-# see http://www.juddi.org for more information
-
-# The UDDI Operator Name
-juddi.operatorName = jUDDI.org
-
-# The i18n locale default codes
-juddi.i18n.languageCode = en
-juddi.i18n.countryCode = US
-
-# The UDDI DiscoveryURL Prefix
-juddi.discoveryURL = http://localhost:8080/juddi/uddiget.jsp?
-
-# The UDDI Operator Contact Email Address
-juddi.operatorEmailAddress = admin at juddi.org
-
-# The maximum name size and maximum number
-# of name elements allows in several of the
-# FindXxxx and SaveXxxx UDDI functions.
-juddi.maxNameLength=255
-juddi.maxNameElementsAllowed=5
-
-# The maximum number of UDDI artifacts allowed
-# per publisher. A value of '-1' indicates any 
-# number of artifacts is valid (These values can be
-# overridden at the individual publisher level).
-juddi.maxBusinessesPerPublisher=25
-juddi.maxServicesPerBusiness=20
-juddi.maxBindingsPerService=10
-juddi.maxTModelsPerPublisher=100
-
-# jUDDI Authentication module to use
-juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
-
-# jUDDI DataStore module currently to use
-juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore
-
-# use a dataSource (if set to false a direct 
-# jdbc connection will be used.
-juddi.isUseDataSource=false
-juddi.jdbcDriver=com.mysql.jdbc.Driver
-juddi.jdbcUrl=jdbc:mysql://localhost:3306/juddi
-juddi.jdbcUsername=root
-juddi.jdbcPassword=admin
-# jUDDI DataSource to use
-# juddi.dataSource=java:comp/env/jdbc/MySqlDS
-
-# jUDDI UUIDGen implementation to use
-juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
-
-# jUDDI Cryptor implementation to use
-juddi.cryptor = org.apache.juddi.cryptor.DefaultCryptor
- 
-# jUDDI Validator to use
-juddi.validator=org.apache.juddi.validator.DefaultValidator
-
-# jUDDI Proxy Properties (used by RegistryProxy)
-juddi.proxy.adminURL = http://localhost:8080/juddi/admin
-juddi.proxy.inquiryURL = http://localhost:8080/juddi/inquiry
-juddi.proxy.publishURL = http://localhost:8080/juddi/publish
-juddi.proxy.transportClass = org.apache.juddi.proxy.AxisTransport
-juddi.proxy.securityProvider = com.sun.net.ssl.internal.ssl.Provider
-juddi.proxy.protocolHandler = com.sun.net.ssl.internal.www.protocol
-
-# JNDI settings (used by RMITransport)
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-  

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/juddi.properties (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/juddi.properties)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/juddi.properties	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/juddi.properties	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,69 @@
+# jUDDI Registry Properties (used by RegistryServer)
+# see http://www.juddi.org for more information
+
+# The UDDI Operator Name
+juddi.operatorName = jUDDI.org
+
+# The i18n locale default codes
+juddi.i18n.languageCode = en
+juddi.i18n.countryCode = US
+
+# The UDDI DiscoveryURL Prefix
+juddi.discoveryURL = http://localhost:8080/juddi/uddiget.jsp?
+
+# The UDDI Operator Contact Email Address
+juddi.operatorEmailAddress = admin at juddi.org
+
+# The maximum name size and maximum number
+# of name elements allows in several of the
+# FindXxxx and SaveXxxx UDDI functions.
+juddi.maxNameLength=255
+juddi.maxNameElementsAllowed=5
+
+# The maximum number of UDDI artifacts allowed
+# per publisher. A value of '-1' indicates any 
+# number of artifacts is valid (These values can be
+# overridden at the individual publisher level).
+juddi.maxBusinessesPerPublisher=25
+juddi.maxServicesPerBusiness=20
+juddi.maxBindingsPerService=10
+juddi.maxTModelsPerPublisher=100
+
+# jUDDI Authentication module to use
+juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
+
+# jUDDI DataStore module currently to use
+juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore
+
+# use a dataSource (if set to false a direct 
+# jdbc connection will be used.
+juddi.isUseDataSource=false
+juddi.jdbcDriver=com.mysql.jdbc.Driver
+juddi.jdbcUrl=jdbc:mysql://localhost:3306/juddi
+juddi.jdbcUsername=root
+juddi.jdbcPassword=admin
+# jUDDI DataSource to use
+# juddi.dataSource=java:comp/env/jdbc/MySqlDS
+
+# jUDDI UUIDGen implementation to use
+juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
+
+# jUDDI Cryptor implementation to use
+juddi.cryptor = org.apache.juddi.cryptor.DefaultCryptor
+ 
+# jUDDI Validator to use
+juddi.validator=org.apache.juddi.validator.DefaultValidator
+
+# jUDDI Proxy Properties (used by RegistryProxy)
+juddi.proxy.adminURL = http://localhost:8080/juddi/admin
+juddi.proxy.inquiryURL = http://localhost:8080/juddi/inquiry
+juddi.proxy.publishURL = http://localhost:8080/juddi/publish
+juddi.proxy.transportClass = org.apache.juddi.proxy.AxisTransport
+juddi.proxy.securityProvider = com.sun.net.ssl.internal.ssl.Provider
+juddi.proxy.protocolHandler = com.sun.net.ssl.internal.www.protocol
+
+# JNDI settings (used by RMITransport)
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming
+  

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/lib (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/lib)

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/log4j.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/log4j.xml	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/log4j.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id: log4j.xml,v 1.26.2.5 2005/09/15 09:31:02 dimitris Exp $ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
-   <!-- ============================== -->
-   <!-- Append messages to the console -->
-   <!-- ============================== -->
-
-   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Message\n -->
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%t][%c{1}] %m%n"/>
-      </layout>
-   </appender>
-
-   <!-- ================================= -->
-   <!-- Preserve messages in a local file -->
-   <!-- ================================= -->
-
-   <!-- A size based file rolling appender -->
-   <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="File" value="./listener.log"/>
-     <param name="Append" value="false"/>
-     <param name="MaxFileSize" value="500KB"/>
-     <param name="MaxBackupIndex" value="1"/>
-
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d %-5p [%t][%c] %m%n"/>
-     </layout>	    
-   </appender>
-
-   <!-- ================ -->
-   <!-- Limit categories -->
-   <!-- ================ -->
-
-   <category name="org.jboss">
-      <priority value="WARN"/>
-   </category>
-   <category name="org.jboss.soa.esb">
-      <priority value="ERROR"/>
-   </category>
-   <category name="org.jboss.internal.soa.esb">
-      <priority value="ERROR"/>
-   </category>
-   <category name="org.apache">
-      <priority value="ERROR"/>
-   </category>
-   <category name="quickstart">
-      <priority value="INFO"/>
-   </category>
-   <!-- ======================= -->
-   <!-- Setup the Root category -->
-   <!-- ======================= -->
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-      <appender-ref ref="FILE"/>
-   </root>
-
-</log4j:configuration>

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/log4j.xml (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/log4j.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/log4j.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/log4j.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml,v 1.26.2.5 2005/09/15 09:31:02 dimitris Exp $ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+   <!-- ============================== -->
+   <!-- Append messages to the console -->
+   <!-- ============================== -->
+
+   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Message\n -->
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%t][%c{1}] %m%n"/>
+      </layout>
+   </appender>
+
+   <!-- ================================= -->
+   <!-- Preserve messages in a local file -->
+   <!-- ================================= -->
+
+   <!-- A size based file rolling appender -->
+   <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="File" value="./listener.log"/>
+     <param name="Append" value="false"/>
+     <param name="MaxFileSize" value="500KB"/>
+     <param name="MaxBackupIndex" value="1"/>
+
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="%d %-5p [%t][%c] %m%n"/>
+     </layout>	    
+   </appender>
+
+   <!-- ================ -->
+   <!-- Limit categories -->
+   <!-- ================ -->
+
+   <category name="org.jboss">
+      <priority value="WARN"/>
+   </category>
+   <category name="org.jboss.soa.esb">
+      <priority value="ERROR"/>
+   </category>
+   <category name="org.jboss.internal.soa.esb">
+      <priority value="ERROR"/>
+   </category>
+   <category name="org.apache">
+      <priority value="ERROR"/>
+   </category>
+   <category name="quickstart">
+      <priority value="INFO"/>
+   </category>
+   <!-- ======================= -->
+   <!-- Setup the Root category -->
+   <!-- ======================= -->
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+      <appender-ref ref="FILE"/>
+   </root>
+
+</log4j:configuration>

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/readme.txt
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/readme.txt	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/readme.txt	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,116 +0,0 @@
-Overview:
-=========
-        The purpose of the dynamic router list quickstart sample is demonstrate
-        the recipient list EIP pattern (as defined here:
-        http://www.enterpriseintegrationpatterns.com/DynamicRouter.html
-
-Running this quickstart:
-========================
-        Please refer to 'ant help-quickstarts' for prerequisites about the 
-        quickstarts and a more detailed descripton of the different ways to 
-        run the quickstarts.
-
-To Run standalone mode:
-=======================
-    1.  In a command terminal window in the quickstart folder type 'ant deploy-jms-dests'.
-    2.  In a command terminal window in this folder ("Window1"), type 'ant run'.
-    3.  Open another command terminal window in this folder ("Window2"), type ant receive-destination1'
-    4.  Open another command terminal window in this folder ("Window3"), type ant receive-destination2'
-    5.  Open another command terminal window in this folder ("Window4"), type ant receive-destination3'
-    6.  Open another command terminal window in this folder ("Window5"), type 'ant runtest'. 
-        (Note the other ant targets listed below.)
-    7.  Switch back to "Window2", "Window3", "Window4" to see the output from the ESB.
-
-To Run '.esb' archive mode:
-===========================
-    1.  In a command terminal window in this folder ("Window1"), type 'ant undeploy-jms-dests'.
-    2.  In a command terminal window in this folder ("Window1"), type 'ant deploy'.
-    3.  Open another command terminal window in this folder (Window2"), type ant receive-destination1'
-    4.  Open another command terminal window in this folder ("Window3"), type ant receive-destination2'
-    5.  Open another command terminal window in this folder ("Window4"), type ant receive-destination3'
-    6.  Open another command terminal window in this folder ("Window5"), type 'ant runtest'.         
-    7.  Switch back to "Window2", "Window3", "Window4" to see the output from the ESB.
-  
-        You can modify the argument defined in build.xml to control which channels receive the 
-        messages. A value other than ":OK" will result in a destination instance not receiving 
-        messages through the router. Stopping and starting the destination app (for example: 
-        iant receive-destination1) nstance will cause the dynamic router rule base to be updated. 
-        
-        The contents of the Hashtable - this is persisted in a serialized object written to a file 
-        in the server's bin directory - that holds the dynamic router's rule base is displayed on
-        the server's stdout when it is changed. For example:
-        
-        [STDOUT] Writing Hashtable to disk
-        [STDOUT]     Hashtable entry: key = queue/qsdynamicrouter_1_Request, value = OK
-        [STDOUT]     Hashtable entry: key = queue/qsdynamicrouter_2_Request, value = not_OK
-        [STDOUT]     Hashtable entry: key = queue/qsdynamicrouter_3_Request, value = OK        
-
-        The quickstart makes use of the queues illustrated (the queues are shown 
-        in boxes) in the following diagram. You might review the build.xml file to 
-        see how it is setup. More details on the build.xml can be found later in 
-        this document.
-
-      application initiated
-               |
-               |
-               V
-  -------------------------------            --------------------------- 
-  |qsdynamicrouter_Input Request|            |qsdynamicrouter_1_Request| -------> destination1 -> |
-  -------------------------------            ---------------------------                          |
-               |                          /                                                       |
-               |                         |                                                        |
-               |                         |   ---------------------------                          |
-        Message Router  ---------------->|   |qsdynamicrouter_2_Request| ------>  destination2 -> |
-               ^                         |   ---------------------------                          | 
-               |                         |                                                        |
-               |                         \                                                        |
-      Dynamic Rules Base                  \ ---------------------------                           |
-               ^                             |qsdynamicrouter_2_Request| ------>  destination3 -> |
-               |                             ---------------------------                          |
-               |                                                                                  |
-               |                                                                                  |
-               |                             -------------------------------                      |
-               |---------------------------- |dynamicrouter_Control_Request| <--------------------|
-                                             ------------------------------- 
-
-Project File Descriptions
-=========================
- 
-        * jbossesb.xml - the JMS gateway and ESB configuration file.
-
-        * jbossesb-properties.xml - also needed by jUDDI and needs to
-          be at the head of the classpath.  Both juddi.properties and
-          jbossesb-properties.xml are used when the service first
-          boots up for self-registration based upon the
-          service-category and service-name found in the
-          esb-config.xml file.
-
-        * jndi.properties - needed primarily for
-          quickstart.test.SendJMSMessage that is fired by ant runtest.
-
-        * log4j.xml - needed to configure log4J used by both the
-          quickstart and the ESB itself.  A listener needs a place to
-          log.
-
-        * src\quickstart\staticrouter\test\SendJMSMessage.java -
-          shoots in the string passed in via the command line or in
-          this case the arg attribute in the ant runtest task.
-
-        * src\quickstart\staticrouter\test\ReceiveJMSMessage.java -
-          reads the output queues and displays the messages.
-
-        * build.xml - This quickstart implements the following tasks:
-
-                * runtest - send message thru gateway listener in
-                  MyJMSListener directly to destination queue
-
-                * the echoCP task is useful for making sure what you
-                  think is in your classpath is actually in your
-                  classpath Usage is: ant echoCP > myclasspath.txt
-                  This generates a file called myclasspath.txt which
-                  can be reviewed in a text editor
- 
-                * the classpath property pulls the
-                  jbossesb-properties.xml file and the
-                  juddi.properties file to the front of the list
-                  
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/readme.txt (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/readme.txt)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/readme.txt	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/readme.txt	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,116 @@
+Overview:
+=========
+        The purpose of the dynamic router list quickstart sample is demonstrate
+        the recipient list EIP pattern (as defined here:
+        http://www.enterpriseintegrationpatterns.com/DynamicRouter.html
+
+Running this quickstart:
+========================
+        Please refer to 'ant help-quickstarts' for prerequisites about the 
+        quickstarts and a more detailed descripton of the different ways to 
+        run the quickstarts.
+
+To Run standalone mode:
+=======================
+    1.  In a command terminal window in the quickstart folder type 'ant deploy-jms-dests'.
+    2.  In a command terminal window in this folder ("Window1"), type 'ant run'.
+    3.  Open another command terminal window in this folder ("Window2"), type ant receive-destination1'
+    4.  Open another command terminal window in this folder ("Window3"), type ant receive-destination2'
+    5.  Open another command terminal window in this folder ("Window4"), type ant receive-destination3'
+    6.  Open another command terminal window in this folder ("Window5"), type 'ant runtest'. 
+        (Note the other ant targets listed below.)
+    7.  Switch back to "Window2", "Window3", "Window4" to see the output from the ESB.
+
+To Run '.esb' archive mode:
+===========================
+    1.  In a command terminal window in this folder ("Window1"), type 'ant undeploy-jms-dests'.
+    2.  In a command terminal window in this folder ("Window1"), type 'ant deploy'.
+    3.  Open another command terminal window in this folder (Window2"), type ant receive-destination1'
+    4.  Open another command terminal window in this folder ("Window3"), type ant receive-destination2'
+    5.  Open another command terminal window in this folder ("Window4"), type ant receive-destination3'
+    6.  Open another command terminal window in this folder ("Window5"), type 'ant runtest'.         
+    7.  Switch back to "Window2", "Window3", "Window4" to see the output from the ESB.
+  
+        You can modify the argument defined in build.xml to control which channels receive the 
+        messages. A value other than ":OK" will result in a destination instance not receiving 
+        messages through the router. Stopping and starting the destination app (for example: 
+        iant receive-destination1) nstance will cause the dynamic router rule base to be updated. 
+        
+        The contents of the Hashtable - this is persisted in a serialized object written to a file 
+        in the server's bin directory - that holds the dynamic router's rule base is displayed on
+        the server's stdout when it is changed. For example:
+        
+        [STDOUT] Writing Hashtable to disk
+        [STDOUT]     Hashtable entry: key = queue/qsdynamicrouter_1_Request, value = OK
+        [STDOUT]     Hashtable entry: key = queue/qsdynamicrouter_2_Request, value = not_OK
+        [STDOUT]     Hashtable entry: key = queue/qsdynamicrouter_3_Request, value = OK        
+
+        The quickstart makes use of the queues illustrated (the queues are shown 
+        in boxes) in the following diagram. You might review the build.xml file to 
+        see how it is setup. More details on the build.xml can be found later in 
+        this document.
+
+      application initiated
+               |
+               |
+               V
+  -------------------------------            --------------------------- 
+  |qsdynamicrouter_Input Request|            |qsdynamicrouter_1_Request| -------> destination1 -> |
+  -------------------------------            ---------------------------                          |
+               |                          /                                                       |
+               |                         |                                                        |
+               |                         |   ---------------------------                          |
+        Message Router  ---------------->|   |qsdynamicrouter_2_Request| ------>  destination2 -> |
+               ^                         |   ---------------------------                          | 
+               |                         |                                                        |
+               |                         \                                                        |
+      Dynamic Rules Base                  \ ---------------------------                           |
+               ^                             |qsdynamicrouter_2_Request| ------>  destination3 -> |
+               |                             ---------------------------                          |
+               |                                                                                  |
+               |                                                                                  |
+               |                             -------------------------------                      |
+               |---------------------------- |dynamicrouter_Control_Request| <--------------------|
+                                             ------------------------------- 
+
+Project File Descriptions
+=========================
+ 
+        * jbossesb.xml - the JMS gateway and ESB configuration file.
+
+        * jbossesb-properties.xml - also needed by jUDDI and needs to
+          be at the head of the classpath.  Both juddi.properties and
+          jbossesb-properties.xml are used when the service first
+          boots up for self-registration based upon the
+          service-category and service-name found in the
+          esb-config.xml file.
+
+        * jndi.properties - needed primarily for
+          quickstart.test.SendJMSMessage that is fired by ant runtest.
+
+        * log4j.xml - needed to configure log4J used by both the
+          quickstart and the ESB itself.  A listener needs a place to
+          log.
+
+        * src\quickstart\staticrouter\test\SendJMSMessage.java -
+          shoots in the string passed in via the command line or in
+          this case the arg attribute in the ant runtest task.
+
+        * src\quickstart\staticrouter\test\ReceiveJMSMessage.java -
+          reads the output queues and displays the messages.
+
+        * build.xml - This quickstart implements the following tasks:
+
+                * runtest - send message thru gateway listener in
+                  MyJMSListener directly to destination queue
+
+                * the echoCP task is useful for making sure what you
+                  think is in your classpath is actually in your
+                  classpath Usage is: ant echoCP > myclasspath.txt
+                  This generates a file called myclasspath.txt which
+                  can be reviewed in a text editor
+ 
+                * the classpath property pulls the
+                  jbossesb-properties.xml file and the
+                  juddi.properties file to the front of the list
+                  
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src)

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart)

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter)

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction.java	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,101 +0,0 @@
-/*
- * 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.
- */
-package quickstart.dynamicRouter;
-
-import org.jboss.soa.esb.actions.AbstractActionLifecycle;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Message;
-
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueReceiver;
-import javax.jms.QueueSession;
-import javax.jms.ObjectMessage;
-import javax.jms.TextMessage;
-import javax.naming.InitialContext;
-import javax.jms.JMSException;
-import javax.jms.TextMessage;
-import javax.jms.QueueSender;
-import javax.naming.NamingException;
-
-import java.util.Enumeration;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.FileOutputStream;
-import java.io.FileInputStream;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
-import quickstart.dynamicRouter.test.*;
-import java.util.Hashtable;
-
-public class MyJMSListenerAction extends AbstractActionLifecycle
-{
-    
-  protected ConfigTree	_config;
-  public MyJMSListenerAction(ConfigTree config) { _config = config; } 
-  public Message processMessage(Message message) throws Exception{
-	  
-	  Hashtable theHashtable = QsHashtable.readHash();
-		try {
-			TextMessage tm = null; 
-			
-			for (Enumeration e = theHashtable.keys(); e.hasMoreElements();) {
-				String theKey = (String) e.nextElement();
-				String theValue = (String) theHashtable.get(theKey);
-				
-				// If the queue is "OK" - send the incoming message to that queue 
-				if (theValue.equals("OK")) {
-					
-					// Set up the connection
-					QueueConnection conn1 = null;
-					Queue que;
-					QueueSession session;
-					InitialContext iniCtx = new InitialContext();
-					Object tmp = iniCtx.lookup("ConnectionFactory");
-					QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
-					conn1 = qcf.createQueueConnection();
-					que = (Queue) iniCtx.lookup(theKey);
-					session = conn1.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-					conn1.start();
-
-                    // Send the message                						
-					QueueSender send = session.createSender(que);
-					tm = session.createTextMessage(new String(message.getBody().getByteArray()));
-					send.send(tm);
-										
-					// Close the connection
-					send.close();
-					conn1.stop();
-					session.close();
-					conn1.close();
-				}
-			}
-		} 
-		catch (Throwable t) {
-			t.printStackTrace();
-		} /* try and catch */
-
-	  return message; 
-        		
-	} /* method */
-	
-} /* class */
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction.java (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,101 @@
+/*
+ * 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.
+ */
+package quickstart.dynamicRouter;
+
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueReceiver;
+import javax.jms.QueueSession;
+import javax.jms.ObjectMessage;
+import javax.jms.TextMessage;
+import javax.naming.InitialContext;
+import javax.jms.JMSException;
+import javax.jms.TextMessage;
+import javax.jms.QueueSender;
+import javax.naming.NamingException;
+
+import java.util.Enumeration;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.FileOutputStream;
+import java.io.FileInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectInputStream;
+import quickstart.dynamicRouter.test.*;
+import java.util.Hashtable;
+
+public class MyJMSListenerAction extends AbstractActionLifecycle
+{
+    
+  protected ConfigTree	_config;
+  public MyJMSListenerAction(ConfigTree config) { _config = config; } 
+  public Message processMessage(Message message) throws Exception{
+	  
+	  Hashtable theHashtable = QsHashtable.readHash();
+		try {
+			TextMessage tm = null; 
+			
+			for (Enumeration e = theHashtable.keys(); e.hasMoreElements();) {
+				String theKey = (String) e.nextElement();
+				String theValue = (String) theHashtable.get(theKey);
+				
+				// If the queue is "OK" - send the incoming message to that queue 
+				if (theValue.equals("OK")) {
+					
+					// Set up the connection
+					QueueConnection conn1 = null;
+					Queue que;
+					QueueSession session;
+					InitialContext iniCtx = new InitialContext();
+					Object tmp = iniCtx.lookup("ConnectionFactory");
+					QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
+					conn1 = qcf.createQueueConnection();
+					que = (Queue) iniCtx.lookup(theKey);
+					session = conn1.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+					conn1.start();
+
+                    // Send the message                						
+					QueueSender send = session.createSender(que);
+					tm = session.createTextMessage(new String(message.getBody().getByteArray()));
+					send.send(tm);
+										
+					// Close the connection
+					send.close();
+					conn1.stop();
+					session.close();
+					conn1.close();
+				}
+			}
+		} 
+		catch (Throwable t) {
+			t.printStackTrace();
+		} /* try and catch */
+
+	  return message; 
+        		
+	} /* method */
+	
+} /* class */
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction2.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction2.java	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction2.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,84 +0,0 @@
-/*
- * 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.
- */
-package quickstart.dynamicRouter;
-
-import org.jboss.soa.esb.actions.AbstractActionLifecycle;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Message;
-
-import quickstart.dynamicRouter.test.*;
-import java.util.Hashtable;
-
-import java.util.Enumeration;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.FileOutputStream;
-import java.io.FileInputStream;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
-
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueReceiver;
-import javax.jms.QueueSession;
-import javax.jms.ObjectMessage;
-import javax.jms.TextMessage;
-import javax.naming.InitialContext;
-import javax.jms.JMSException;
-import javax.jms.TextMessage;
-import javax.jms.QueueSender;
-import javax.naming.NamingException;
-
-public class MyJMSListenerAction2 extends AbstractActionLifecycle {
-	protected ConfigTree _config;
-
-	public MyJMSListenerAction2(ConfigTree config) {
-		_config = config;
-	}
-
-	public Message processControlMessage(Message message) throws Exception {
-
-		Hashtable theHashtable = QsHashtable.readHash();
-		String tm = new String(message.getBody().getByteArray());
-
-		try {
-			// The message contains the queue name and status separated by ":"
-			// for example - queue/queueName:OK - any queue associated with
-			// a value of "OK" is added to the dynamic router data store
-			String[] theStrings = tm.split(":");
-
-			// Make the data store dynamic - to reflect changes in queue status
-			if (theHashtable.containsKey(theStrings[0])) {
-				theHashtable.remove(theStrings[0]);
-			}
-
-			theHashtable.put(theStrings[0], theStrings[1]);
-
-		} catch (Throwable t) {
-			t.printStackTrace();
-		}
-		QsHashtable.writeHash(theHashtable);
-		return message;
-
-	} /* method */
-
-} /* class */

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction2.java (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction2.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction2.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction2.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ */
+package quickstart.dynamicRouter;
+
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+
+import quickstart.dynamicRouter.test.*;
+import java.util.Hashtable;
+
+import java.util.Enumeration;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.FileOutputStream;
+import java.io.FileInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectInputStream;
+
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueReceiver;
+import javax.jms.QueueSession;
+import javax.jms.ObjectMessage;
+import javax.jms.TextMessage;
+import javax.naming.InitialContext;
+import javax.jms.JMSException;
+import javax.jms.TextMessage;
+import javax.jms.QueueSender;
+import javax.naming.NamingException;
+
+public class MyJMSListenerAction2 extends AbstractActionLifecycle {
+	protected ConfigTree _config;
+
+	public MyJMSListenerAction2(ConfigTree config) {
+		_config = config;
+	}
+
+	public Message processControlMessage(Message message) throws Exception {
+
+		Hashtable theHashtable = QsHashtable.readHash();
+		String tm = new String(message.getBody().getByteArray());
+
+		try {
+			// The message contains the queue name and status separated by ":"
+			// for example - queue/queueName:OK - any queue associated with
+			// a value of "OK" is added to the dynamic router data store
+			String[] theStrings = tm.split(":");
+
+			// Make the data store dynamic - to reflect changes in queue status
+			if (theHashtable.containsKey(theStrings[0])) {
+				theHashtable.remove(theStrings[0]);
+			}
+
+			theHashtable.put(theStrings[0], theStrings[1]);
+
+		} catch (Throwable t) {
+			t.printStackTrace();
+		}
+		QsHashtable.writeHash(theHashtable);
+		return message;
+
+	} /* method */
+
+} /* class */

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test)

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/QsHashtable.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/QsHashtable.java	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/QsHashtable.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,83 +0,0 @@
-/*
- * 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.
- */
- 
- package quickstart.dynamicRouter.test;
-
-import java.util.Hashtable;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.FileOutputStream;
-import java.io.FileInputStream;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
-import java.util.Enumeration;
-
-public class QsHashtable {
-
-	public static void writeHash(Hashtable theHashtable) {
-		try {
-			FileOutputStream fileOut = new FileOutputStream("hashtable.ser");
-			ObjectOutputStream out = new ObjectOutputStream(fileOut);
-			out.writeObject(theHashtable);
-			
-			System.out.println("Writing Hashtable to disk");
-			for (Enumeration e = theHashtable.keys(); e.hasMoreElements();) {
-				String theKey = (String) e.nextElement();
-				String theValue = (String) theHashtable.get(theKey);
-				System.out.println("\tHashtable entry: key = " + theKey + ", value = " + theValue);
-            }
-			out.close();
-			fileOut.close();
-		} 
-		catch (FileNotFoundException E) {
-			E.printStackTrace();
-		} 
-		catch (IOException E) {
-			E.printStackTrace();
-		}
-
-	} /* method */
-
-	public static Hashtable readHash() {
-		Hashtable theHashtable = new Hashtable();
-
-		try {
-			FileInputStream fileIn = new FileInputStream("hashtable.ser");
-			ObjectInputStream in = new ObjectInputStream(fileIn);
-			theHashtable = (Hashtable) in.readObject();
-			in.close();
-			fileIn.close();
-		} 
-		catch (ClassNotFoundException E) {
-			E.printStackTrace();
-		} 
-		catch (FileNotFoundException E) {
-			// If the file is not there - it's not a problem as we'll create it
-		} 
-		catch (IOException E) {
-			E.printStackTrace();
-		}
-
-		return theHashtable;
-
-	} /* method */
-
-} /* class */
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/QsHashtable.java (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/QsHashtable.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/QsHashtable.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/QsHashtable.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,83 @@
+/*
+ * 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.
+ */
+ 
+ package quickstart.dynamicRouter.test;
+
+import java.util.Hashtable;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.FileOutputStream;
+import java.io.FileInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectInputStream;
+import java.util.Enumeration;
+
+public class QsHashtable {
+
+	public static void writeHash(Hashtable theHashtable) {
+		try {
+			FileOutputStream fileOut = new FileOutputStream("hashtable.ser");
+			ObjectOutputStream out = new ObjectOutputStream(fileOut);
+			out.writeObject(theHashtable);
+			
+			System.out.println("Writing Hashtable to disk");
+			for (Enumeration e = theHashtable.keys(); e.hasMoreElements();) {
+				String theKey = (String) e.nextElement();
+				String theValue = (String) theHashtable.get(theKey);
+				System.out.println("\tHashtable entry: key = " + theKey + ", value = " + theValue);
+            }
+			out.close();
+			fileOut.close();
+		} 
+		catch (FileNotFoundException E) {
+			E.printStackTrace();
+		} 
+		catch (IOException E) {
+			E.printStackTrace();
+		}
+
+	} /* method */
+
+	public static Hashtable readHash() {
+		Hashtable theHashtable = new Hashtable();
+
+		try {
+			FileInputStream fileIn = new FileInputStream("hashtable.ser");
+			ObjectInputStream in = new ObjectInputStream(fileIn);
+			theHashtable = (Hashtable) in.readObject();
+			in.close();
+			fileIn.close();
+		} 
+		catch (ClassNotFoundException E) {
+			E.printStackTrace();
+		} 
+		catch (FileNotFoundException E) {
+			// If the file is not there - it's not a problem as we'll create it
+		} 
+		catch (IOException E) {
+			E.printStackTrace();
+		}
+
+		return theHashtable;
+
+	} /* method */
+
+} /* class */
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/ReceiveJMSMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/ReceiveJMSMessage.java	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/ReceiveJMSMessage.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,137 +0,0 @@
-/*
- * 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.
- */
-package quickstart.dynamicRouter.test;
-
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueReceiver;
-import javax.jms.QueueSession;
-import javax.jms.ObjectMessage;
-import javax.jms.TextMessage;
-import javax.naming.InitialContext;
-
-import javax.jms.MessageListener;
-import javax.jms.Message;
-
-import javax.jms.JMSException;
-import javax.jms.TextMessage;
-import javax.jms.QueueSender;
-import javax.naming.NamingException;
-
-public class ReceiveJMSMessage {
-	QueueConnection conn = null;
-	QueueSession receiverSession = null;
-	Queue receiverQueue = null;
-	QueueReceiver queueReceiver = null;
-	InitialContext iniCtx = null;
-	QueueConnectionFactory qcf = null;
-	String receiveQueueName = "queue/D"; // Default to queue/D
-
-	QueueConnection conn1 = null;
-	Queue que;
-	QueueSession session;
-		
-	// Ref:
-	// http://docs.jboss.org/jbossas/jboss4guide/r5/html/ch6.chapt.html#d0e12917
-	public static class ExListener implements MessageListener {
-		public void onMessage(Message msg) {
-			TextMessage tm = (TextMessage) msg;
-			try {
-				System.out.println("onMessage, control channel recv text=" + tm.getText());
-			} catch (Throwable t) {
-				t.printStackTrace();
-			}
-		} /* method */
-	} /* class */
-
-	public ReceiveJMSMessage() {
-	} /* method */
-
-	public void receiveOne() {
-		try {
-			if (iniCtx == null)
-				iniCtx = new InitialContext();
-			if (qcf == null)
-				qcf = (QueueConnectionFactory) iniCtx
-						.lookup("ConnectionFactory");
-			if (conn == null) {
-				conn = qcf.createQueueConnection();
-				conn.start();
-			}
-
-			receiverQueue = (Queue) iniCtx.lookup(receiveQueueName);
-			receiverSession = conn.createQueueSession(false,
-					QueueSession.AUTO_ACKNOWLEDGE);
-			queueReceiver = receiverSession.createReceiver(receiverQueue);
-			TextMessage msg = (TextMessage) queueReceiver.receive(2000);
-
-			// Ref:
-			// http://docs.jboss.org/jbossas/jboss4guide/r5/html/ch6.chapt.html#d0e12917
-			queueReceiver.setMessageListener(new ExListener());
-
-		} catch (Exception e) {
-			System.out.println(e);
-		}
-	} /* method */
-
-	public void setupConnection() throws JMSException, NamingException {
-		InitialContext iniCtx = new InitialContext();
-		Object tmp = iniCtx.lookup("ConnectionFactory");
-		QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
-		conn1 = qcf.createQueueConnection();
-		que = (Queue) iniCtx.lookup("queue/qsdynamicrouter_Control_Request");
-		session = conn1.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-		conn1.start();
-		System.out.println("Connection Started to register with control channel");
-	} /* method */
-
-	public void stop() throws JMSException {
-		conn1.stop();
-		session.close();
-		conn1.close();
-	} /* method */
-
-	public void sendAMessage(String msg) throws JMSException {
-		QueueSender send = session.createSender(que);
-		TextMessage tm = session.createTextMessage(msg);
-		send.send(tm);
-		send.close();
-	} /* method */
-
-	public static void main(String[] args) throws Exception {
-		ReceiveJMSMessage receiver = new ReceiveJMSMessage();
-		
-		// Send the message to the control channel
-		receiver.setupConnection();
-		receiver.sendAMessage(args[0] + args[1]);
-		receiver.stop();
-
-		if (args[0] != null) {
-			receiver.receiveQueueName = args[0];
-			System.out.println("Receiving on: " + receiver.receiveQueueName);
-		}
-		while (true) { // loop until I'm killed
-			receiver.receiveOne();
-		}
-	} /* method */
-
-} /* class */

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/ReceiveJMSMessage.java (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/ReceiveJMSMessage.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/ReceiveJMSMessage.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/ReceiveJMSMessage.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,137 @@
+/*
+ * 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.
+ */
+package quickstart.dynamicRouter.test;
+
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueReceiver;
+import javax.jms.QueueSession;
+import javax.jms.ObjectMessage;
+import javax.jms.TextMessage;
+import javax.naming.InitialContext;
+
+import javax.jms.MessageListener;
+import javax.jms.Message;
+
+import javax.jms.JMSException;
+import javax.jms.TextMessage;
+import javax.jms.QueueSender;
+import javax.naming.NamingException;
+
+public class ReceiveJMSMessage {
+	QueueConnection conn = null;
+	QueueSession receiverSession = null;
+	Queue receiverQueue = null;
+	QueueReceiver queueReceiver = null;
+	InitialContext iniCtx = null;
+	QueueConnectionFactory qcf = null;
+	String receiveQueueName = "queue/D"; // Default to queue/D
+
+	QueueConnection conn1 = null;
+	Queue que;
+	QueueSession session;
+		
+	// Ref:
+	// http://docs.jboss.org/jbossas/jboss4guide/r5/html/ch6.chapt.html#d0e12917
+	public static class ExListener implements MessageListener {
+		public void onMessage(Message msg) {
+			TextMessage tm = (TextMessage) msg;
+			try {
+				System.out.println("onMessage, control channel recv text=" + tm.getText());
+			} catch (Throwable t) {
+				t.printStackTrace();
+			}
+		} /* method */
+	} /* class */
+
+	public ReceiveJMSMessage() {
+	} /* method */
+
+	public void receiveOne() {
+		try {
+			if (iniCtx == null)
+				iniCtx = new InitialContext();
+			if (qcf == null)
+				qcf = (QueueConnectionFactory) iniCtx
+						.lookup("ConnectionFactory");
+			if (conn == null) {
+				conn = qcf.createQueueConnection();
+				conn.start();
+			}
+
+			receiverQueue = (Queue) iniCtx.lookup(receiveQueueName);
+			receiverSession = conn.createQueueSession(false,
+					QueueSession.AUTO_ACKNOWLEDGE);
+			queueReceiver = receiverSession.createReceiver(receiverQueue);
+			TextMessage msg = (TextMessage) queueReceiver.receive(2000);
+
+			// Ref:
+			// http://docs.jboss.org/jbossas/jboss4guide/r5/html/ch6.chapt.html#d0e12917
+			queueReceiver.setMessageListener(new ExListener());
+
+		} catch (Exception e) {
+			System.out.println(e);
+		}
+	} /* method */
+
+	public void setupConnection() throws JMSException, NamingException {
+		InitialContext iniCtx = new InitialContext();
+		Object tmp = iniCtx.lookup("ConnectionFactory");
+		QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
+		conn1 = qcf.createQueueConnection();
+		que = (Queue) iniCtx.lookup("queue/qsdynamicrouter_Control_Request");
+		session = conn1.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+		conn1.start();
+		System.out.println("Connection Started to register with control channel");
+	} /* method */
+
+	public void stop() throws JMSException {
+		conn1.stop();
+		session.close();
+		conn1.close();
+	} /* method */
+
+	public void sendAMessage(String msg) throws JMSException {
+		QueueSender send = session.createSender(que);
+		TextMessage tm = session.createTextMessage(msg);
+		send.send(tm);
+		send.close();
+	} /* method */
+
+	public static void main(String[] args) throws Exception {
+		ReceiveJMSMessage receiver = new ReceiveJMSMessage();
+		
+		// Send the message to the control channel
+		receiver.setupConnection();
+		receiver.sendAMessage(args[0] + args[1]);
+		receiver.stop();
+
+		if (args[0] != null) {
+			receiver.receiveQueueName = args[0];
+			System.out.println("Receiving on: " + receiver.receiveQueueName);
+		}
+		while (true) { // loop until I'm killed
+			receiver.receiveOne();
+		}
+	} /* method */
+
+} /* class */

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/SendJMSMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/SendJMSMessage.java	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/SendJMSMessage.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,69 +0,0 @@
-/*
- * 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.
- */
-package quickstart.dynamicRouter.test;
-
-import javax.jms.JMSException;
-import javax.jms.TextMessage;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-public class SendJMSMessage {
-	QueueConnection conn;
-	QueueSession session;
-	Queue que;
-
-	public void setupConnection() throws JMSException, NamingException {
-		InitialContext iniCtx = new InitialContext();
-		Object tmp = iniCtx.lookup("ConnectionFactory");
-		QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
-		conn = qcf.createQueueConnection();
-		que = (Queue) iniCtx.lookup("queue/qsdynamicrouter_Input_Request");
-		session = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-		conn.start();
-		System.out.println("Connection Started");
-	} /* method */
-
-	public void stop() throws JMSException {
-		conn.stop();
-		session.close();
-		conn.close();
-	} /* method */
-
-	public void sendAMessage(String msg) throws JMSException {
-		QueueSender send = session.createSender(que);
-		TextMessage tm = session.createTextMessage(msg);
-		send.send(tm);
-		send.close();
-	} /* method */
-
-	public static void main(String args[]) throws Exception {
-		SendJMSMessage sm = new SendJMSMessage();
-		sm.setupConnection();
-		sm.sendAMessage(args[0]);
-		sm.stop();
-	} /* method */
-
-} /* class */

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/SendJMSMessage.java (from rev 13441, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/SendJMSMessage.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/SendJMSMessage.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/test/SendJMSMessage.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,69 @@
+/*
+ * 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.
+ */
+package quickstart.dynamicRouter.test;
+
+import javax.jms.JMSException;
+import javax.jms.TextMessage;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+public class SendJMSMessage {
+	QueueConnection conn;
+	QueueSession session;
+	Queue que;
+
+	public void setupConnection() throws JMSException, NamingException {
+		InitialContext iniCtx = new InitialContext();
+		Object tmp = iniCtx.lookup("ConnectionFactory");
+		QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
+		conn = qcf.createQueueConnection();
+		que = (Queue) iniCtx.lookup("queue/qsdynamicrouter_Input_Request");
+		session = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+		conn.start();
+		System.out.println("Connection Started");
+	} /* method */
+
+	public void stop() throws JMSException {
+		conn.stop();
+		session.close();
+		conn.close();
+	} /* method */
+
+	public void sendAMessage(String msg) throws JMSException {
+		QueueSender send = session.createSender(que);
+		TextMessage tm = session.createTextMessage(msg);
+		send.send(tm);
+		send.close();
+	} /* method */
+
+	public static void main(String args[]) throws Exception {
+		SendJMSMessage sm = new SendJMSMessage();
+		sm.setupConnection();
+		sm.sendAMessage(args[0]);
+		sm.stop();
+	} /* method */
+
+} /* class */

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_bpel/README.TXT
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_bpel/README.TXT	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_bpel/README.TXT	2007-07-13 11:33:43 UTC (rev 13442)
@@ -25,35 +25,30 @@
     2.  Update the "org.jboss.esb.server.home" property in the quickstarts.properties
         file in "../conf".
     3.  Make sure you're running the ESB on JBoss AS v4.2.0GA.
-    4.  Make sure the following ESB components are deployed to your JBoss AS. These
-        components can be located in the "lib" folder of the distro (build/jbossesb/lib
-        if you are working from the SVN source).
+    4.  Run the ant script in the install directory of the distribution.  After running,
+        check that the following ESB components are deployed to your JBoss AS.
             a) jbossesb.esb
             b) jbossesb.sar
             c) soap.esb
             d) soapui-client.sar
             e) smooks.esb
-    5.  Delete the jbm-queue-service.xml file from jbossesb.esb and smooks.esb.
-    6.  Checkout, build and deploy JBossWS 2.0.x from http://anonsvn.jboss.org/repos/jbossws/branches/jbossws-2.0
-        To build and deploy JBossWS 2.0.0 follow the instructions on http://www.jboss.org/index.html?module=bb&op=viewtopic&t=109659.
+    5.  Download and install JBossWS 2.0.0GA (http://labs.jboss.com/jbossws) on your JBoss AS.
         NOTES:
-            a) You need to copy build/ant.properties.example to build/ant.properties and
-               modify for your local env.
-            b) You need to target your build for JBoss AS v4.2.0GA, so build and deploy using the
-               "deploy-jboss42" target.
-            c) Once deployed, go to jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml on your
-               App Server and add the following bean config.  Add it just before the
-               "WSEndpointHandlerDeployer" bean config:
-                 "<bean name="WSEndpointJAXBIntrosCustomizationsDeployer" 
-                 class="org.jboss.wsf.spi.deployment.JAXBIntrosCustomizationsDeployer" />"
-            d) Again in jboss-beans.xml, add an "inject" element for the above bean config in the
+            a) Once deployed, go to jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml on your
+               App Server and add the following bean configuration:
+                 "<bean name="WSEndpointJAXBIntrosCustomizationsDeployer"
+                     class="org.jboss.wsf.spi.deployment.JAXBIntrosCustomizationsDeployer" />"
+            b) Again in jboss-beans.xml, add a reference to the above bean config in the
                deployer list configured on the "WSMainDeployerManager" bean. E.g.:
                  "<inject bean="WSEndpointJAXBIntrosCustomizationsDeployer"/>"
-               Add this before the "inject" element for the "WSEndpointHandlerDeployer" bean. 
-            e) Copy "jbossesb/extras/jaxbintros/jboss-jaxb-intros.jar" to the root of the jbossws.sar
+               Add this before the "inject" element for the "WSEndpointHandlerDeployer" bean.
+            c) Copy "jbossesb/extras/jaxbintros/jboss-jaxb-intros.jar" to the root of the jbossws.sar
                service on your JBoss App Server.  Note that if you haven't already done this you'll
                need to stop and restart the the App Server.
-    7.  Start the JBoss App Server.
+            d) Again in jboss-beans.xml, modify the "WSWebMetaDataAdapter" bean class to be
+               "org.jboss.soa.esb.jbossws.ESBWebMetaDataAdapter".
+            e) Copy soap.esb/jbossesb-soap.jar to jbossws.sar.
+    6.  Start the JBoss App Server.
 
     Setting up ActiveBPEL:
     1.  Ensure that the value of the 'directory' attribute on the 'notificationChannel' (jboss-esb.xml)

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_bpel/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_bpel/jboss-esb.xml	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_bpel/jboss-esb.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -126,8 +126,7 @@
                      template and will then use OGNL to populate the values (from the Smooks 
                      EXTRACTED_BEANS_HASH) into the soap message. -->
                 <action name="soapui-client" class="org.jboss.soa.esb.actions.soap.SOAPClient">
-                    <!-- property name="wsdl" value="http://localhost:18080/active-bpel/services/RetailerCallback?wsdl"/ -->
-                    <property name="wsdl" value="https://localhost:18443/active-bpel/services/RetailerCallback?wsdl"/>
+                    <property name="wsdl" value="http://localhost:18080/active-bpel/services/RetailerCallback?wsdl"/>
                     <property name="operation" value="SendSalesOrderNotification"/>
                     <property name="paramsLocation" value="EXTRACTED_BEANS_HASH"/>
                     <property name="responseXStreamConfig">

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_jbossws_adapter_01/readme.txt
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_jbossws_adapter_01/readme.txt	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_jbossws_adapter_01/readme.txt	2007-07-13 11:33:43 UTC (rev 13442)
@@ -9,37 +9,33 @@
 1. Update the "org.jboss.esb.server.home" property in the quickstarts.properties
    file in "../conf".
 2. Make sure you're running the ESB on JBoss AS v4.2.0GA.
-3. Make sure the following ESB components are deployed to your JBoss AS. These
-   components can be located in the "lib" folder of the distro (build/jbossesb/lib
-   if you are working from the SVN source).
+3. Run the ant script in the install directory of the distribution.  After running,
+   check that the following ESB components are deployed to your JBoss AS.
         a) jbossesb.esb
         b) jbossesb.sar
         c) soap.esb
-4. Delete the jbm-queue-service.xml file from jbossesb.esb.
-5.  Checkout, build and deploy JBossWS 2.0.x from http://anonsvn.jboss.org/repos/jbossws/branches/jbossws-2.0
-    To build and deploy JBossWS 2.0.0 follow the instructions on http://www.jboss.org/index.html?module=bb&op=viewtopic&t=109659.
-    NOTES:
-        a) You need to copy build/ant.properties.example to build/ant.properties and
-           modify for your local env.
-        b) You need to target your build for JBoss AS v4.2.0GA, so build and deploy using the
-           "deploy-jboss42" target.
-        c) Once deployed, go to jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml on your
+4. Download and install JBossWS 2.0.0GA (http://labs.jboss.com/jbossws) on your JBoss AS.
+   NOTES:
+        a) Once deployed, go to jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml on your
            App Server and add the following bean configuration:
              "<bean name="WSEndpointJAXBIntrosCustomizationsDeployer" 
-             class="org.jboss.wsf.spi.deployment.JAXBIntrosCustomizationsDeployer" />"
-        d) Again in jboss-beans.xml, add a reference to the above bean config in the 
+                 class="org.jboss.wsf.spi.deployment.JAXBIntrosCustomizationsDeployer" />"
+        b) Again in jboss-beans.xml, add a reference to the above bean config in the 
            deployer list configured on the "WSMainDeployerManager" bean. E.g.:
              "<inject bean="WSEndpointJAXBIntrosCustomizationsDeployer"/>"
-6.  Run the ant script in product/extras/jaxbintros and copy the build output jar
-    (product/extras/jaxbintros/target/jboss-jaxb-intros.jar) to the root of the jbossws.sar
-    service on your AS.
-7. Start the JBoss App Server.
+           Add this before the "inject" element for the "WSEndpointHandlerDeployer" bean. 
+        c) Copy "jbossesb/extras/jaxbintros/jboss-jaxb-intros.jar" to the root of the jbossws.sar
+           service on your JBoss App Server.  Note that if you haven't already done this you'll
+           need to stop and restart the the App Server.
+        d) Again in jboss-beans.xml, modify the "WSWebMetaDataAdapter" bean class to be
+           "org.jboss.soa.esb.jbossws.ESBWebMetaDataAdapter".
+        e) Copy soap.esb/jbossesb-soap.jar to jbossws.sar.
+5. Start the JBoss App Server.
 
 
 To Run:
 =======
 1. In the first command window, execute "ant clean deploy".  This will compile the project, build
-   the needed jars and deploy the ESB archive component to the Application Server.  If you are
-   monitoring the Application Server console you will see it hot deploy the WAR.
+   the needed jars and deploy the ESB archive component to the Application Server.
 
 2. Run "ant runtest".  You will see the message being processed on the App Server Java console window. 

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_war1/readme.txt
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_war1/readme.txt	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_war1/readme.txt	2007-07-13 11:33:43 UTC (rev 13442)
@@ -26,8 +26,8 @@
 
 You should see something like the following:
 ------------------------------------------------------------------------------------------
-|   jboss.ws:di=quickstartWAR1.war,port=HelloWorldPort,service=HelloWorldWSService       |
-|   http://yourMachineName:8080/quickstartWAR1/HelloWorldWS?wsdl                         |
+|   jboss.ws:context=Quickstart_webservice_war1,endpoint=HelloWorldWS                    |
+|   http://127.0.0.1:8080/Quickstart_webservice_war1/HelloWorldWS?wsdl                   |
 ------------------------------------------------------------------------------------------
 
 3. Use for favorite Web Service testing tool to invoke the Web Service. A great one

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_war1/src/org/jboss/soa/esb/samples/quickstart/webservicewar1/test/SendJMSMessage.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_war1/src/org/jboss/soa/esb/samples/quickstart/webservicewar1/test/SendJMSMessage.java	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_war1/src/org/jboss/soa/esb/samples/quickstart/webservicewar1/test/SendJMSMessage.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -42,7 +42,7 @@
     	Object tmp = iniCtx.lookup("ConnectionFactory");
     	QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
     	conn = qcf.createQueueConnection();
-    	que = (Queue) iniCtx.lookup("queue/quickstart_helloworld_action_Request");
+    	que = (Queue) iniCtx.lookup("queue/quickstart_webservice_war1_esb");
     	session = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
     	conn.start();
     	System.out.println("Connection Started");

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbAction2.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbAction2.java	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbAction2.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,261 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY 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 along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.soa.esb.services.jbpm.actionhandlers;
-
-import java.net.URI;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.log4j.Logger;
-import org.dom4j.Element;
-import org.dom4j.tree.DefaultElement;
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.addressing.Call;
-import org.jboss.soa.esb.listeners.message.Invoker;
-import org.jboss.soa.esb.message.Body;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.services.jbpm.Constants;
-import org.jboss.soa.esb.services.jbpm.util.Helper;
-import org.jbpm.context.exe.ContextInstance;
-import org.jbpm.graph.def.ActionHandler;
-import org.jbpm.graph.def.Node;
-import org.jbpm.graph.def.ProcessDefinition;
-import org.jbpm.graph.exe.ExecutionContext;
-import org.jbpm.graph.exe.ProcessInstance;
-import org.jbpm.graph.exe.Token;
-
-/**
- * 
- * Send messages to ESB services from jBPM applications, and optionally wait for response.
- * <li/>esbCategoryName - for ESB registry lookup
- * <li/>esbServiceName &nbsp; - for ESB registry lookup
- * <li>millisToWaitForResponse - if a value > 0 is supplied, a response will be expected from the ESB service
- * and maximum wait time will be set accordingly.  If response is not received, a CourierTimeoutException will
- * be thrown
- * </li>
- * 
- * @author <a href="mailto:schifest at heuristica.com.ar">Esteban</a> 
- *
- */
-
-public class EsbAction2 implements ActionHandler 
-{
-	public static final String OUTGOING_VARS_TAG 	= "jbpmToEsbVars";
-	public static final String RETURN_VARS_TAG		= "returnVars";
-	public static final String MAPPING_TAG			= "mapping";
-	public static final String JBPM_NAME_ATTR		= "jbpm-name";
-	public static final String ESB_NAME_ATTR		= "esb-name";
-	public static final String PROCESS_SCOPE_ATTR	= "process-scope";
-	
-	private static final long serialVersionUID = 1L;
-	
-	public String 			esbCategoryName;
-	public String 			esbServiceName;
-	public Integer			millisToWaitForResponse;
-	public Boolean			globalProcessScope;
-	public DefaultElement	jbpmToEsbVars;
-	public DefaultElement	returnVars;
-	
-	protected Logger	_logger = Logger.getLogger(getClass());
-	
-	protected Map<String, String>_outVarMapping;
-	protected Map<String, String>_retVarMapping;
-	protected transient	Token	_token;
-	
-	public void execute(ExecutionContext executionContext) throws Exception 
-	{
-		_token			= executionContext.getToken();
-		
-		Message request = getMessageTemplate();
-		varsToRequest(request);
-		if (null==millisToWaitForResponse || millisToWaitForResponse < 1)
-		{
-			Invoker.invoke(request,esbCategoryName, esbServiceName);
-			return;
-		}
-		
-		Message response = null;
-		if ("MOCK_CATEGORY".equals(esbCategoryName)
-			&& "MOCK_SERVICE".equals(esbServiceName))
-			response = request;
-		else
-			Invoker.invokeAndAwaitResponse (request,esbCategoryName, esbServiceName, millisToWaitForResponse);
-		if (null!=response)
-			varsFromResponse(response);
-	} //________________________________
-
-	protected void varsToRequest(Message request) 
-		throws Exception 
-	{
-		ContextInstance ctxInstance = _token.getProcessInstance().getContextInstance();
-		Body body = request.getBody();
-		boolean gblPrcScope = (null==globalProcessScope) 
-			? false : globalProcessScope;
-		if (null==jbpmToEsbVars)
-		{
-			Map map = (gblPrcScope)? ctxInstance.getVariables() 
-					: ctxInstance.getVariables(_token);
-			if (null!=map)
-				for (Iterator iter=map.entrySet().iterator(); iter.hasNext();)
-				{
-					Map.Entry curr = (Map.Entry)iter.next();
-					body.add(curr.getKey().toString(), curr.getValue());
-				}
-			return;
-		}
-		List list = jbpmToEsbVars.elements(MAPPING_TAG);
-		// do nothing if empty list
-		if (list.size()<1 )
-			return;
-		
-		for (Object iter: list)
-		{
-			Element curr = (Element)iter;
-			String jbpmKey	= curr.attributeValue(JBPM_NAME_ATTR);
-			String esbKey	= curr.attributeValue(ESB_NAME_ATTR);
-			String processScope = curr.attributeValue(PROCESS_SCOPE_ATTR);
-			boolean isPrcScope  = (null==processScope) ? gblPrcScope
-						: Boolean.parseBoolean(processScope); 
-			Object obj	= (isPrcScope) 
-				? ctxInstance.getVariable(jbpmKey)
-				: ctxInstance.getVariable(jbpmKey, _token);
-			if (null!=obj)
-			{
-				if(Constants.BODY_CONTENT_VARIABLE_NAME.equals(esbKey))
-				{
-					if (obj instanceof byte[])
-						body.setByteArray((byte[])obj);
-					else
-						body.setByteArray(obj.toString().getBytes());
-				}
-				else
-					body.add(esbKey, obj);
-			}
-		}
-	} //________________________________
-
-	protected void varsFromResponse(Message response) throws Exception 
-	{
-		ContextInstance ctxInstance = _token.getProcessInstance().getContextInstance();
-		Body body = response.getBody();
-		boolean gblPrcScope = (null==globalProcessScope) 
-			? false : globalProcessScope;
-		if (null==returnVars)
-		{
-			Map map = (gblPrcScope)? ctxInstance.getVariables() 
-					: ctxInstance.getVariables(_token);
-			if (null!=map)
-				for (Iterator iter=map.keySet().iterator(); iter.hasNext();)
-				{
-					String key = iter.next().toString();
-					Object obj = body.get(key);
-					if (null!=obj)
-					{
-						if (gblPrcScope)
-							ctxInstance.setVariable(key, obj);
-						else
-							ctxInstance.setVariable(key, obj, _token);
-					}
-				}
-			return;
-		}
-		List list = returnVars.elements(MAPPING_TAG);
-		// do nothing if empty list
-		if (list.size()<1 )
-			return;
-		
-		for (Object iter: list)
-		{
-			Element curr = (Element)iter;
-			String jbpmVar	= curr.attributeValue(JBPM_NAME_ATTR);
-			String esbVar	= curr.attributeValue(ESB_NAME_ATTR);
-			String processScope = curr.attributeValue(PROCESS_SCOPE_ATTR);
-			boolean isPrcScope  = (null==processScope) ? gblPrcScope
-					: Boolean.parseBoolean(processScope); 
-			Object obj	= (Constants.BODY_CONTENT_VARIABLE_NAME.equals(esbVar))
-				?body.getByteArray()
-				:body.get(esbVar);
-			Object oldVal = (isPrcScope) ? ctxInstance.getVariable(jbpmVar)
-							: ctxInstance.getVariable(jbpmVar,_token);
-			if (null==oldVal)
-			{
-				if (null!=obj)
-				{
-					if (isPrcScope)
-						ctxInstance.createVariable(jbpmVar, obj);
-					else
-						ctxInstance.createVariable(jbpmVar, obj, _token);
-				}
-			}
-			else
-			{
-				if (null==obj)
-				{
-					if (isPrcScope)
-						ctxInstance.deleteVariable(jbpmVar);
-					else
-						ctxInstance.deleteVariable(jbpmVar, _token);
-				}
-				else
-				{
-					if (isPrcScope)
-						ctxInstance.setVariable(jbpmVar,obj);
-					else
-						ctxInstance.setVariable(jbpmVar,obj,_token);
-				}
-			}
-		}
-	} //________________________________
-
-	protected Message getMessageTemplate() throws Exception 
-	{
-		if (null==esbCategoryName)
-			throw new ConfigurationException("Service category (esbCategoryName element) must not be null");
-		if (null==esbServiceName)
-			throw new ConfigurationException("Service name (esbServiceName element) must not be null");
-		
-		Message template = MessageFactory.getInstance().getMessage();
-		Call call = template.getHeader().getCall();
-		call.setMessageID(new URI(UUID.randomUUID().toString()));
-		
-		Helper.setLongValue	 (template,Constants.TOKEN_ID,_token.getId());
-		Node node = _token.getNode();
-		if (null!=node)
-			Helper.setStringValue(template, Constants.CURRENT_NODE_NAME, node.getName());
-
-		ProcessInstance instance = _token.getProcessInstance();
-		Helper.setLongValue(template,Constants.PROCESS_INSTANCE_ID,instance.getId());
-		
-		ProcessDefinition process	= instance.getProcessDefinition();
-		Helper.setObjectValue(template	,Constants.PROCESS_DEFINITION_NAME, process.getName());
-		Helper.setIntValue	 (template	,Constants.PROCESS_DEFINITION_VERSION, process.getVersion());
-		Helper.setLongValue  (template	,Constants.PROCESS_DEFINITION_ID, process.getId());
-		
-		
-		return template;
-	} //________________________________
-
-}

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,289 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY 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 along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.soa.esb.services.jbpm.actionhandlers;
-
-import java.net.URI;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.log4j.Logger;
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.addressing.Call;
-import org.jboss.soa.esb.listeners.message.Invoker;
-import org.jboss.soa.esb.message.Body;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.services.jbpm.Constants;
-import org.jboss.soa.esb.services.jbpm.util.Helper;
-import org.jboss.soa.esb.util.Util;
-import org.jbpm.context.exe.ContextInstance;
-import org.jbpm.graph.def.ActionHandler;
-import org.jbpm.graph.def.ProcessDefinition;
-import org.jbpm.graph.exe.ExecutionContext;
-import org.jbpm.graph.exe.ProcessInstance;
-import org.jbpm.graph.exe.Token;
-
-/**
- * 
- * Send messages to ESB services from jBPM applications, and optionally wait for response.
- * <li/>esbCategoryName - for ESB registry lookup
- * <li/>esbServiceName &nbsp; - for ESB registry lookup
- * <li>jbpmToEsb_variables
- * <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if this variable missing in the jpdl (null value in the context),
- * then <b>ALL</b> context instance variables will be added to the body of the esb message using
- * the jbpm variable name as the key in the message body
- * <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;otherwise, you can specify a comma delimited list of 
- * names indicating which jbpm context variables must be added to the message body
- * <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if you wish NOT to add objects in the body of the
- * outgoing message, you must specify a zero-length string  as the value
- * </li>
- * <li>jbpmToEsb_esbNames
- * <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if this value is not specified, then the jbpm variable
- * names will be used as a key to add the objects in the message body
- * <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;otherwise, a comma delimited list of names
- * <b>of the same length as</b>
- * the jbpmToEsb_variables list, must be supplied and will be used as keys in the message body
- * </li>
- * <li>millisToWaitForResponse - if a value > 0 is supplied, a response will be expected from the ESB service
- * and maximum wait time will be set accordingly.  If response is not received, a CourierTimeoutException will
- * be thrown
- * </li>
- * <li>return_esbNames
- * <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;If this value is missing in the jpdl (null value in the context), then an attempt will me made 
- * to find <b>ALL</b> jbpm context variables in the body of the incoming message, and only those objects
- * found with a valid jbpm context variable name, will update the jbpm context
- * <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Otherwise, a comma delimited list of names must be supplied.  These will 
- * be used to obtain values from the incoming response from the ESB service
- * <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;If you wish NOT to use objects in the body of the
- * response to update the context, you must specify a zero-length string  as the value
- * </li>
- * <li>return_variables
- * <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if this value is not specified, then the esb object
- * names will be used both as key in the message body, and as the jbpm variable name
- * <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;otherwise, a comma delimited list of names of the same lenght as
- * the return_esbNames list, must be supplied and will be used as the jbpm variable names
- * </li>
- * <li>processVariables
- * <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;If this variable is specified with a 'true' value, then
- * process instance level variables will be used to populate the message, and values returned
- * in the response message, will go back to process instance level, otherwise, token variables will
- * be used, (and set with response values)  
- * </li>
- * @author <a href="mailto:schifest at heuristica.com.ar">Esteban</a> 
- *
- */
-
-public class EsbActionHandler implements ActionHandler 
-{
-	
-	private static final long serialVersionUID = 1L;
-	
-	public String 	esbCategoryName;
-	public String 	esbServiceName;
-
-	public String	jbpmToEsb_variables;
-	public String	jbpmToEsb_esbNames;
-
-	public Integer	millisToWaitForResponse;
-	public String	return_esbNames;
-	public String	return_variables;
-	
-	public Boolean	processVariables;
-	
-	protected Logger	_logger = Logger.getLogger(getClass());
-	
-	protected Map<String, String>_outVarMapping;
-	protected Map<String, String>_retVarMapping;
-	protected transient	Token	_token;
-	
-	public void execute(ExecutionContext executionContext) throws Exception 
-	{
-		_token			= executionContext.getToken();
-		
-		Message request = getMessageTemplate();
-		varsToRequest(request);
-		if (null==millisToWaitForResponse || millisToWaitForResponse < 1)
-		{
-			Invoker.invoke(request,esbCategoryName, esbServiceName);
-			return;
-		}
-		
-		Message response = Invoker.invokeAndAwaitResponse
-			(request,esbCategoryName, esbServiceName, millisToWaitForResponse);
-		if (null!=response)
-			varsFromResponse(response);
-	} //________________________________
-
-	protected void varsToRequest(Message request) 
-		throws Exception 
-	{
-		ContextInstance ctxInstance = _token.getProcessInstance().getContextInstance();
-		Body body = request.getBody();
-		boolean global = (null==processVariables) ? false : processVariables;
-		if (null==jbpmToEsb_variables)
-		{
-			Map map = (global)? ctxInstance.getVariables() 
-					: ctxInstance.getVariables(_token);
-			if (null!=map)
-				for (Iterator iter=map.entrySet().iterator(); iter.hasNext();)
-				{
-					Map.Entry curr = (Map.Entry)iter.next();
-					body.add(curr.getKey().toString(), curr.getValue());
-				}
-			return;
-		}
-		String[]jbpmNames	= jbpmToEsb_variables.split(",");
-		// do nothing if empty list
-		if (jbpmNames.length==1 && Util.isNullString(jbpmNames[0]))
-			return;
-		
-		String[]esbNames	= (null==jbpmToEsb_esbNames) 
-					? jbpmNames
-					: jbpmToEsb_esbNames.split(",");
-		if (jbpmNames.length != esbNames.length)
-			throw new ConfigurationException("One to one mapping required from jbpm variables to esb names");
-
-		int index = 0;
-		for (String curr: jbpmNames)
-		{
-			String esbKey = esbNames[index++];
-			Object obj	= (global) ? ctxInstance.getVariable(curr)
-					: ctxInstance.getVariable(curr, _token);
-			if (null!=obj)
-			{
-				if(Constants.BODY_CONTENT_VARIABLE_NAME.equals(esbKey))
-				{
-					if (obj instanceof byte[])
-						body.setByteArray((byte[])obj);
-					else
-						body.setByteArray(obj.toString().getBytes());
-				}
-				else
-					body.add(esbKey, obj);
-			}
-		}
-	} //________________________________
-
-	protected void varsFromResponse(Message response) throws Exception 
-	{
-		ContextInstance ctxInstance = _token.getProcessInstance().getContextInstance();
-		Body body = response.getBody();
-		boolean global = (null==processVariables) ? false : processVariables;
-		if (null==return_esbNames)
-		{
-			Map map = (global)? ctxInstance.getVariables() 
-					: ctxInstance.getVariables(_token);
-			if (null!=map)
-				for (Iterator iter=map.keySet().iterator(); iter.hasNext();)
-				{
-					String key = iter.next().toString();
-					Object obj = body.get(key);
-					if (null!=obj)
-					{
-						if (global)
-							ctxInstance.setVariable(key, obj);
-						else
-							ctxInstance.setVariable(key, obj, _token);
-					}
-				}
-			return;
-		}
-		String[]esbNames	= return_esbNames.split(",");
-		// do nothing if empty list
-		if (esbNames.length==1 && Util.isNullString(esbNames[0]))
-			return;
-		
-		String[]jbpmNames	= (null==return_variables) 
-					? esbNames
-					: return_variables.split(",");
-		if (jbpmNames.length != esbNames.length)
-			throw new ConfigurationException("One to one mapping required between esb returned variables and jbpm names");
-
-		int index = 0;
-		for (String curr: esbNames)
-		{
-			Object obj	= (Constants.BODY_CONTENT_VARIABLE_NAME.equals(curr))
-				?body.getByteArray()
-				:body.get(curr);
-			String jbpmVar = jbpmNames[index];
-			Object oldVal = (global) ? ctxInstance.getVariable(jbpmVar)
-							: ctxInstance.getVariable(jbpmVar,_token);
-			if (null==oldVal)
-			{
-				if (null!=obj)
-				{
-					if (global)
-						ctxInstance.createVariable(jbpmVar, obj);
-					else
-						ctxInstance.createVariable(jbpmVar, obj, _token);
-				}
-			}
-			else
-			{
-				if (null==obj)
-				{
-					if (global)
-						ctxInstance.deleteVariable(jbpmVar);
-					else
-						ctxInstance.deleteVariable(jbpmVar, _token);
-				}
-				else
-				{
-					if (global)
-						ctxInstance.setVariable(jbpmVar,obj);
-					else
-						ctxInstance.setVariable(jbpmVar,obj,_token);
-				}
-			}
-			index++;
-		}
-	} //________________________________
-
-	protected Message getMessageTemplate() throws Exception 
-	{
-		if (null==esbCategoryName)
-			throw new ConfigurationException("Service category (esbCategoryName element) must not be null");
-		if (null==esbServiceName)
-			throw new ConfigurationException("Service name (esbServiceName element) must not be null");
-		
-		Message template = MessageFactory.getInstance().getMessage();
-		Call call = template.getHeader().getCall();
-		call.setMessageID(new URI(UUID.randomUUID().toString()));
-		
-		Helper.setLongValue	 (template,Constants.TOKEN_ID,_token.getId());
-		Helper.setStringValue(template, Constants.CURRENT_NODE_NAME, _token.getNode().getName());
-
-		ProcessInstance instance = _token.getProcessInstance();
-		Helper.setLongValue(template,Constants.PROCESS_INSTANCE_ID,instance.getId());
-		
-		ProcessDefinition process	= instance.getProcessDefinition();
-		Helper.setObjectValue(template	,Constants.PROCESS_DEFINITION_NAME, process.getName());
-		Helper.setIntValue	 (template	,Constants.PROCESS_DEFINITION_VERSION, process.getVersion());
-		Helper.setLongValue  (template	,Constants.PROCESS_DEFINITION_ID, process.getId());
-		
-		
-		return template;
-	} //________________________________
-
-}

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java (from rev 13441, labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,261 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.services.jbpm.actionhandlers;
+
+import java.net.URI;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.apache.log4j.Logger;
+import org.dom4j.Element;
+import org.dom4j.tree.DefaultElement;
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.addressing.Call;
+import org.jboss.soa.esb.listeners.message.Invoker;
+import org.jboss.soa.esb.message.Body;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.services.jbpm.Constants;
+import org.jboss.soa.esb.services.jbpm.util.Helper;
+import org.jbpm.context.exe.ContextInstance;
+import org.jbpm.graph.def.ActionHandler;
+import org.jbpm.graph.def.Node;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ExecutionContext;
+import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.graph.exe.Token;
+
+/**
+ * 
+ * Send messages to ESB services from jBPM applications, and optionally wait for response.
+ * <li/>esbCategoryName - for ESB registry lookup
+ * <li/>esbServiceName &nbsp; - for ESB registry lookup
+ * <li>millisToWaitForResponse - if a value > 0 is supplied, a response will be expected from the ESB service
+ * and maximum wait time will be set accordingly.  If response is not received, a CourierTimeoutException will
+ * be thrown
+ * </li>
+ * 
+ * @author <a href="mailto:schifest at heuristica.com.ar">Esteban</a> 
+ *
+ */
+
+public class EsbActionHandler implements ActionHandler 
+{
+	public static final String OUTGOING_VARS_TAG 	= "jbpmToEsbVars";
+	public static final String RETURN_VARS_TAG		= "returnVars";
+	public static final String MAPPING_TAG			= "mapping";
+	public static final String JBPM_NAME_ATTR		= "jbpm-name";
+	public static final String ESB_NAME_ATTR		= "esb-name";
+	public static final String PROCESS_SCOPE_ATTR	= "process-scope";
+	
+	private static final long serialVersionUID = 1L;
+	
+	public String 			esbCategoryName;
+	public String 			esbServiceName;
+	public Integer			millisToWaitForResponse;
+	public Boolean			globalProcessScope;
+	public DefaultElement	jbpmToEsbVars;
+	public DefaultElement	returnVars;
+	
+	protected Logger	_logger = Logger.getLogger(getClass());
+	
+	protected Map<String, String>_outVarMapping;
+	protected Map<String, String>_retVarMapping;
+	protected transient	Token	_token;
+	
+	public void execute(ExecutionContext executionContext) throws Exception 
+	{
+		_token			= executionContext.getToken();
+		
+		Message request = getMessageTemplate();
+		varsToRequest(request);
+		if (null==millisToWaitForResponse || millisToWaitForResponse < 1)
+		{
+			Invoker.invoke(request,esbCategoryName, esbServiceName);
+			return;
+		}
+		
+		Message response = null;
+		if ("MOCK_CATEGORY".equals(esbCategoryName)
+			&& "MOCK_SERVICE".equals(esbServiceName))
+			response = request;
+		else
+			Invoker.invokeAndAwaitResponse (request,esbCategoryName, esbServiceName, millisToWaitForResponse);
+		if (null!=response)
+			varsFromResponse(response);
+	} //________________________________
+
+	protected void varsToRequest(Message request) 
+		throws Exception 
+	{
+		ContextInstance ctxInstance = _token.getProcessInstance().getContextInstance();
+		Body body = request.getBody();
+		boolean gblPrcScope = (null==globalProcessScope) 
+			? false : globalProcessScope;
+		if (null==jbpmToEsbVars)
+		{
+			Map map = (gblPrcScope)? ctxInstance.getVariables() 
+					: ctxInstance.getVariables(_token);
+			if (null!=map)
+				for (Iterator iter=map.entrySet().iterator(); iter.hasNext();)
+				{
+					Map.Entry curr = (Map.Entry)iter.next();
+					body.add(curr.getKey().toString(), curr.getValue());
+				}
+			return;
+		}
+		List list = jbpmToEsbVars.elements(MAPPING_TAG);
+		// do nothing if empty list
+		if (list.size()<1 )
+			return;
+		
+		for (Object iter: list)
+		{
+			Element curr = (Element)iter;
+			String jbpmKey	= curr.attributeValue(JBPM_NAME_ATTR);
+			String esbKey	= curr.attributeValue(ESB_NAME_ATTR);
+			String processScope = curr.attributeValue(PROCESS_SCOPE_ATTR);
+			boolean isPrcScope  = (null==processScope) ? gblPrcScope
+						: Boolean.parseBoolean(processScope); 
+			Object obj	= (isPrcScope) 
+				? ctxInstance.getVariable(jbpmKey)
+				: ctxInstance.getVariable(jbpmKey, _token);
+			if (null!=obj)
+			{
+				if(Constants.BODY_CONTENT_VARIABLE_NAME.equals(esbKey))
+				{
+					if (obj instanceof byte[])
+						body.setByteArray((byte[])obj);
+					else
+						body.setByteArray(obj.toString().getBytes());
+				}
+				else
+					body.add(esbKey, obj);
+			}
+		}
+	} //________________________________
+
+	protected void varsFromResponse(Message response) throws Exception 
+	{
+		ContextInstance ctxInstance = _token.getProcessInstance().getContextInstance();
+		Body body = response.getBody();
+		boolean gblPrcScope = (null==globalProcessScope) 
+			? false : globalProcessScope;
+		if (null==returnVars)
+		{
+			Map map = (gblPrcScope)? ctxInstance.getVariables() 
+					: ctxInstance.getVariables(_token);
+			if (null!=map)
+				for (Iterator iter=map.keySet().iterator(); iter.hasNext();)
+				{
+					String key = iter.next().toString();
+					Object obj = body.get(key);
+					if (null!=obj)
+					{
+						if (gblPrcScope)
+							ctxInstance.setVariable(key, obj);
+						else
+							ctxInstance.setVariable(key, obj, _token);
+					}
+				}
+			return;
+		}
+		List list = returnVars.elements(MAPPING_TAG);
+		// do nothing if empty list
+		if (list.size()<1 )
+			return;
+		
+		for (Object iter: list)
+		{
+			Element curr = (Element)iter;
+			String jbpmVar	= curr.attributeValue(JBPM_NAME_ATTR);
+			String esbVar	= curr.attributeValue(ESB_NAME_ATTR);
+			String processScope = curr.attributeValue(PROCESS_SCOPE_ATTR);
+			boolean isPrcScope  = (null==processScope) ? gblPrcScope
+					: Boolean.parseBoolean(processScope); 
+			Object obj	= (Constants.BODY_CONTENT_VARIABLE_NAME.equals(esbVar))
+				?body.getByteArray()
+				:body.get(esbVar);
+			Object oldVal = (isPrcScope) ? ctxInstance.getVariable(jbpmVar)
+							: ctxInstance.getVariable(jbpmVar,_token);
+			if (null==oldVal)
+			{
+				if (null!=obj)
+				{
+					if (isPrcScope)
+						ctxInstance.createVariable(jbpmVar, obj);
+					else
+						ctxInstance.createVariable(jbpmVar, obj, _token);
+				}
+			}
+			else
+			{
+				if (null==obj)
+				{
+					if (isPrcScope)
+						ctxInstance.deleteVariable(jbpmVar);
+					else
+						ctxInstance.deleteVariable(jbpmVar, _token);
+				}
+				else
+				{
+					if (isPrcScope)
+						ctxInstance.setVariable(jbpmVar,obj);
+					else
+						ctxInstance.setVariable(jbpmVar,obj,_token);
+				}
+			}
+		}
+	} //________________________________
+
+	protected Message getMessageTemplate() throws Exception 
+	{
+		if (null==esbCategoryName)
+			throw new ConfigurationException("Service category (esbCategoryName element) must not be null");
+		if (null==esbServiceName)
+			throw new ConfigurationException("Service name (esbServiceName element) must not be null");
+		
+		Message template = MessageFactory.getInstance().getMessage();
+		Call call = template.getHeader().getCall();
+		call.setMessageID(new URI(UUID.randomUUID().toString()));
+		
+		Helper.setLongValue	 (template,Constants.TOKEN_ID,_token.getId());
+		Node node = _token.getNode();
+		if (null!=node)
+			Helper.setStringValue(template, Constants.CURRENT_NODE_NAME, node.getName());
+
+		ProcessInstance instance = _token.getProcessInstance();
+		Helper.setLongValue(template,Constants.PROCESS_INSTANCE_ID,instance.getId());
+		
+		ProcessDefinition process	= instance.getProcessDefinition();
+		Helper.setObjectValue(template	,Constants.PROCESS_DEFINITION_NAME, process.getName());
+		Helper.setIntValue	 (template	,Constants.PROCESS_DEFINITION_VERSION, process.getVersion());
+		Helper.setLongValue  (template	,Constants.PROCESS_DEFINITION_ID, process.getId());
+		
+		
+		return template;
+	} //________________________________
+
+}

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbAction2UnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbAction2UnitTest.java	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbAction2UnitTest.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,120 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY 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 along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.soa.esb.services.jbpm.actionhandlers;
-
-import java.io.File;
-
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestCase;
-
-import org.apache.log4j.Logger;
-import org.jbpm.graph.def.ProcessDefinition;
-import org.jbpm.graph.exe.ProcessInstance;
-import org.jbpm.graph.exe.Token;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class EsbAction2UnitTest extends TestCase 
-{
-
-	private static Class thisClass = EsbAction2UnitTest.class;
-	static Logger 				_logger = Logger.getLogger(thisClass);
-
-    public static junit.framework.Test suite()
-    {
-        return new JUnit4TestAdapter(thisClass);
-    }
-    
-    static File WORKDIR;
-    static
-    {
-    	String os = System.getProperty("os.name","").toLowerCase();
-    	String dflt = (os.indexOf("win")>=0) ? "/temp": "/tmp";
-    	WORKDIR	= new File(System.getProperty("java.io.tmpdir",dflt));
-    }
-
-    @BeforeClass
-    public static void runBeforeAllTests()
-    {
-    	_logger.info("@BeforeClass invoked");
-    	try 
-    	{
-    	}
-    	catch (Exception e)
-    	{
-    		e.printStackTrace();
-    		assertTrue(false);
-    	}
-    }
-
-
-    @AfterClass
-    public static void runAfterAllTests() throws Exception
-    {
-    	_logger.info("@AfterClass invoked");
-    }
-
-    @Test
-	public void testSimpleProcess() throws Exception 
-	{
-		// Extract a process definition from the processdefinition.xml file.
-		ProcessDefinition processDefinition 
-			= ProcessDefinition.parseXmlResource("testMappingDefinition.xml");
-		assertTrue("Definition should not be null", null!=processDefinition);
-
-		// Create an instance of the process definition.
-		ProcessInstance instance = new ProcessInstance(processDefinition);
-		assertTrue(
-				"Instance is in start state", 
-				instance.getRootToken().getNode().getName().equals("start"));
-
-		String varVal = "HELLO world";
-		String second = "Second Hello";
-		String body	 = "This text in Message body"; 
-			
-		Token token = instance.getRootToken();
-		instance.getContextInstance().createVariable("v1", varVal, token);
-		instance.getContextInstance().createVariable("g2", second);
-		instance.getContextInstance().createVariable("body", body.getBytes(),token);
-		instance.signal();
-
-		assertTrue(
-				"Instance is in first state", 
-				instance.getRootToken().getNode().getName().equals("first"));
-
-		_logger.info("Instance Var x1= "+varVal);
-		assertTrue(varVal.equals(instance.getContextInstance().getVariable("x1")));
-		_logger.info("Token    Var x2= "+second);
-		assertTrue(second.equals(instance.getContextInstance().getVariable("x2",instance.getRootToken())));
-		_logger.info("Token    Var x3= "+body);
-		assertTrue(body.equals(new String((byte[])instance.getContextInstance().getVariable("x3",instance.getRootToken()))));
-
-		instance.signal();
-		assertTrue(
-				"Instance is in end state", 
-				instance.getRootToken().getNode().getName().equals("end"));
-		assertTrue("Instance has ended", instance.hasEnded());
-	}
-
-}

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandlerUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandlerUnitTest.java	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandlerUnitTest.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,266 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY 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 along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.soa.esb.services.jbpm.actionhandlers;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import junit.framework.JUnit4TestAdapter;
-
-import org.apache.log4j.Logger;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Body;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.services.jbpm.Constants;
-import org.jboss.soa.esb.services.jbpm.actions.BpmProcessor;
-import org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler;
-import org.jboss.soa.esb.services.jbpm.actions.JbpmTestUtil;
-import org.jboss.soa.esb.services.jbpm.util.Helper;
-import org.jbpm.context.exe.ContextInstance;
-import org.jbpm.graph.exe.ExecutionContext;
-import org.jbpm.graph.exe.ProcessInstance;
-import org.jbpm.graph.exe.Token;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-
-/**
- * Test the EsbActionHandler class
- *
- * @author <a href="mailto:schifest at heuristica.com.ar">Esteban</a>
- */
-
-
-public class EsbActionHandlerUnitTest
-{
-
-	private static Class thisClass = EsbActionHandlerUnitTest.class;
-	static Logger 				_logger = Logger.getLogger(thisClass);
-
-    public static junit.framework.Test suite()
-    {
-        return new JUnit4TestAdapter(thisClass);
-    }
-    
-    static File WORKDIR;
-    static
-    {
-    	String os = System.getProperty("os.name","").toLowerCase();
-    	String dflt = (os.indexOf("win")>=0) ? "/temp": "/tmp";
-    	WORKDIR	= new File(System.getProperty("java.io.tmpdir",dflt));
-    }
-
-    @BeforeClass
-    public static void runBeforeAllTests()
-    {
-    	_logger.info("@BeforeClass invoked");
-    	try 
-    	{
-    	}
-    	catch (Exception e)
-    	{
-    		e.printStackTrace();
-    		assertTrue(false);
-    	}
-    }
-
-
-    @AfterClass
-    public static void runAfterAllTests() throws Exception
-    {
-    	_logger.info("@AfterClass invoked");
-    }
-
-    @Test
-    public void mockTest()
-    {
-    	// place holder so test will run even with no other @Test
-    	_logger.info("Mock test invoked");
-    	assertTrue(true);
-    }
-    
-    @SuppressWarnings("unchecked")
-	@Test
-	public void testEsbActionHandler()
-	{
-    	Message msg=null;
-    	MyEsbActionHandler handler = null;
-    	
-    	for(Boolean processVars: new boolean[]{false,true})   
-			try
-			{
-				// use the same config as the BpmProcessorUnitTest
-				String xml = JbpmTestUtil.stringFromFile("testSingleCommands.xml");
-				ConfigTree[] actions = ConfigTree.fromXml(xml).getChildren("action");
-	
-				// create a process def
-				BpmProcessor command = new BpmProcessor(actions[0]);
-				command.process(Helper.commandMessageTemplate());
-	
-				// create a process instance
-				command = new BpmProcessor(actions[1]);
-				msg = command.process(Helper.commandMessageTemplate());
-				ProcessInstance inst = (ProcessInstance)msg.getBody()
-						.get(Constants.JBPM_RETURN_OBJECT);
-	
-				Token			token = inst.getRootToken();
-				ContextInstance	ctx	= inst.getContextInstance();
-				
-				handler	= getHandler(token, "No variables - No mappings - no response",processVars);
-				handler.execute(null);
-				
-				handler	= getHandler(token,"V3 and V2  - No mappings - no response",processVars);
-				handler.jbpmToEsb_variables="jbV3,jbV2";
-				handler.execute(null);	
-				
-				handler	= getHandler(token,"V3 and V2  mapped - no response",processVars);
-				handler.jbpmToEsb_variables="jbV3,jbV2";
-				handler.jbpmToEsb_esbNames="esbV3,esbV2";
-				handler.execute(null);	
-				
-				handler	= getHandler(token, "No variables - No mappings - Response expected",processVars);
-				handler.millisToWaitForResponse=1;
-				handler.execute(null);
-				assertTrue((s_varMap.get("jbV1")+"_P").equals(ctx.getVariable("jbV1",token)));
-				assertTrue((s_varMap.get("jbV2")+"_P").equals(ctx.getVariable("jbV2",token)));
-				assertTrue((s_varMap.get("jbV3")+"_P").equals(ctx.getVariable("jbV3",token)));
-				
-				handler	= getHandler(token,"All variables mapped both ways - Response expected",processVars);
-				handler.jbpmToEsb_variables="jbV3,jbV2,jbV1";
-				handler.jbpmToEsb_esbNames="esbV3,esbV2,esbV1";
-				handler.millisToWaitForResponse=1;
-	
-				handler.return_esbNames="esbV1,esbV2,esbV3";
-				handler.return_variables="jbV1,jbV2,jbV3";
-				
-				handler.execute(null);
-				assertTrue((s_varMap.get("jbV1")+"_P").equals(ctx.getVariable("jbV1",token)));
-				assertTrue((s_varMap.get("jbV2")+"_P").equals(ctx.getVariable("jbV2",token)));
-				assertTrue((s_varMap.get("jbV3")+"_P").equals(ctx.getVariable("jbV3",token)));
-	
-				handler	= getHandler(token,"V1 mapped both ways (trick j1 to e3 and back) - Response expected",processVars);
-				handler.jbpmToEsb_variables="jbV1";
-				handler.jbpmToEsb_esbNames="esbV3";
-				handler.return_esbNames="esbV3";
-				handler.return_variables="jbV1";
-				handler.millisToWaitForResponse=1;
-				handler.execute(null);
-				assertTrue((s_varMap.get("jbV1")+"_P").equals(ctx.getVariable("jbV1",token)));
-				assertTrue(s_varMap.get("jbV2").equals(ctx.getVariable("jbV2",token)));
-				assertTrue(s_varMap.get("jbV3").equals(ctx.getVariable("jbV3",token)));
-	
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-				assertTrue(false);
-			}
-	} //________________________________
-    
-    private static MyEsbActionHandler getHandler(Token token, String title, boolean processVars)
-    {
-    	Iterator iter=null;
-    	
-		ContextInstance	ctxInstance = token.getProcessInstance().getContextInstance();
-	
-		iter = ctxInstance.getVariables(token).keySet().iterator();
-		while (iter.hasNext())
-			ctxInstance.deleteVariable((String)iter.next(),token);
-		
-		iter = ctxInstance.getVariables().keySet().iterator();
-		while (iter.hasNext())
-			ctxInstance.deleteVariable((String)iter.next());
-
-		ctxInstance.addVariables(s_varMap,token);
-		
-		MyEsbActionHandler handler = new MyEsbActionHandler(title,processVars);
-		handler.setToken(token);
-
-		return handler;
-    } //________________________________
-    
-    private static final String[] s_vars = 
-    	{"jbV1","jbV2","jbV3","esbV1","esbV2","esbV3"};
-	private static final Map<String,Object> s_varMap	= new HashMap<String, Object>();
-	static
-	{
-		s_varMap.put("jbV1","1");
-		s_varMap.put("jbV2","22");
-		s_varMap.put("jbV3","333");
-	};
-    private static void dumpMessage(String title, Message msg) throws Exception
-    {
-    	StringBuilder sb = new StringBuilder("\n---").append(title).append("---");
-    	Body body = msg.getBody();
-    	for (String curr:s_vars)
-    		sb.append(" ").append(curr).append("=").append(body.get(curr));
-    	System.out.println(sb);
-    }
-
-	private static class MyEsbActionHandler extends EsbActionHandler
-	{
-		public static final long serialVersionUID = 1L;
-		public void setToken(Token token)	{_token = token; }
-		
-		public MyEsbActionHandler(String title, boolean processLevelVars) 
-		{
-			String level = (processLevelVars)?"PROCESS VARS ":"TOKEN VARS";
-			System.out.println(level+" "+title);
-			esbCategoryName	= "mockCategory";
-			esbServiceName	= "mockServiceName";
-			processVariables = processLevelVars;
-		}
-		
-		
-		// this is a mock execute method to avoid need of ESB running for
-		// the unit test
-		@Override
-		public void execute(ExecutionContext ctx) throws Exception
-		{
-			// Does the same as the real one, but does not go to ESB
-			Message request = getMessageTemplate();
-			varsToRequest(request);
-			dumpMessage("Request ",request);
-			
-			if (null!=millisToWaitForResponse && millisToWaitForResponse > 0)
-			{
-				Body body	= request.getBody();
-				for(String curr:s_vars)
-				{
-					String val = (String)body.get(curr);
-					if (null!=val)
-						body.add(curr, val+"_P");
-				}
-				
-				dumpMessage("Response ",request);
-				varsFromResponse(request);
-			}
-			System.out.println("______________________________________");
-		}
-	};
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandlerUnitTest.java (from rev 13441, labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandlerUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandlerUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandlerUnitTest.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,120 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.services.jbpm.actionhandlers;
+
+import java.io.File;
+
+import junit.framework.JUnit4TestAdapter;
+import junit.framework.TestCase;
+
+import org.apache.log4j.Logger;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.graph.exe.Token;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class EsbActionHandlerUnitTest extends TestCase 
+{
+
+	private static Class thisClass = EsbActionHandlerUnitTest.class;
+	static Logger 				_logger = Logger.getLogger(thisClass);
+
+    public static junit.framework.Test suite()
+    {
+        return new JUnit4TestAdapter(thisClass);
+    }
+    
+    static File WORKDIR;
+    static
+    {
+    	String os = System.getProperty("os.name","").toLowerCase();
+    	String dflt = (os.indexOf("win")>=0) ? "/temp": "/tmp";
+    	WORKDIR	= new File(System.getProperty("java.io.tmpdir",dflt));
+    }
+
+    @BeforeClass
+    public static void runBeforeAllTests()
+    {
+    	_logger.info("@BeforeClass invoked");
+    	try 
+    	{
+    	}
+    	catch (Exception e)
+    	{
+    		e.printStackTrace();
+    		assertTrue(false);
+    	}
+    }
+
+
+    @AfterClass
+    public static void runAfterAllTests() throws Exception
+    {
+    	_logger.info("@AfterClass invoked");
+    }
+
+    @Test
+	public void testSimpleProcess() throws Exception 
+	{
+		// Extract a process definition from the processdefinition.xml file.
+		ProcessDefinition processDefinition 
+			= ProcessDefinition.parseXmlResource("testMappingDefinition.xml");
+		assertTrue("Definition should not be null", null!=processDefinition);
+
+		// Create an instance of the process definition.
+		ProcessInstance instance = new ProcessInstance(processDefinition);
+		assertTrue(
+				"Instance is in start state", 
+				instance.getRootToken().getNode().getName().equals("start"));
+
+		String varVal = "HELLO world";
+		String second = "Second Hello";
+		String body	 = "This text in Message body"; 
+			
+		Token token = instance.getRootToken();
+		instance.getContextInstance().createVariable("v1", varVal, token);
+		instance.getContextInstance().createVariable("g2", second);
+		instance.getContextInstance().createVariable("body", body.getBytes(),token);
+		instance.signal();
+
+		assertTrue(
+				"Instance is in first state", 
+				instance.getRootToken().getNode().getName().equals("first"));
+
+		_logger.info("Instance Var x1= "+varVal);
+		assertTrue(varVal.equals(instance.getContextInstance().getVariable("x1")));
+		_logger.info("Token    Var x2= "+second);
+		assertTrue(second.equals(instance.getContextInstance().getVariable("x2",instance.getRootToken())));
+		_logger.info("Token    Var x3= "+body);
+		assertTrue(body.equals(new String((byte[])instance.getContextInstance().getVariable("x3",instance.getRootToken()))));
+
+		instance.signal();
+		assertTrue(
+				"Instance is in end state", 
+				instance.getRootToken().getNode().getName().equals("end"));
+		assertTrue("Instance has ended", instance.hasEnded());
+	}
+
+}

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/test/resources/testMappingDefinition.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/test/resources/testMappingDefinition.xml	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbpm/src/test/resources/testMappingDefinition.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -5,7 +5,7 @@
   name="testMappingDefinition">
    <start-state name="start">
       <transition name="to_state" to="first">
-      	<action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbAction2">
+      	<action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
       		<esbCategoryName>MOCK_CATEGORY</esbCategoryName>
       		<esbServiceName>MOCK_SERVICE</esbServiceName>
       		<millisToWaitForResponse>1</millisToWaitForResponse>

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/base-project-build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/base-project-build.xml	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/base-project-build.xml	2007-07-13 11:33:43 UTC (rev 13442)
@@ -31,7 +31,7 @@
         <fileset dir="${esb.product.lib.dir}" includes="*.jar"/>
         <!-- Product Jars. -->
         <pathelement location="src/test/resources"/>
-        <fileset dir="../../lib/ext" includes="jboss-system.jar"/>
+        <fileset dir="../../lib/ext" includes="jboss-system.jar,jboss.jar"/>
         <fileset dir="../../lib/ext" includes="quartz-1.6.0.jar"/>
     </path>
 

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/lib/ext/build-time/jboss-jaxws.jar
===================================================================
(Binary files differ)

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/lib/ext/build-time/jbossws-core.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/lib/ext/build-time/jbossws-jboss42.jar (from rev 13441, labs/jbossesb/trunk/product/services/soap/lib/ext/build-time/jbossws-jboss42.jar)
===================================================================
(Binary files differ)

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/lib/ext/build-time/jbossws-spi.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/src/main/java/org/jboss/soa/esb/jbossws (from rev 13441, labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/jbossws)

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/src/main/java/org/jboss/soa/esb/jbossws/ESBWebMetaDataAdapter.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/jbossws/ESBWebMetaDataAdapter.java	2007-07-13 11:15:15 UTC (rev 13441)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/src/main/java/org/jboss/soa/esb/jbossws/ESBWebMetaDataAdapter.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY 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 along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.jbossws;
-
-import org.jboss.deployment.DeploymentInfo;
-import org.jboss.deployment.J2eeApplicationMetaData;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData;
-import org.jboss.wsf.container.jboss42.WebMetaDataAdapter;
-
-/**
- * Build container independent web meta data
- * <p/>
- * This class overrides {@link WebMetaDataAdapter} in order to work around
- * a NullP Exception bug in JBossWS 2.0.0GA.  It should be removed once there's
- * a fix for this bug.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class ESBWebMetaDataAdapter extends WebMetaDataAdapter {
-
-    public UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentInfo di) {
-        if (di.parent != null) {
-            J2eeApplicationMetaData appmd = (J2eeApplicationMetaData) di.parent.metaData;
-            if (appmd == null) {
-                // Explicitly initialise this variable if it's not set - avoids the NPE...
-                di.parent.metaData = new J2eeApplicationMetaData();
-            }
-        }
-
-        return super.buildUnifiedWebMetaData(dep, udi, di);
-    }
-}

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/src/main/java/org/jboss/soa/esb/jbossws/ESBWebMetaDataAdapter.java (from rev 13441, labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/jbossws/ESBWebMetaDataAdapter.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/src/main/java/org/jboss/soa/esb/jbossws/ESBWebMetaDataAdapter.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/src/main/java/org/jboss/soa/esb/jbossws/ESBWebMetaDataAdapter.java	2007-07-13 11:33:43 UTC (rev 13442)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.soa.esb.jbossws;
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployment.J2eeApplicationMetaData;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData;
+import org.jboss.wsf.container.jboss42.WebMetaDataAdapter;
+
+/**
+ * Build container independent web meta data
+ * <p/>
+ * This class overrides {@link WebMetaDataAdapter} in order to work around
+ * a NullP Exception bug in JBossWS 2.0.0GA.  It should be removed once there's
+ * a fix for this bug.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class ESBWebMetaDataAdapter extends WebMetaDataAdapter {
+
+    public UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentInfo di) {
+        if (di.parent != null) {
+            J2eeApplicationMetaData appmd = (J2eeApplicationMetaData) di.parent.metaData;
+            if (appmd == null) {
+                // Explicitly initialise this variable if it's not set - avoids the NPE...
+                di.parent.metaData = new J2eeApplicationMetaData();
+            }
+        }
+
+        return super.buildUnifiedWebMetaData(dep, udi, di);
+    }
+}




More information about the jboss-svn-commits mailing list