[jboss-svn-commits] JBL Code SVN: r13243 - in labs/jbossesb/workspace/dbevenius/wslistener/product: docs and 49 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Sun Jul 8 13:12:54 EDT 2007


Author: beve
Date: 2007-07-08 13:12:53 -0400 (Sun, 08 Jul 2007)
New Revision: 13243

Added:
   labs/jbossesb/workspace/dbevenius/wslistener/product/docs/wiki/JBossESBQuickStart.html
   labs/jbossesb/workspace/dbevenius/wslistener/product/extras/jaxbintros/lib/junit-4.1.jar
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/
   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/MetaDataFilter.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/filter/
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/filter/FilterManager.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/filter/InputOutputFilter.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionStatusBean.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/ServiceMessageCounter.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_orchestration2/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/build.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/deployment.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbm-queue-service-scoped.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbossesb-properties.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jndi.properties
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/juddi.properties
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/lib/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/log4j.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition1/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition1/gpd.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition1/processdefinition.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition1/processimage.jpg
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/readme.txt
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service1.groovy
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service2.groovy
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service3.groovy
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service4.groovy
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service5.groovy
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service6.groovy
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service7.groovy
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/esb_actions/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/esb_actions/MessageSpy.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/esb_actions/SimpleJMSNotifier.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/process_actions/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/process_actions/MyBPMActionHandler.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageDeploy.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageStart.java
Removed:
   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/MetaDataFilter.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/internal/soa/esb/message/metadata/
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/couriers/filter/
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/filter/FilterManager.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/filter/InputOutputFilter.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/build.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/deployment.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbm-queue-service-scoped.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbossesb-properties.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jndi.properties
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/juddi.properties
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/lib/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/log4j.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition1/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition1/gpd.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition1/processdefinition.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition1/processimage.jpg
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/readme.txt
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service1.groovy
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service2.groovy
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service3.groovy
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service4.groovy
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service5.groovy
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service6.groovy
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service7.groovy
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/esb_actions/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/esb_actions/MessageSpy.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/esb_actions/SimpleJMSNotifier.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/process_actions/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/process_actions/MyBPMActionHandler.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageDeploy.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageStart.java
Modified:
   labs/jbossesb/workspace/dbevenius/wslistener/product/Build.txt
   labs/jbossesb/workspace/dbevenius/wslistener/product/build-distr.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/build.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/docs/AdministrationGuide.odt
   labs/jbossesb/workspace/dbevenius/wslistener/product/docs/AdministrationGuide.pdf
   labs/jbossesb/workspace/dbevenius/wslistener/product/docs/MessageActionGuide.odt
   labs/jbossesb/workspace/dbevenius/wslistener/product/docs/ProgrammersGuide.odt
   labs/jbossesb/workspace/dbevenius/wslistener/product/docs/wiki/FilesToGenerate.txt
   labs/jbossesb/workspace/dbevenius/wslistener/product/extras/jaxbintros/build.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/install/conf/jbossesb-properties.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/install/tomcat/jbossesb-properties.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/product.properties
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/build.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/actions/SystemPrintln.java
   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/addressing/Call.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/config/ServicePublisher.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JbrListenerMapper.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/SqlListenerMapper.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/UntypedListenerMapper.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/PackageJmsMessageContents.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/AbstractManagedLifecycle.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/LifecycleController.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/LifecycleControllerMBean.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageCounter.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageCounterMBean.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/OverriddenActionProcessor.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/util/ClassUtil.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/config/jbossesb_config_01_esbaware.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_gateways.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/helloworld_file_action/jboss-esb-unfiltered.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_bpel/build.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/services/base-project-build.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbossesb/src/test/resources/jbossesb-unittest-properties.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/base-project-build.xml
   labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPProcessor.java
   labs/jbossesb/workspace/dbevenius/wslistener/product/skip.properties-example
Log:
Merge from main 13068:13241

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/Build.txt
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/Build.txt	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/Build.txt	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,6 +1,21 @@
 JBoss ESB Build Instruction:
 ============================
-1. Set JAVA_HOME to the location of your JDK 5 install.
-2. Set ANT_HOME to the location of your Ant install.  We recommend v1.6.5.
-3. From within this folder ("product"), type "ant install".  If you wish to include the junit tests, type "ant test install".
-5. You'll find the binaries produced by the build in the "product/build/jbossesb" folder.
+ - Set JAVA_HOME to the location of your JDK 5 install.
+ - Set ANT_HOME to the location of your Ant install.  We recommend v1.6.5.
+
+To create the distribution
+==========================
+ - From within this folder ("product"), type "ant dist".
+
+or
+
+To create and install the distribution into an app server
+=========================================================
+ - edit install/deployment.properties to specify your app server
+   location and the name of the server profile.  An sample config
+   can be found in install/deployment.properties-example.
+ - From within this folder ("product"), type "ant deploy".
+
+To execute the unit tests
+=========================
+ - after building the distribution, type "ant test"

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/build-distr.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/build-distr.xml	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/build-distr.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -54,7 +54,7 @@
         <ant antfile="build.xml" dir="ftp"/>
     </target>
 
-    <target name="server.dist" depends="build.sar, unpack.server.zip, ftp-server, services" unless="skip.server.esb">
+    <target name="server.dist" depends="build.sar, unpack.server.zip, ftp-server" unless="skip.server.esb">
         <copy todir="${esbserver.dist.dir}/server/default/deploy/jbossesb.sar">
             <fileset dir="${build.dir}/jbossesb.sar">
                 <include name="**/*"/>
@@ -79,9 +79,14 @@
         </copy>
         <!-- copy services -->
         <copy todir="${esbserver.dist.dir}/server/default/deploy">
-            <fileset dir="${build.dir}/services">
-                <include name="**/*"/>
-            </fileset>
+            <fileset dir="${services.dir}/jbossesb/build" includes="jbossesb.esb/**/*" excludes="jbossesb.esb/jbmq-queue-service.xml"/>
+        	<fileset dir="${services.dir}/jbpm/build" includes="jbpm.esb/**/*"/>
+        	<fileset dir="${services.dir}/jbrules/build" includes="jbrules.esb/**/*"/>
+        	<fileset dir="${services.dir}/smooks/build" includes="smooks.esb/**/*" excludes="smooks.esb/jbmq-queue-service.xml"/>
+        	<fileset dir="${services.dir}/spring/build" includes="spring.esb/**/*"/>
+        	<fileset dir="${services.dir}/spring/build" includes="spring.esb/**/*"/>
+        	<fileset dir="${services.dir}/soap/build" includes="soap.esb/**/*"/>
+            <fileset dir="${services.dir}/soapui-client/target" includes="*.sar"/>
         </copy>
     </target>
 
@@ -147,18 +152,5 @@
 
     </target>
 
-    <target name="services" unless="skip.services">
-        <mkdir dir="${build.dir}/services"/>
-        <copy todir="${build.dir}/services">
-            <fileset dir="${services.dir}/jbossesb/build" includes="jbossesb.esb/**/*" />
-        	<fileset dir="${services.dir}/jbpm/build" includes="jbpm.esb/**/*"/>
-        	<fileset dir="${services.dir}/jbrules/build" includes="jbrules.esb/**/*"/>
-        	<fileset dir="${services.dir}/smooks/build" includes="smooks.esb/**/*" />
-        	<fileset dir="${services.dir}/spring/build" includes="spring.esb/**/*"/>
-        	<fileset dir="${services.dir}/spring/build" includes="spring.esb/**/*"/>
-        	<fileset dir="${services.dir}/soap/build" includes="soap.esb/**/*"/>
-            <fileset dir="${services.dir}/soapui-client/target" includes="*.sar"/>
-        </copy>
-    </target>
 
 </project>

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/build.xml	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/build.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -100,6 +100,11 @@
 		</sequential>
 	</macrodef>
 
+        <path id="emma.libs">
+            <fileset dir="lib/ext" includes="emma*.jar"/>
+        </path>
+        <taskdef resource="emma_ant.properties" classpathref="emma.libs" />
+
 	<target name="generate-config-model" description="generates the xmlbeans config model">
 		<ant dir="rosetta" target="generate-config-model"/>
 	</target>
@@ -159,7 +164,12 @@
     <!-- Integration test targets -->
     <target name="org.jboss.esb.integration.test" depends="org.jboss.esb.compile">
         <echo message="Testing of modules, using unit, functional and integration tests"/>
-        <ant dir="rosetta" target="org.jboss.esb.rosetta.integration.test"/>
+        <ant dir="rosetta">
+            <target name="org.jboss.esb.rosetta.integration.test"/>
+            <!-- needed for service tests -->
+            <target name="jar"/>
+        </ant>
+    	<ant dir="services" target="test"/>
     </target>
 
     <!-- javadocs paths -->
@@ -472,10 +482,30 @@
 		<ant dir="install" target="deploy"/>
 	</target>
 
-	<target name="instr-report">
-		<ant dir="rosetta" target="instr-report"/>
-	</target>
+    <target name="instr-report">
+        <property name="coverage.dir" location="build/tests/coverage"/>
+        <emma>
+            <report sort="+block,+name,+method,+class" metrics="method:70,block:80,line:80,class:100">
+                <fileset dir="${coverage.dir}" >
+                    <include name="*/*.emma" />
+                </fileset>
+		<!-- include services coverage -->
+                <fileset dir="services">
+                    <include name="*/build/tests/coverage/*.emma" />
+                </fileset>
+                <sourcepath>
+			<dirset dir="rosetta" includes="src" />
+			<!-- services uses maven hierarchy -->
+			<dirset dir="services" includes="*/src/main/java" />
+		</sourcepath>
+                <txt outfile="${coverage.dir}/coverage.txt"/>
+                <xml outfile="${coverage.dir}/coverage.xml"/>
+                <html outfile="${coverage.dir}/coverage.html"/>
+            </report>
+        </emma>
+    </target>
 
+
 	<target name="default" description="will run the 'dist' and 'test' targets">
 		<runant target="org.jboss.esb.default"/>
 	</target>

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/docs/AdministrationGuide.odt
===================================================================
(Binary files differ)

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/docs/AdministrationGuide.pdf
===================================================================
(Binary files differ)

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/docs/MessageActionGuide.odt
===================================================================
(Binary files differ)

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/docs/ProgrammersGuide.odt
===================================================================
(Binary files differ)

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/docs/wiki/FilesToGenerate.txt
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/docs/wiki/FilesToGenerate.txt	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/docs/wiki/FilesToGenerate.txt	2007-07-08 17:12:53 UTC (rev 13243)
@@ -4,3 +4,4 @@
 version of the product.
 
 http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossESBDeploymentStrategies
+http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossESBQuickStart
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/docs/wiki/JBossESBQuickStart.html (from rev 13241, labs/jbossesb/trunk/product/docs/wiki/JBossESBQuickStart.html)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/docs/wiki/JBossESBQuickStart.html	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/docs/wiki/JBossESBQuickStart.html	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,428 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>JBoss.com - Wiki - JBossESBQuickStart</title>
+<base href="http://www.jboss.com/"/>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<meta http-equiv="expires" content="0"/>
+<meta name="keywords" content="jboss, jboss application server, application server."/>
+<meta name="description" content="The Professional Open Source Company"/>
+<meta name="ROBOTS" content="INDEX,FOLLOW"/>
+<meta name="resource-type" content="document"/>
+<meta name="author" content="The Professional Open Source Company"/>
+<meta name="copyright" content="Copyright (c) 2004 by JBoss.com"/>
+<meta name="revisit-after" content="1 days"/>
+<meta name="distribution" content="Global"/>
+<meta name="generator" content="Nukes on JBoss - http://www.jboss.org"/>
+<meta name="rating" content="General"/>
+<link rel="shortcut icon" href="/favicon.ico"/>
+<link rel="stylesheet" href="themes/jbosstheme/style/custom.css" type="text/css" media="all">
+<link rel="stylesheet" href="themes/jbosstheme/style/global.css" type="text/css" media="all">
+<link rel="stylesheet" href="themes/jbosstheme/style/headings.css" type="text/css" media="all">
+<link rel="stylesheet" href="themes/jbosstheme/style/layout.css" type="text/css" media="all">
+<link rel="stylesheet" href="themes/jbosstheme/style/navigation.css" type="text/css" media="all">
+<link rel="stylesheet" href="themes/jbosstheme/style/pagelayout.css" type="text/css" media="all">
+<link rel="stylesheet" href="themes/jbosstheme/style/tables.css" type="text/css" media="all">
+<link rel="stylesheet" href="themes/jbosstheme/style/screen.css" type="text/css" media="screen">
+<link rel="stylesheet" href="themes/jbosstheme/style/print.css" type="text/css" media="print">
+<link rel="stylesheet" href="themes/jbosstheme/style/common.css" type="text/css" media="all">
+<link rel="stylesheet" href="themes/jbosstheme/style/layout_new_branding.css" type="text/css" media="all">
+
+<!--[if IE]>
+<link rel="stylesheet" type="text/css" href="themes/jbosstheme/style/iehacks.css" />
+<![endif]-->
+
+<script type="text/javascript" src="scripts/menu.js"></script>
+<script language="JavaScript" src="themes/jbosstheme/js/functions.js" type="text/javascript"></script>
+<script language="JavaScript" src="/elqNow/elqCfg.js" type="text/javascript"></script>
+<script language="JavaScript" src="/elqNow/elqImg.js" type="text/javascript"></script></head><body>
+
+<div class="brand_JEMS" id="container">
+
+<div id="TopLogo">
+  <a href="http://www.jboss.com"><img src="themes/jbosstheme/img/logo.gif" alt="JBoss - The Professional Open Source Company" border="0" /></a>
+</div>
+
+<div id="TopMenu">
+  <table cellpadding="0" cellspacing="0">
+  <tr>
+    <td class="menu_JBnetwork"><a href="http://network.jboss.com/">subscription</a></td>
+    <td class="menu_JBcom"><a href="http://www.jboss.com/">jboss.com</a></td>
+    <td class="menu_JBorg"><a href="http://labs.jboss.com">jboss.org</a></td>
+    <td class="menu_RH"><a href="http://www.redhat.com">redhat.com</a></td>
+  </tr>
+  </table>
+</div>
+
+<div id="ControlMenu">
+   <form id="TopSearch" action="search.jsp">
+  <ul>
+    <li><a href="http://www.jboss.com/fr/index"><img src="/images/languages/french.gif" border="0"></a></li>
+    <li><a href="http://de.jboss.com"><img src="http://www.jboss.com/images/languages/german.gif" border="0"></a></li>
+    <li><a href="http://www.jboss.com/index"><img src="/images/languages/english.gif" border="0"></a></li>
+    <li><a href="/index.html?op=loginscreen&module=user">Login</a></li>
+    <li><a href="/index.html?op=checkage&module=user">Register</a></li>
+    <li><a href="http://www.redhat.com/about/careers/">Careers</a></li>
+    <li><a href="/company/contact">Contact Us</a></li>
+    <li>
+      <input style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;" name="query" onfocus="SearchFocus(this)" onblur="SearchBlur(this)" value="Search..." />
+      <input class="searchbutton" type="image" src="themes/jbosstheme/img/spacer.gif" value="go" align="middle" />
+    </li>
+  </ul>
+  </form>
+  
+</div>
+  
+<div id="Breadcrumb">
+  <ul>
+    <li class="root"><a href="">Home</a></li>
+    <li><a href="">JBoss Enterprise Middleware System (JEMS)</a></li>
+  </ul>
+</div>
+
+
+<table cellpadding="0" cellspacing="0" id="BodyTable">
+<tr>
+  <td colspan="2" class="topheader"></td>
+</tr>
+<tr>
+<td class="leftside">
+<div id="LeftMenu">
+  <ul>
+    <li class="current">
+      <a href="/products/index">JBoss Middleware</a>
+      <ul>
+        <li><a href="/products/platforms/application">Application Platform</a></li>
+        <li><a href="/products/platforms/portals">Portal Platform</a></li>
+        <li><a href="/products/hibernate">Hibernate Framework</a></li>
+        <li><a href="/products/jbpm">jBPM Framework</a></li>
+        <li><a href="/products/rules">Rules Framework</a></li>
+        <li><a href="/products/seam">Seam Framework</a></li>
+        <a> </a>
+        <li><a href="/downloads/index">Download</a></li>
+        <li><a href="/docs/index">Documentation</a></li>
+        <li><a href="/docs/demos">TrailBlazers &amp; Demos</a></li>
+        <li><a href="/services/online_education">Online Education</a></li>
+      </ul>
+    </li>
+    
+    <li><a href="http://www.jboss.org">JBoss.org Community</a></li>
+    <li><a href="/services/index">Support Services</a></li>   
+    <li><a href="/partners/index">Partners</a></li>
+    <li><a href="/company/index">About Us</a></li>
+    <li><a href="http://www.jboss.com/jbossBlog/blog/" target="_blank">Blogs</a></li>
+    <li><a href="/opensource/index">Resource Centers</a></li>
+    <li><a href="http://store.jboss.com" target="_blank">JBoss Store</a></li>
+</ul>
+</div><!-- ### JEMS Ads - START -->
+
+<div id="LeftAds">
+<div class="item"><a href="/services/certification"><img src="/images/banners/jb_cert_ani_banner.gif" width="175" height="64" border="0"></a></div>
+  
+</div>
+
+<!-- ### JEMS Ads - START -->
+<div id="WhosOnline">
+
+<table width="175" border="0" cellspacing="0" cellpadding="0">
+
+<tr><td bgcolor="#eeeeee">&nbsp;</td></tr>
+
+<tr><td bgcolor="#eeeeee" style="font-size:10px; padding-left:5px;">&nbsp;<b>Online:</b>
+  19091 guests, <a href="index.html?module=user&op=whosonline">127 members</a></td></tr>
+
+<tr><td bgcolor="#eeeeee">&nbsp;</td></tr>
+
+<tr><td bgcolor="#eeeeee" style="font-size:10px; padding-left:5px;">&nbsp;<b>Monthly JBoss newsletter:</b>
+<form action="http://now.eloqua.com/f.asp" method=post style="padding:0pt;margin:0pt;">
+<input type="hidden" name="elqFormName" value="emailform"> 
+ <input type="hidden" name="elqSiteID" value="257"> 
+ <input type="hidden" name="elqDefaultTargetURL" value=""> 
+ <input type="hidden" name="elqPost" value="">
+<input name=email type=text style="margin-left:5px; margin-top:2px; border: 1px solid rgb(110, 110, 110); width: 120px; font-size: 10px;" onfocus="this.className=focus;if (this.value == my at email.address) this.value = ';" onblur="this.className=';if (this.value == ') this.value = my at email.address;" value="my at email.address"/>
+<input style="vertical-align:middle;" type="image" name="submit" border="0" src="/images/btn_go_grey.gif">
+</form>
+</td></tr>
+
+<tr><td bgcolor="#eeeeee">&nbsp;</td></tr>
+
+<tr><td><img vspace="1" src="images/side_nav_btm.gif" width="175" height="13"/></td></tr>
+</table>
+
+</div>
+</td><td class="bodycell">
+
+<div id="ContentContainer">
+
+
+
+
+
+
+
+
+
+<table border="0" cellspacing="8" width="95%" bgcolor="#FFFFFF">
+
+  <tr>
+    <td class="page" width="85%" valign="top">
+
+    <p>
+      <table class="wikitable" border="1">
+<tr><td><a class="wikipage" href="http://wiki.jboss.org/wiki/Wiki.jsp?page=Main">Home</a> </td><td> <a class="wikipage" href="http://wiki.jboss.org/wiki/Wiki.jsp?page=About">About</a> </td><td> <a class="wikipage" href="http://wiki.jboss.org/wiki/Wiki.jsp?page=FindPage">Search</a> </td><td> <a class="wikipage" href="http://wiki.jboss.org/wiki/Wiki.jsp?page=RecentChanges">Changes</a> </td><td> <a class="wikipage" href="http://wiki.jboss.org/wiki/Wiki.jsp?page=UnusedPages">Unused Pages</a> </td><td> <a class="wikipage" href="http://wiki.jboss.org/wiki/Wiki.jsp?page=UndefinedPages">Undefined Pages</a> </td><td> <a class="wikipage" href="http://wiki.jboss.org/wiki/Wiki.jsp?page=PageIndex">Index</a> </td><td> <a class="wikipage" href="http://wiki.jboss.org/wiki/Wiki.jsp?page=DocumentationLicense">License</a></td></tr>
+</table>
+
+      
+      </p>
+      <p><hr /></p>
+
+      <p>
+       
+          
+            <a href="http://wiki.jboss.org/wiki/Edit.jsp?page=JBossESBQuickStart">Edit this page</a>
+          
+       
+       </p>
+
+      <table width="100%" cellspacing="0" cellpadding="0" border="0">
+         <tr>
+            <td align="left">
+                <h1 class="pagename"><a name="Top">JBossESBQuickStart</a></h1>
+            </td>
+            <td align="right">
+
+<div class="searchbox">
+    <!-- SiteSearch Google -->
+	<!--
+    <FORM method=GET action="http://www.google.com/search">
+    <input type=hidden name=ie value=UTF-8>
+    <input type=hidden name=oe value=UTF-8>
+    <TABLE bgcolor="#FFFFFF"><tr><td>
+    <td>
+    <INPUT TYPE=text name=q size=31 maxlength=255 value="">
+    <INPUT type=submit name=btnG VALUE="Google Search">
+    <font size=-1>
+    <input type=hidden name=domains value="wiki.jboss.org"><br><input type=radio name=sitesearch value=""> WWW <input type=radio name=sitesearch value="wiki.jboss.org" checked> wiki.jboss.org <br>
+    </font>
+    </td></tr></TABLE>
+    </FORM>
+    -->
+    <!-- SiteSearch Google -->
+</div>
+</td>
+         </tr>
+         <tr>
+            <td colspan="2" class="breadcrumbs">Your trail: <a class="wikipage" href="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossESB">JBossESB</a></td>
+         </tr>
+      </table>
+
+      <hr />
+
+      
+         
+
+
+
+      
+
+      
+
+      
+
+      The purpose of this page is to document some basic &quot;How Tos&quot; associated with JBoss ESB development.  We assume that you have already correctly installed JBoss ESB and executed the testJBossESB.bat to prove your configuration.  
+<p>
+JBoss ESB 4.0 MR2 Quickstarts are included with the download. The following is a listing of the ones you'll find in 4.0 MR2:
+</p><p>
+<ul>
+<li> aggregator - splitter, aggregator and multi-JVM/ESB demonstration
+</li>
+<li> bpm_orchestration1 - demonstrates business process orchestration with jPBM
+</li>
+<li> business_service - demonstrates how to invoke an EJB3 component from an ESB action
+</li>
+<li> deadletter - demonstrates how to send a message in the <u>DeadLetter</u><a href="http://wiki.jboss.org/wiki/Edit.jsp?page=DeadLetter">?</a> Service
+</li>
+<li> fun_cbr - demonstrates dynamic/hot-deploy features of JBoss ESB & CBR
+</li>
+<li> helloworld - illustrates basic JMS listening
+</li>
+<li> helloworld_action - demonstrates the basic use of ESB actions
+</li>
+<li> helloworld_db_registration -  connects directly to the (<a class="wikipage" href="http://wiki.jboss.org/wiki/Wiki.jsp?page=MySQL">MySQL</a>) database to register the component
+</li>
+<li> helloworld_file_action - demonstrations the use of the File listener/poller
+</li>
+<li> helloworld_ftp_action - demonstrates the use of the FTP listener/poller
+</li>
+<li> helloworld_sql_action - demonstrates the use of the SQL listener/poller
+</li>
+<li> more_action - demonstrates more advanced uses of ESB actions
+</li>
+<li> scripting_groovy - demonstrates an implementation of a Groovy scripted action using the <u>GroovyActionProcessor</u><a href="http://wiki.jboss.org/wiki/Edit.jsp?page=GroovyActionProcessor">?</a>
+</li>
+<li> simple_cbr - a basic content-based routing (CBR) example using the Rules-based XPath DSL
+</li>
+<li> static_router - demonstrates static router by creating a file on an FTP server and showing the progress of a message through a static route
+</li>
+<li> static_router - demonstrates the static recipient list functionality
+</li>
+<li> transform_CSV2XML - demonstrates transforming a comma separated value (CSV) file to xml
+</li>
+<li> transform_EDI2XML_Groovy_XSLT - based on the project name, what do you think it does? ;-)
+</li>
+<li> transform_XML2POJO - demonstrates the use of Smooks for transforming an XML to multiple POJOs
+</li>
+<li> transform_XML2XML_date_manipulation - more advanced transformation example showing the use of Java & XSLT simultaneously.
+</li>
+<li> transform_XML2XML_simple - basic XSLT transformation
+</li>
+<li> webservice_bpel -  demonstrates how the <u>ActiveBPEL</u><a href="http://wiki.jboss.org/wiki/Edit.jsp?page=ActiveBPEL">?</a> BPEL Engine can be used to orchestrate business process flow through JBoss ESB
+</li>
+<li> webservice_jbossws_adapter_01 - demonstrates how to deploy a JSR181 Webservice endpoint on <a class="wikipage" href="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossESB">JBossESB</a> using the <u>JBossWSAdapter</u><a href="http://wiki.jboss.org/wiki/Edit.jsp?page=JBossWSAdapter">?</a> action
+</li>
+<li> webservice_war1 - demonstrates how to use an annotated web service (JSR 181) with ESB
+</li>
+</ul>
+</p><p>
+These additional Quickstarts are available in 4.2.GA svn:
+</p><p>
+<ul>
+<li> business_rules_service - demonstrates using the <u>BusinessRulesProcessor</u><a href="http://wiki.jboss.org/wiki/Edit.jsp?page=BusinessRulesProcessor">?</a> which allows for modification of the POJOs attached to an ESB Message with JBoss Rules
+</li>
+<li> helloworld_hibernate_action - demonstrates a Hibernate listener
+</li>
+<li> messagefilter - demonstrates how to filter a message based on content.
+</li>
+<li> messagestore -  demonstrates how to store a message in the <u>MessageStore</u><a href="http://wiki.jboss.org/wiki/Edit.jsp?page=MessageStore">?</a>
+</li>
+<li> recipient_list - demonstrates the EIP recipient list pattern using content based and static routers
+</li>
+<li> spring_aop - demonstrates the use of Spring AOP - specifies Spring bean XML definitions in jboss-esb.xml, looks up the beans in the Action class
+</li>
+<li> spring_helloworld - demonstrates the use of Spring based action invocations
+</li>
+<li> spring_jpetstore - demonstrates advanced use of Spring based action invocations - includes AOP, iBatis, a datasource and transaction management.
+</li>
+<li> wiretap - demonstrates the EIP wiretap list pattern using content based and static routers
+</li>
+</ul>
+</p>
+
+      
+
+      <br clear="all" />
+
+      
+
+      <p><hr />
+      <table border="0" width="100%">
+        <tr>
+          <td align="left">
+             <a href="#Top">Go to top</a>&nbsp;&nbsp;
+             
+                 <a href="http://wiki.jboss.org/wiki/Edit.jsp?page=JBossESBQuickStart">Edit this page</a>&nbsp;&nbsp;
+             
+             <a class="pageinfo" href="http://wiki.jboss.org/wiki/PageInfo.jsp?page=JBossESBQuickStart">More info...</a>&nbsp;&nbsp;
+             <a href="javascript:window.open('http://wiki.jboss.org/wiki/Upload.jsp?page=JBossESBQuickStart','Upload','width=640,height=480,toolbar=1,menubar=1,scrollbars=1,resizable=1,').focus()">Attach file...</a>
+             <br />
+          </td>
+        </tr>
+        <tr>
+          <td align="left">
+             <font size="-1">
+             
+             
+                 <i>This page last changed on <a href="http://wiki.jboss.org/wiki/Diff.jsp?page=JBossESBQuickStart&amp;r1=4&amp;r2=3">22-Jun-2007 14:55:28 EDT</a> by ldimaggi at redhat.com.</i>
+             
+
+             
+ 
+             
+
+             </font>
+          </td>
+        </tr>
+      </table>
+      </p>
+
+      
+
+      
+
+      
+
+      
+
+      
+
+      
+
+      
+
+      
+
+    </td>
+  </tr>
+
+</table>
+
+
+</div>
+</td>
+</tr>
+</table>
+
+
+<div id="footer"> 
+<div class="leftcurve"></div>
+<div>
+<a href="http://www.redhat.com"><img src="jbosstheme/img/logo_rh_home.png" alt=" Red Hat" width="96" height="31" border="0" /></a><br />
+<br />
+<br />
+</div>
+<span style="text-align:center">
+&copy; 2007 Red Hat Middleware, LLC. All rights reserved.
+ <a href="http://www.jboss.com/privacy_policy">Privacy Policy</a>
+</span>
+</div>
+
+</div>
+
+<!-- SiteCatalyst code version: H.1.
+ Copyright 1997-2005 Omniture, Inc. More info available at
+ http://www.omniture.com sec -->
+<div id="oTags">
+<script type="text/javascript" src="/scripts/s_code.js"></script>
+<script><!--
+ /* You may give each page an identifying name, server, and channel on
+ the next lines. */
+ s.pageName="" 
+ s.server=""
+ s.channel=""
+ s.pageType=""
+ s.prop1=""
+/* E-commerce Variables */
+s.campaign=""
+s.eVar1=""
+s.eVar2=""
+s.eVar3=""
+s.events=""
+s.products=""
+s.state=""
+s.zip=""
+s.purchaseID=""
+
+/************* DO NOT ALTER ANYTHING BELOW THIS LINE ! **************/
+var s_code=s.t();if(s_code)document.write(s_code)//--></script> 
+
+<script type="text/javascript"><!--
+if(navigator.appVersion.indexOf('MSIE')>=0)document.write(unescape('%3C')+'\!-'+'-')
+//--></script><noscript><img
+src="https://smtrcs.redhat.com/b/ss/redhatjboss/1/H.2--NS/0"
+height="1" width="1" border="0" alt="" /></noscript><!--/DO NOT REMOVE/-->
+</div>
+
+<!-- End SiteCatalyst code version: H.1. -->
+
+</body>
+</html>

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/extras/jaxbintros/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/extras/jaxbintros/build.xml	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/extras/jaxbintros/build.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -23,7 +23,6 @@
         <path id="test-compile-classpath">
             <path refid="compile-classpath" />
             <fileset dir="target" includes="*.jar" />
-            <fileset dir="../../lib/ext" includes="junit*.jar" />
         </path>
     	<javac srcdir="src/test/java" destdir="target/test/classes" debug="on" classpathref="test-compile-classpath" />
 		<junit fork="yes" haltonfailure="true" haltonerror="true" showoutput="off">

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/extras/jaxbintros/lib/junit-4.1.jar (from rev 13241, labs/jbossesb/trunk/product/extras/jaxbintros/lib/junit-4.1.jar)
===================================================================
(Binary files differ)

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/install/conf/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/install/conf/jbossesb-properties.xml	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/install/conf/jbossesb-properties.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -86,6 +86,7 @@
 		
     </properties>    
     <properties name="filters">
-    	<property name="org.jboss.soa.esb.courier.filter.1" value="org.jboss.internal.soa.esb.message.metadata.MetaDataFilter"/>
+    	<property name="org.jboss.soa.esb.filter.1" value="org.jboss.internal.soa.esb.message.filter.MetaDataFilter"/>
+    	<property name="org.jboss.soa.esb.filter.2" value="org.jboss.internal.soa.esb.message.filter.GatewayFilter"/>
     </properties>
 </esb>

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/install/tomcat/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/install/tomcat/jbossesb-properties.xml	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/install/tomcat/jbossesb-properties.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -87,6 +87,7 @@
     	<property name="org.jboss.soa.esb.routing.cbrClass" value="org.jboss.internal.soa.esb.services.routing.cbr.JBossRulesRouter"/>
     </properties>
     <properties name="filters">
-    	<property name="org.jboss.soa.esb.courier.filter.1" value="org.jboss.internal.soa.esb.message.metadata.MetaDataFilter"/>
+    	<property name="org.jboss.soa.esb.filter.1" value="org.jboss.internal.soa.esb.message.filter.MetaDataFilter"/>
+    	<property name="org.jboss.soa.esb.filter.2" value="org.jboss.internal.soa.esb.message.filter.GatewayFilter"/>
     </properties>
 </esb>

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/product.properties
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/product.properties	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/product.properties	2007-07-08 17:12:53 UTC (rev 13243)
@@ -8,9 +8,9 @@
 org.jboss.esb.build.tests=no
 
 org.jboss.esb.alltests.build=yes
-org.jboss.esb.jboss.home=.
+org.jboss.esb.jboss.home=build/jbossesb-server-4.2MR2
 
-org.jboss.esb.test.ftp.hostname=ftp.ncl.jboss.com
-org.jboss.esb.test.ftp.user=kurt
-org.jboss.esb.test.ftp.pwd=password
-org.jboss.esb.test.ftp.dir=/home/kurt
\ No newline at end of file
+org.jboss.esb.test.ftp.hostname=localhost
+org.jboss.esb.test.ftp.user=sifo
+org.jboss.esb.test.ftp.pwd=sifo
+org.jboss.esb.test.ftp.dir=/home/sifo/input

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/build.xml	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/build.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -21,12 +21,6 @@
 		<pathelement location="${gendir}/classes"/>
 	</path>
 
-	<path id="emma.libs">
-        <fileset dir="../lib/ext" includes="emma*.jar"/>
-    </path>
-    <taskdef resource="emma_ant.properties" classpathref="emma.libs" />
-
-
     <target name="org.jboss.esb.rosetta.init">
         <tstamp>
             <format property="TODAY" pattern="dd-MM-yy"/>
@@ -114,18 +108,6 @@
 
 	<property name="coverage.dir" location="${org.jboss.esb.internal.dest}/tests/coverage"/>
 
-	<target name="instr-report">
-        <emma>
-            <report sort="+block,+name,+method,+class" metrics="method:70,block:80,line:80,class:100">
-                <fileset dir="${coverage.dir}" >
-                    <include name="*/*.emma" />
-                </fileset>
-                <sourcepath><dirset dir="./" includes="src" /></sourcepath>
-                <txt outfile="${coverage.dir}/coverage.txt"/>
-            </report>
-        </emma>
-    </target>
 
 
-
 </project>

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -37,7 +37,7 @@
 import org.jboss.soa.esb.couriers.CourierTimeoutException;
 import org.jboss.soa.esb.couriers.CourierUtil;
 import org.jboss.soa.esb.couriers.TwoWayCourier;
-import org.jboss.soa.esb.couriers.filter.FilterManager;
+import org.jboss.soa.esb.filter.FilterManager;
 import org.jboss.soa.esb.message.Message;
 
 /**
@@ -183,7 +183,7 @@
 
                 try
                 {
-                    message = FilterManager.getInstance().doOutputWork(message);
+                    message = FilterManager.getInstance().doOutputWork(message, null);
                     
                     return _deliverCourier.deliver(message);
                 }
@@ -222,7 +222,7 @@
 			throw new CourierException("No courier defined for pick ups");
 		final Message result = courier.pickup(waitTime);
                 
-                return (result == null ? null : FilterManager.getInstance().doInputWork(result)) ;
+                return (result == null ? null : FilterManager.getInstance().doInputWork(result, null)) ;
 	}
         
         public void cleanup ()

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/internal/soa/esb/message/filter (from rev 13241, labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/filter)

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/GatewayFilter.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/GatewayFilter.java	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/GatewayFilter.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,109 +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.internal.soa.esb.message.filter;
-
-import java.io.File;
-import java.util.Map;
-
-import org.jboss.soa.esb.addressing.eprs.JDBCEpr;
-import org.jboss.soa.esb.addressing.eprs.JMSEpr;
-import org.jboss.soa.esb.common.Environment;
-import org.jboss.soa.esb.couriers.CourierException;
-import org.jboss.soa.esb.filter.FilterManager;
-import org.jboss.soa.esb.filter.InputOutputFilter;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.listeners.ListenerUtil;
-import org.jboss.soa.esb.message.Message;
-
-/**
- * An inputoutput filter is called when the message is being received/sent and
- * after it has been received from the transport/before it is passed to the
- * transport. Implementations may augment or modify the message en route.
- * Implementations that are pure output or pure input can just override the
- * desired operation.
- * 
- * This one adds some metadata to the message as it flows through the ESB.
- * 
- * @author marklittle
- */
-
-public class GatewayFilter extends InputOutputFilter
-{
-    public Message onOutput (Message msg, Map<String, Object> params)
-	    throws CourierException
-    {
-	if (params != null)
-	{
-	    /*
-                 * We don't need to check to see if we're deployed on a gateway.
-                 * If we aren't, then none of these objects will be present
-                 * anyway!
-                 */
-
-	    File inFile = (File) params.get(Environment.ORIGINAL_FILE);
-
-	    if (inFile != null)
-		msg.getProperties().setProperty(
-			Environment.ORIGINAL_FILE_NAME_MSG_PROP,
-			inFile.getName());
-
-	    ConfigTree config = (ConfigTree) params
-		    .get(Environment.GATEWAY_CONFIG);
-
-	    if (config != null)
-	    {
-		try
-		{
-        		String url = ListenerUtil.obtainAtt(config, JDBCEpr.URL_TAG,
-        			null);
-        
-        		if (url != null)
-        		    msg.getProperties().setProperty(
-        			    Environment.ORIGINAL_URL_PROP, url);
-		}
-		catch (Throwable ex)
-		{
-		    FilterManager._logger.warn("GatewayFilter encountered problem during JDBC config check.", ex);
-		}
-
-		try
-		{
-        		String queueName = ListenerUtil.obtainAtt(config,
-        			JMSEpr.DESTINATION_NAME_TAG, null);
-        
-        		if (queueName != null)
-        		    msg.getProperties()
-        			    .setProperty(
-        				    Environment.ORIGINAL_QUEUE_NAME_MSG_PROP,
-        				    queueName);
-		}
-		catch (Throwable ex)
-		{
-		    FilterManager._logger.warn("GatewayFilter encountered problem during JMS config check.", ex);
-		}
-	    }
-	}
-
-	return msg;
-    }
-}

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/GatewayFilter.java (from rev 13241, labs/jbossesb/trunk/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	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/GatewayFilter.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,109 @@
+/*
+ * 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.internal.soa.esb.message.filter;
+
+import java.io.File;
+import java.util.Map;
+
+import org.jboss.soa.esb.addressing.eprs.JDBCEpr;
+import org.jboss.soa.esb.addressing.eprs.JMSEpr;
+import org.jboss.soa.esb.common.Environment;
+import org.jboss.soa.esb.couriers.CourierException;
+import org.jboss.soa.esb.filter.FilterManager;
+import org.jboss.soa.esb.filter.InputOutputFilter;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.listeners.ListenerUtil;
+import org.jboss.soa.esb.message.Message;
+
+/**
+ * An inputoutput filter is called when the message is being received/sent and
+ * after it has been received from the transport/before it is passed to the
+ * transport. Implementations may augment or modify the message en route.
+ * Implementations that are pure output or pure input can just override the
+ * desired operation.
+ * 
+ * This one adds some metadata to the message as it flows through the ESB.
+ * 
+ * @author marklittle
+ */
+
+public class GatewayFilter extends InputOutputFilter
+{
+    public Message onOutput (Message msg, Map<String, Object> params)
+	    throws CourierException
+    {
+	if (params != null)
+	{
+	    /*
+                 * We don't need to check to see if we're deployed on a gateway.
+                 * If we aren't, then none of these objects will be present
+                 * anyway!
+                 */
+
+	    File inFile = (File) params.get(Environment.ORIGINAL_FILE);
+
+	    if (inFile != null)
+		msg.getProperties().setProperty(
+			Environment.ORIGINAL_FILE_NAME_MSG_PROP,
+			inFile.getName());
+
+	    ConfigTree config = (ConfigTree) params
+		    .get(Environment.GATEWAY_CONFIG);
+
+	    if (config != null)
+	    {
+		try
+		{
+        		String url = ListenerUtil.obtainAtt(config, JDBCEpr.URL_TAG,
+        			null);
+        
+        		if (url != null)
+        		    msg.getProperties().setProperty(
+        			    Environment.ORIGINAL_URL_PROP, url);
+		}
+		catch (Throwable ex)
+		{
+		    FilterManager._logger.warn("GatewayFilter encountered problem during JDBC config check.", ex);
+		}
+
+		try
+		{
+        		String queueName = ListenerUtil.obtainAtt(config,
+        			JMSEpr.DESTINATION_NAME_TAG, null);
+        
+        		if (queueName != null)
+        		    msg.getProperties()
+        			    .setProperty(
+        				    Environment.ORIGINAL_QUEUE_NAME_MSG_PROP,
+        				    queueName);
+		}
+		catch (Throwable ex)
+		{
+		    FilterManager._logger.warn("GatewayFilter encountered problem during JMS config check.", ex);
+		}
+	    }
+	}
+
+	return msg;
+    }
+}

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/MetaDataFilter.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/MetaDataFilter.java	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/MetaDataFilter.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,165 +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.internal.soa.esb.message.filter;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.util.Calendar;
-import java.util.Map;
-
-import org.jboss.soa.esb.addressing.EPR;
-import org.jboss.soa.esb.addressing.eprs.FTPEpr;
-import org.jboss.soa.esb.addressing.eprs.FileEpr;
-import org.jboss.soa.esb.addressing.eprs.HibernateEpr;
-import org.jboss.soa.esb.addressing.eprs.JDBCEpr;
-import org.jboss.soa.esb.addressing.eprs.JMSEpr;
-import org.jboss.soa.esb.common.Environment;
-import org.jboss.soa.esb.common.ModulePropertyManager;
-import org.jboss.soa.esb.couriers.CourierException;
-import org.jboss.soa.esb.filter.InputOutputFilter;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.Properties;
-
-/**
- * An inputoutput filter is called when the message is being received/sent and
- * after it has been received from the transport/before it is passed to the
- * transport. Implementations may augment or modify the message en route.
- * Implementations that are pure output or pure input can just override the
- * desired operation.
- * 
- * This one adds some metadata to the message as it flows through the ESB.
- * 
- * @author marklittle
- */
-
-public class MetaDataFilter extends InputOutputFilter
-{
-    public Message onOutput (Message msg, Map<String, Object> params) throws CourierException
-    {
-	final Environment.Transports type;
-	final String name;
-	EPR destination = msg.getHeader().getCall().getTo();
-	if (destination != null)
-	{
-	    if (destination instanceof FTPEpr)
-	    {
-		try
-		{
-		    type = Environment.Transports.FTP;
-
-		    String dir = ModulePropertyManager.getPropertyManager(
-			    ModulePropertyManager.TRANSPORTS_MODULE)
-			    .getProperty(Environment.FTP_LOCALDIR,
-				    System.getProperty("java.io.tmpdir"));
-
-		    name = dir
-			    + File.separator
-			    + msg.getHeader().getCall().getMessageID()
-				    .toString()
-			    + ((FTPEpr) destination).getPostDirectory();
-		}
-		catch (URISyntaxException ex)
-		{
-		    throw new CourierException(ex);
-		}
-	    }
-	    else if (destination instanceof FileEpr)
-	    {
-		try
-		{
-		    type = Environment.Transports.File;
-
-		    name = ((FileEpr) destination).getURL()
-			    + File.separator
-			    + msg.getHeader().getCall().getMessageID()
-				    .toString()
-			    + ((FileEpr) destination).getPostSuffix();
-		}
-		catch (MalformedURLException ex)
-		{
-		    throw new CourierException(ex);
-		}
-		catch (URISyntaxException ex)
-		{
-		    throw new CourierException(ex);
-		}
-	    }
-	    else if (destination instanceof JMSEpr)
-	    {
-		type = Environment.Transports.JMS;
-
-		name = destination.getAddr().toString();
-	    }
-	    else if (destination instanceof JDBCEpr)
-	    {
-		type = Environment.Transports.SQL;
-
-		name = destination.getAddr().toString();
-	    }
-	    else if (destination instanceof HibernateEpr)
-	    {
-		type = Environment.Transports.Hibernate;
-		name = destination.getAddr().toString();
-	    }
-	    else
-	    {
-		type = null;
-		name = null;
-	    }
-	}
-	else
-	{
-	    type = null;
-	    name = null;
-	}
-
-	final Properties props = msg.getProperties();
-	setProperty(props, Environment.TRANSPORT_TYPE, type);
-	setProperty(props, Environment.MESSAGE_SOURCE, name);
-	props.setProperty(Environment.MESSAGE_ENTRY_TIME, Calendar
-		.getInstance().getTime().toString());
-	return msg;
-    }
-
-    public Message onInput (Message msg, Map<String, Object> params) throws CourierException
-    {
-	msg.getProperties().setProperty(Environment.MESSAGE_EXIT_TIME,
-		Calendar.getInstance().getTime().toString());
-
-	return msg;
-    }
-
-    private void setProperty (final Properties props, final String name,
-	    final Object value)
-    {
-	if (value == null)
-	{
-	    props.remove(name);
-	}
-	else
-	{
-	    props.setProperty(name, value);
-	}
-    }
-}

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/MetaDataFilter.java (from rev 13241, labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/MetaDataFilter.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/MetaDataFilter.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/MetaDataFilter.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,165 @@
+/*
+ * 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.internal.soa.esb.message.filter;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.util.Calendar;
+import java.util.Map;
+
+import org.jboss.soa.esb.addressing.EPR;
+import org.jboss.soa.esb.addressing.eprs.FTPEpr;
+import org.jboss.soa.esb.addressing.eprs.FileEpr;
+import org.jboss.soa.esb.addressing.eprs.HibernateEpr;
+import org.jboss.soa.esb.addressing.eprs.JDBCEpr;
+import org.jboss.soa.esb.addressing.eprs.JMSEpr;
+import org.jboss.soa.esb.common.Environment;
+import org.jboss.soa.esb.common.ModulePropertyManager;
+import org.jboss.soa.esb.couriers.CourierException;
+import org.jboss.soa.esb.filter.InputOutputFilter;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.Properties;
+
+/**
+ * An inputoutput filter is called when the message is being received/sent and
+ * after it has been received from the transport/before it is passed to the
+ * transport. Implementations may augment or modify the message en route.
+ * Implementations that are pure output or pure input can just override the
+ * desired operation.
+ * 
+ * This one adds some metadata to the message as it flows through the ESB.
+ * 
+ * @author marklittle
+ */
+
+public class MetaDataFilter extends InputOutputFilter
+{
+    public Message onOutput (Message msg, Map<String, Object> params) throws CourierException
+    {
+	final Environment.Transports type;
+	final String name;
+	EPR destination = msg.getHeader().getCall().getTo();
+	if (destination != null)
+	{
+	    if (destination instanceof FTPEpr)
+	    {
+		try
+		{
+		    type = Environment.Transports.FTP;
+
+		    String dir = ModulePropertyManager.getPropertyManager(
+			    ModulePropertyManager.TRANSPORTS_MODULE)
+			    .getProperty(Environment.FTP_LOCALDIR,
+				    System.getProperty("java.io.tmpdir"));
+
+		    name = dir
+			    + File.separator
+			    + msg.getHeader().getCall().getMessageID()
+				    .toString()
+			    + ((FTPEpr) destination).getPostDirectory();
+		}
+		catch (URISyntaxException ex)
+		{
+		    throw new CourierException(ex);
+		}
+	    }
+	    else if (destination instanceof FileEpr)
+	    {
+		try
+		{
+		    type = Environment.Transports.File;
+
+		    name = ((FileEpr) destination).getURL()
+			    + File.separator
+			    + msg.getHeader().getCall().getMessageID()
+				    .toString()
+			    + ((FileEpr) destination).getPostSuffix();
+		}
+		catch (MalformedURLException ex)
+		{
+		    throw new CourierException(ex);
+		}
+		catch (URISyntaxException ex)
+		{
+		    throw new CourierException(ex);
+		}
+	    }
+	    else if (destination instanceof JMSEpr)
+	    {
+		type = Environment.Transports.JMS;
+
+		name = destination.getAddr().toString();
+	    }
+	    else if (destination instanceof JDBCEpr)
+	    {
+		type = Environment.Transports.SQL;
+
+		name = destination.getAddr().toString();
+	    }
+	    else if (destination instanceof HibernateEpr)
+	    {
+		type = Environment.Transports.Hibernate;
+		name = destination.getAddr().toString();
+	    }
+	    else
+	    {
+		type = null;
+		name = null;
+	    }
+	}
+	else
+	{
+	    type = null;
+	    name = null;
+	}
+
+	final Properties props = msg.getProperties();
+	setProperty(props, Environment.TRANSPORT_TYPE, type);
+	setProperty(props, Environment.MESSAGE_SOURCE, name);
+	props.setProperty(Environment.MESSAGE_ENTRY_TIME, Calendar
+		.getInstance().getTime().toString());
+	return msg;
+    }
+
+    public Message onInput (Message msg, Map<String, Object> params) throws CourierException
+    {
+	msg.getProperties().setProperty(Environment.MESSAGE_EXIT_TIME,
+		Calendar.getInstance().getTime().toString());
+
+	return msg;
+    }
+
+    private void setProperty (final Properties props, final String name,
+	    final Object value)
+    {
+	if (value == null)
+	{
+	    props.remove(name);
+	}
+	else
+	{
+	    props.setProperty(name, value);
+	}
+    }
+}

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/actions/SystemPrintln.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/actions/SystemPrintln.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/actions/SystemPrintln.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -61,7 +61,7 @@
 		Object messageObject = ActionUtils.getTaskObject(message);
 		PrintStream stream = (useOutputStream ? System.out : System.err);
 		
-		System.out.println(printlnMessage + ": ");
+		stream.println(printlnMessage + ": ");
 		
 		if (printFullMessage && (message != null))
 		{

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-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/actions/naming/FileNameGeneratorAction.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -32,6 +32,7 @@
 import org.jboss.soa.esb.actions.ActionProcessingException;
 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;
@@ -51,7 +52,7 @@
 		BeanConfiguredAction {
 
 	/** Property name for incoming file name */
-	private String fileNameProperty = AbstractFileGateway.ORIGINAL_FILE_NAME_MSG_PROP;
+	private String fileNameProperty = Environment.ORIGINAL_FILE_NAME_MSG_PROP;
 
 	/** Property name for filename after processing */
 	private String resultProperty = DEFAULT_RESULT_PROPERTY;

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/addressing/Call.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/addressing/Call.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/addressing/Call.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -193,7 +193,7 @@
 	}
 	
 	/**
-	 * Set the MessageId for this instance.
+	 * Set the MessageID for this instance.
 	 * 
 	 * @param uri the value to use.
 	 */

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/common/Environment.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/common/Environment.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -129,7 +129,7 @@
 	public static final String MSG_STORE_JCR_ROOT_NODE_PATH		= "org.jboss.soa.esb.persistence.jcr.root.node.path";	
 	
 	/*
-	 * Some message properties.
+	 * Some message metadata properties.
 	 */
 	
 	public static final String TRANSPORT_TYPE = "org.jboss.soa.esb.message.transport.type";
@@ -137,14 +137,33 @@
 	public static final String MESSAGE_ENTRY_TIME = "org.jboss.soa.esb.message.time.dob"; // time born
 	public static final String MESSAGE_EXIT_TIME = "org.jboss.soa.esb.message.time.dod";  // time died
 	
+	/** Message property name for original filename */
+	
+	public static final String ORIGINAL_FILE_NAME_MSG_PROP = "org.jboss.soa.esb.gateway.original.file.name";
+	public static final String ORIGINAL_QUEUE_NAME_MSG_PROP = "org.jboss.soa.esb.gateway.original.queue.name";
+	public static final String ORIGINAL_URL_PROP = "org.jboss.soa.esb.gateway.original.url";
+	
 	/*
+	 * Some gateway attachment names.
+	 */
+	
+	public static final String ORIGINAL_FILE = "org.jboss.soa.esb.gateway.file";
+	public static final String GATEWAY_CONFIG = "org.jboss.soa.esb.gateway.config";
+	
+	/*
+	 * Some JMS specific message element names.
+	 */
+	
+	public static final String JMS_MESSAGE_ID = "org.jboss.soa.esb.message.transport.jms.messageID";
+	
+	/*
 	 * Filter properties should be identified by:
 	 * 
-	 * org.jboss.soa.esb.courier.filter.<number>
+	 * org.jboss.soa.esb.filter.<number>
 	 * 
 	 * and will be called in increasing order of <number>. Same <number> may be
 	 * called arbitrarily.
 	 */
 
-	public static final String FILTER_NAME = "org.jboss.soa.esb.courier.filter";
+	public static final String FILTER_NAME = "org.jboss.soa.esb.filter";
 }

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

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/filter/FilterManager.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/filter/FilterManager.java	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/filter/FilterManager.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,195 +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.filter;
-
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.TreeMap;
-
-import org.apache.log4j.Logger;
-import org.jboss.soa.esb.common.Environment;
-import org.jboss.soa.esb.common.ModulePropertyManager;
-import org.jboss.soa.esb.couriers.CourierException;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.util.ClassUtil;
-
-import com.arjuna.common.util.propertyservice.PropertyManager;
-
-/**
- * The FilterManager process messages through the various input and output
- * filters that have been registered via the configuration file. Currently this
- * is the same processing for all services/clients, i.e., there is no
- * per-process/per-client processing, it is all at the ESB instance level.
- * 
- * @author marklittle
- */
-
-public class FilterManager
-{
-    public static final synchronized FilterManager getInstance ()
-    {
-	if (_instance == null)
-	    _instance = new FilterManager();
-
-	return _instance;
-    }
-
-    /**
-         * Iterate through the registered output filters, allowing them to
-         * augment/modify the message. The first error causes the iteration to
-         * stop and the send to fail.
-         * 
-         * @param msg
-         *                the original message.
-         * @return the resultant message.
-         * @throws CourierException
-         *                 thrown if there is any error during processing.
-         */
-
-    public Message doOutputWork (Message msg, Map<String, Object> params)
-	    throws CourierException
-    {
-	if ((_filters == null) || (msg == null))
-	    return msg;
-
-	for (int i = 0; i < _filters.length; i++)
-	{
-	    if (_filters[i] != null)
-		msg = _filters[i].onOutput(msg, params);
-	}
-
-	return msg;
-    }
-
-    /**
-         * Iterate through the registered input filters, allowing them to
-         * augment/modify the message. The first error causes the iteration to
-         * stop and the receive to fail.
-         * 
-         * @param msg
-         *                the original message.
-         * @return the resultant message.
-         * @throws CourierException
-         *                 thrown if there is any error during processing.
-         */
-
-    public Message doInputWork (Message msg, Map<String, Object> params)
-	    throws CourierException
-    {
-	if ((_filters == null) || (msg == null))
-	    return msg;
-
-	for (int i = 0; i < _filters.length; i++)
-	{
-	    if (_filters[i] != null)
-		msg = _filters[i].onInput(msg, params);
-	}
-
-	return msg;
-    }
-
-    private FilterManager()
-    {
-	PropertyManager pm = ModulePropertyManager
-		.getPropertyManager(ModulePropertyManager.FILTER_MODULE);
-	Properties props = pm.getProperties();
-
-	if (props != null)
-	{
-	    Enumeration names = props.propertyNames();
-	    TreeMap<Integer, String> map = new TreeMap<Integer, String>();
-
-	    /*
-                 * Go through the list of attributes and pull out those that
-                 * refer to filters. Make sure we order them according to their
-                 * names.
-                 */
-
-	    while (names.hasMoreElements())
-	    {
-		String attrName = (String) names.nextElement();
-
-		if (attrName.startsWith(Environment.FILTER_NAME))
-		{
-		    String order = attrName.substring(Environment.FILTER_NAME
-			    .length() + 1);
-		    Integer value;
-
-		    try
-		    {
-			value = new Integer(order);
-		    }
-		    catch (NumberFormatException ex)
-		    {
-			throw new RuntimeException("Filter name " + order
-				+ " is invalid!");
-		    }
-
-		    map.put(value, props.getProperty(attrName));
-		}
-	    }
-
-	    if (map.size() > 0)
-	    {
-		Collection<String> ordered = map.values();
-		Iterator<String> iter = ordered.iterator();
-		int index = 0;
-
-		_filters = new InputOutputFilter[map.size()];
-
-		while (iter.hasNext())
-		{
-		    String filterName = iter.next();
-
-		    try
-		    {
-			Class c = ClassUtil.forName(filterName, getClass());
-			InputOutputFilter theFilter = (InputOutputFilter) c
-				.newInstance();
-
-			_filters[index++] = theFilter;
-		    }
-		    catch (ClassNotFoundException ex)
-		    {
-			_logger.warn("FilterManager problem loading class.", ex);
-		    }
-		    catch (Throwable ex)
-		    {
-			_logger.warn("FilterManager problem during load.", ex);
-		    }
-		}
-	    }
-	}
-    }
-
-    private InputOutputFilter[] _filters;
-
-    // It's public so all filters can use it if necessary.
-    
-    public final static Logger _logger = Logger.getLogger(FilterManager.class);
-
-    private static FilterManager _instance = null;
-}

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/filter/FilterManager.java (from rev 13241, labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/filter/FilterManager.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/filter/FilterManager.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/filter/FilterManager.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,195 @@
+/*
+ * 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.filter;
+
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeMap;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.common.Environment;
+import org.jboss.soa.esb.common.ModulePropertyManager;
+import org.jboss.soa.esb.couriers.CourierException;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.util.ClassUtil;
+
+import com.arjuna.common.util.propertyservice.PropertyManager;
+
+/**
+ * The FilterManager process messages through the various input and output
+ * filters that have been registered via the configuration file. Currently this
+ * is the same processing for all services/clients, i.e., there is no
+ * per-process/per-client processing, it is all at the ESB instance level.
+ * 
+ * @author marklittle
+ */
+
+public class FilterManager
+{
+    public static final synchronized FilterManager getInstance ()
+    {
+	if (_instance == null)
+	    _instance = new FilterManager();
+
+	return _instance;
+    }
+
+    /**
+         * Iterate through the registered output filters, allowing them to
+         * augment/modify the message. The first error causes the iteration to
+         * stop and the send to fail.
+         * 
+         * @param msg
+         *                the original message.
+         * @return the resultant message.
+         * @throws CourierException
+         *                 thrown if there is any error during processing.
+         */
+
+    public Message doOutputWork (Message msg, Map<String, Object> params)
+	    throws CourierException
+    {
+	if ((_filters == null) || (msg == null))
+	    return msg;
+
+	for (int i = 0; i < _filters.length; i++)
+	{
+	    if (_filters[i] != null)
+		msg = _filters[i].onOutput(msg, params);
+	}
+
+	return msg;
+    }
+
+    /**
+         * Iterate through the registered input filters, allowing them to
+         * augment/modify the message. The first error causes the iteration to
+         * stop and the receive to fail.
+         * 
+         * @param msg
+         *                the original message.
+         * @return the resultant message.
+         * @throws CourierException
+         *                 thrown if there is any error during processing.
+         */
+
+    public Message doInputWork (Message msg, Map<String, Object> params)
+	    throws CourierException
+    {
+	if ((_filters == null) || (msg == null))
+	    return msg;
+
+	for (int i = 0; i < _filters.length; i++)
+	{
+	    if (_filters[i] != null)
+		msg = _filters[i].onInput(msg, params);
+	}
+
+	return msg;
+    }
+
+    private FilterManager()
+    {
+	PropertyManager pm = ModulePropertyManager
+		.getPropertyManager(ModulePropertyManager.FILTER_MODULE);
+	Properties props = pm.getProperties();
+
+	if (props != null)
+	{
+	    Enumeration names = props.propertyNames();
+	    TreeMap<Integer, String> map = new TreeMap<Integer, String>();
+
+	    /*
+                 * Go through the list of attributes and pull out those that
+                 * refer to filters. Make sure we order them according to their
+                 * names.
+                 */
+
+	    while (names.hasMoreElements())
+	    {
+		String attrName = (String) names.nextElement();
+
+		if (attrName.startsWith(Environment.FILTER_NAME))
+		{
+		    String order = attrName.substring(Environment.FILTER_NAME
+			    .length() + 1);
+		    Integer value;
+
+		    try
+		    {
+			value = new Integer(order);
+		    }
+		    catch (NumberFormatException ex)
+		    {
+			throw new RuntimeException("Filter name " + order
+				+ " is invalid!");
+		    }
+
+		    map.put(value, props.getProperty(attrName));
+		}
+	    }
+
+	    if (map.size() > 0)
+	    {
+		Collection<String> ordered = map.values();
+		Iterator<String> iter = ordered.iterator();
+		int index = 0;
+
+		_filters = new InputOutputFilter[map.size()];
+
+		while (iter.hasNext())
+		{
+		    String filterName = iter.next();
+
+		    try
+		    {
+			Class c = ClassUtil.forName(filterName, getClass());
+			InputOutputFilter theFilter = (InputOutputFilter) c
+				.newInstance();
+
+			_filters[index++] = theFilter;
+		    }
+		    catch (ClassNotFoundException ex)
+		    {
+			_logger.warn("FilterManager problem loading class.", ex);
+		    }
+		    catch (Throwable ex)
+		    {
+			_logger.warn("FilterManager problem during load.", ex);
+		    }
+		}
+	    }
+	}
+    }
+
+    private InputOutputFilter[] _filters;
+
+    // It's public so all filters can use it if necessary.
+    
+    public final static Logger _logger = Logger.getLogger(FilterManager.class);
+
+    private static FilterManager _instance = null;
+}

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/filter/InputOutputFilter.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/filter/InputOutputFilter.java	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/filter/InputOutputFilter.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,68 +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.filter;
-
-import java.util.Map;
-
-import org.jboss.soa.esb.couriers.CourierException;
-import org.jboss.soa.esb.message.Message;
-
-/**
- * An inputoutput filter is called when the message is being received/sent and after it
- * has been received from the transport/before it is passed to the transport.
- * Implementations may augment or modify the message en route. Implementations that
- * are pure output or pure input can just override the desired operation.
- * 
- * @author marklittle
- */
-
-public class InputOutputFilter
-{	
-	/**
-	 * Called as the message flows towards the transport.
-	 * 
-	 * @param msg the message
-	 * @param params additional information
-	 * @return an augmented message (or the original message)
-	 * @throws CourierException thrown if an error occurs.
-	 */
-	
-	public Message onOutput (Message msg, Map<String, Object> params) throws CourierException
-	{
-		return msg;
-	}
-	
-	/**
-	 * Called immediately after the message is received from the transport.
-	 * 
-	 * @param msg the message
-	 * @param params additional information
-	 * @return an augmented message (or the original message)
-	 * @throws CourierException thrown if an error occurs.
-	 */
-	
-	public Message onInput (Message msg, Map<String, Object> params) throws CourierException
-	{
-		return msg;
-	}
-}

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/filter/InputOutputFilter.java (from rev 13241, labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/filter/InputOutputFilter.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/filter/InputOutputFilter.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/filter/InputOutputFilter.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,68 @@
+/*
+ * 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.filter;
+
+import java.util.Map;
+
+import org.jboss.soa.esb.couriers.CourierException;
+import org.jboss.soa.esb.message.Message;
+
+/**
+ * An inputoutput filter is called when the message is being received/sent and after it
+ * has been received from the transport/before it is passed to the transport.
+ * Implementations may augment or modify the message en route. Implementations that
+ * are pure output or pure input can just override the desired operation.
+ * 
+ * @author marklittle
+ */
+
+public class InputOutputFilter
+{	
+	/**
+	 * Called as the message flows towards the transport.
+	 * 
+	 * @param msg the message
+	 * @param params additional information
+	 * @return an augmented message (or the original message)
+	 * @throws CourierException thrown if an error occurs.
+	 */
+	
+	public Message onOutput (Message msg, Map<String, Object> params) throws CourierException
+	{
+		return msg;
+	}
+	
+	/**
+	 * Called immediately after the message is received from the transport.
+	 * 
+	 * @param msg the message
+	 * @param params additional information
+	 * @return an augmented message (or the original message)
+	 * @throws CourierException thrown if an error occurs.
+	 */
+	
+	public Message onInput (Message msg, Map<String, Object> params) throws CourierException
+	{
+		return msg;
+	}
+}

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -52,6 +52,7 @@
     public static final String TARGET_SERVICE_CATEGORY_TAG	= "target-service-category";
 	public static final String TARGET_SERVICE_NAME_TAG	    = "target-service-name";
 	public static final String GATEWAY_CLASS_TAG            = "gatewayClass";
+	public static final String IS_GATEWAY_TAG				= "is-gateway";
 	
 	/** Listeners */
 	public static final String LISTENER_CLASS_TAG            = "listenerClass";
@@ -72,6 +73,7 @@
     public static final String GATEWAY_WAIT_MILLIS_TAG 		= "max-millis-for-response";
     /** Routing */
     public static final String DESTINATION_NAME_TAG         = "destination-name";
+    public static final String DESTINATION_TYPE_TAG 		= "destination-type";
     /** Content Based Routing */
     /** RuleSet reference (Filename) */
     public static final String CBR_CLASS                    = "cbrClass";

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/config/ServicePublisher.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/config/ServicePublisher.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/config/ServicePublisher.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -146,7 +146,7 @@
             try {
                 actionClass = (Class<Class>) ClassUtil.forName(action.getClass1(), ServicePublisher.class);
             } catch (ClassNotFoundException e) {
-                throw new RuntimeException("Failed to find action class '" + action.getClass1() + "'.");
+                throw new RuntimeException("Failed to find action class '" + action.getClass1() + "'.", e);
             }
 
             Publish publishAnnotation = (Publish) actionClass.getAnnotation(Publish.class);

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JbrListenerMapper.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JbrListenerMapper.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JbrListenerMapper.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -21,6 +21,7 @@
 
 import org.jboss.soa.esb.ConfigurationException;
 import org.jboss.soa.esb.dom.YADOMUtil;
+import org.jboss.soa.esb.listeners.ListenerTagNames;
 import org.jboss.soa.esb.listeners.config.Generator.XMLBeansModel;
 import org.jboss.soa.esb.listeners.config.JbrBusDocument.JbrBus;
 import org.jboss.soa.esb.listeners.config.JbrListenerDocument.JbrListener;
@@ -67,6 +68,8 @@
             String host = provider.getHost();
 
             listenerNode.setAttribute("gatewayClass", JBossRemotingGatewayListener.class.getName());
+			listenerNode.setAttribute(ListenerTagNames.IS_GATEWAY_TAG, Boolean.toString(listener.getIsGateway()));
+
             if(host != null) {
                 listenerNode.setAttribute(JBossRemotingGatewayListener.JBR_SERVER_HOST, host);
             }

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -78,7 +78,10 @@
 		// Map the <property> elements targeted at the listener - from the listener itself.
 		MapperUtil.mapProperties(listener.getPropertyList(), listenerNode);			
 		if(listener.getIsGateway()) {
+
 			listenerNode.setAttribute("gatewayClass", JmsGatewayListener.class.getName());
+			listenerNode.setAttribute(ListenerTagNames.IS_GATEWAY_TAG, Boolean.toString(listener.getIsGateway()));
+
 			// Map EPR related attributes onto the listener - from the bus and provider and listener.
 			// Note: This will change - the Gateways will also support the EPR element...
 			mapJmsEprProperties(listenerNode, provider, messageFilter);
@@ -86,9 +89,11 @@
 		} else {
 			Element eprNode = YADOMUtil.addElement(listenerNode, ListenerTagNames.EPR_TAG);
 
+			
 			// Map EPR related attributes onto the EPR - from the bus and provider and listener...
 			mapJmsEprProperties(eprNode, provider, messageFilter);
 			eprNode.setAttribute(ListenerTagNames.PROTOCOL_TAG, JMSEpr.JMS_PROTOCOL);
+
 			MapperUtil.mapEPRProperties(listener, eprNode, model);
 			// Remove any empty attributes set on the EPR config...
 			YADOMUtil.removeEmptyAttributes(eprNode);

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/SqlListenerMapper.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/SqlListenerMapper.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/SqlListenerMapper.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -78,12 +78,15 @@
 		MapperUtil.mapProperties(listener.getPropertyList(), listenerNode);			
 		if(listener.getIsGateway()) {
 			listenerNode.setAttribute("gatewayClass", SqlTableGatewayListener.class.getName());
+			listenerNode.setAttribute(ListenerTagNames.IS_GATEWAY_TAG, Boolean.toString(listener.getIsGateway()));
+
 			// Map EPR related attributes onto the listener - from the bus and provider and listener.
 			// Note: This will change - the Gateways will also support the EPR element...
 			mapSqlEprProperties(listenerNode, provider, messageFilter);
 			MapperUtil.mapEPRProperties(listener, listenerNode, model);
 		} else {
 			Element eprNode = YADOMUtil.addElement(listenerNode, ListenerTagNames.EPR_TAG);
+
 			// Map EPR related attributes onto the EPR - from the bus and provider and listener...
 			mapSqlEprProperties(eprNode, provider, messageFilter);
 			MapperUtil.mapEPRProperties(listener, eprNode, model);

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/UntypedListenerMapper.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/UntypedListenerMapper.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/UntypedListenerMapper.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -66,10 +66,15 @@
 		MapperUtil.mapProperties(listener.getPropertyList(), listenerNode);
 
 		if(listener.getIsGateway()) {
+			listenerNode.setAttribute(ListenerTagNames.IS_GATEWAY_TAG, Boolean.toString(listener.getIsGateway()));
+			
 			MapperUtil.mapEPRProperties(listener, listenerNode, model);
+
 		} else {
+
 			Element eprNode = YADOMUtil.addElement(listenerNode, ListenerTagNames.EPR_TAG);
 			MapperUtil.mapEPRProperties(listener, eprNode, model);
+
 			// Remove any empty attributes set on the EPR config...
 			YADOMUtil.removeEmptyAttributes(eprNode);
 		}

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -31,27 +31,34 @@
 import java.net.URI;
 import java.net.URL;
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.log4j.Logger;
 import org.jboss.soa.esb.ConfigurationException;
 import org.jboss.soa.esb.addressing.EPR;
 import org.jboss.soa.esb.addressing.MalformedEPRException;
 import org.jboss.soa.esb.addressing.eprs.FileEpr;
+import org.jboss.soa.esb.common.Environment;
 import org.jboss.soa.esb.couriers.Courier;
 import org.jboss.soa.esb.couriers.CourierException;
 import org.jboss.soa.esb.couriers.CourierFactory;
 import org.jboss.soa.esb.couriers.CourierTimeoutException;
 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.listeners.ListenerTagNames;
 import org.jboss.soa.esb.listeners.ListenerUtil;
 import org.jboss.soa.esb.listeners.RegistryUtil;
+import org.jboss.soa.esb.listeners.lifecycle.AbstractThreadedManagedLifecycle;
 import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleException;
+import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleThreadState;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.message.format.MessageFactory;
 import org.jboss.soa.esb.services.registry.RegistryException;
 import org.jboss.soa.esb.util.ClassUtil;
+import org.jboss.soa.esb.util.Util;
 
 /**
  * Base class for all file gateways: local filesystem, ftp, sftp and ftps.
@@ -65,538 +72,561 @@
  */
 public abstract class AbstractFileGateway extends AbstractScheduler
 {
-	abstract File[] getFileList() throws GatewayException;
+    abstract File[] getFileList () throws GatewayException;
 
-	abstract byte[] getFileContents(File file) throws GatewayException;
+    abstract byte[] getFileContents (File file) throws GatewayException;
 
-	abstract boolean renameFile(File from, File to) throws GatewayException;
+    abstract boolean renameFile (File from, File to) throws GatewayException;
 
-	abstract boolean deleteFile(File file) throws GatewayException;
+    abstract boolean deleteFile (File file) throws GatewayException;
 
-	abstract void seeIfOkToWorkOnDir(File p_oDir) throws GatewayException;
+    abstract void seeIfOkToWorkOnDir (File p_oDir) throws GatewayException;
 
-	abstract void getDefaultComposer() throws GatewayException;
+    abstract void getDefaultComposer () throws GatewayException;
 
-	abstract void bytesToFile(byte[] bytes, File file) throws GatewayException;
+    abstract void bytesToFile (byte[] bytes, File file) throws GatewayException;
 
-	protected AbstractFileGateway(ConfigTree config) throws ConfigurationException, RegistryException, GatewayException
-	{
-            super(config) ;
-            _config = config;
-            _sleepBetweenPolls = 10000; // milliseconds
-            checkMyParms();
-	} // __________________________________
-        
-        /**
+    protected AbstractFileGateway(ConfigTree config)
+	    throws ConfigurationException, RegistryException, GatewayException
+    {
+	super(config);
+	_config = config;
+	_sleepBetweenPolls = 10000; // milliseconds
+	checkMyParms();
+    } // __________________________________
+
+    /**
          * Handle the initialisation of the managed instance.
          * 
-         * @throws ManagedLifecycleException for errors while initialisation.
+         * @throws ManagedLifecycleException
+         *                 for errors while initialisation.
          */
-        protected void doInitialise() throws ManagedLifecycleException
-        {
-        	super.doInitialise();
-            try
-            {
-                _targetEprs = RegistryUtil.getEprs(_targetServiceCategory,_targetServiceName);
-                if (null == _targetEprs || _targetEprs.size() < 1)
-                    throw new ManagedLifecycleException("EPR <" + _targetServiceName + "> not found in registry") ;
-            }
-            catch (final RegistryException re)
-            {
-                throw new ManagedLifecycleException("Unexpected registry exception", re) ;
-            }
-        }
+    protected void doInitialise () throws ManagedLifecycleException
+    {
+    	super.doInitialise();
+	try
+	{
+	    _targetEprs = RegistryUtil.getEprs(_targetServiceCategory,
+		    _targetServiceName);
+	    if (null == _targetEprs || _targetEprs.size() < 1)
+		throw new ManagedLifecycleException("EPR <"
+			+ _targetServiceName + "> not found in registry");
+	}
+	catch (final RegistryException re)
+	{
+	    throw new ManagedLifecycleException(
+		    "Unexpected registry exception", re);
+	}
+    }
 
-        /**
+    /**
          * Execute on the thread.
          */
-		protected void performGatewayOperation()
-        {
+    protected void performGatewayOperation ()
+    {
 
-        	EPR 	replyEpr = null;
-        	Message replyMsg = null;
-        	
-        	if (_logger.isDebugEnabled())
-        	{
-        		_logger.debug("run() method of " + this.getClass().getSimpleName()
-    				+ " started on thread " + Thread.currentThread().getName());
-            }
+	EPR replyEpr = null;
+	Message replyMsg = null;
 
-			File[] fileList;
-			try {
-				fileList = getFileList();
-			} catch (GatewayException e) {
-				_logger.error("Can't retrieve file list", e);
-				return;
-			}
+	if (_logger.isDebugEnabled())
+	{
+	    _logger.debug("run() method of " + this.getClass().getSimpleName()
+		    + " started on thread " + Thread.currentThread().getName());
+	}
 
-			for (File fileIn : fileList)
-			{
-				// Try to rename - if unsuccessful, somebody else got it first
-				File fileWork = getWorkFileName( fileIn, _workingSuffix);
-				try
-				{
-					if (!renameFile(fileIn, fileWork))
-						continue;
-				}
-				catch (GatewayException e)
-				{
-					_logger.error("Problems renaming file " + fileIn + " to "
-							+ fileWork);
-					continue;
-				}
+	    File[] fileList;
+	    try
+	    {
+		fileList = getFileList();
+	    }
+	    catch (GatewayException e)
+	    {
+		_logger.error("Can't retrieve file list", e);
+		return;
+	    }
 
-				Throwable thrown = null;
-				String text = null;
-				try
-				{
-					Object obj = _processMethod.invoke(_composer, new Object[]
-					{ fileWork });
-					if (null == obj)
-					{
-						_logger.warn("Action class method <"
-								+ _processMethod.getName()
-								+ "> returned a null object");
-						continue;
-					}
-					boolean bSent = false;
-
-                	Message outMessage = (Message) obj;
-                	outMessage.getProperties().setProperty(ORIGINAL_FILE_NAME_MSG_PROP, fileIn.getName());
-					for (EPR current : _targetEprs)
-					{
-						if (current instanceof FileEpr)
-						{
-							try
-							{
-								FileEpr fpr = (FileEpr) current;
-								FileEpr newEpr = new FileEpr(fpr.getURL());
-								newEpr.setPostDelete(false);
-								newEpr.setPostDirectory(fpr.getURL().getFile());
-								newEpr.setPostSuffix(fpr.getInputSuffix());
-								current = newEpr;
-							}
-							catch (Exception e)
-							{
-								_logger.error("Problems with file EPR", e);							}
-						}
-						_courier = getCourier(current);
-                        try
-                        {
-                        	replyEpr = null;
-                        	outMessage.getHeader().getCall().setTo(current);
-                        	if (_maxMillisForResponse>0)
-                        	{
-                        		replyEpr = CourierUtil.getDefaultReplyToEpr(current);
-                        		outMessage.getHeader().getCall().setReplyTo(replyEpr);
-                        	}
-                            if (_courier.deliver(outMessage))
-                            {
-                            	bSent = true;
-                            	break;
-                            }
-                        }
-                        finally
-                        {
-                            CourierUtil.cleanCourier(_courier) ;
-                        }
-                                                
-					}
-					if (!bSent)
-					{
-						text = "Target service <" + _targetServiceCategory
-								+ "," + _targetServiceName
-								+ "> is not registered";
-						thrown = new Exception(text);
-					}
-					else if (null!=replyEpr)
-					{
-						TwoWayCourier replyCourier = CourierFactory.getPickupCourier(replyEpr);
-						try
-						{
-							replyMsg = replyCourier.pickup(_maxMillisForResponse);
-							_responderMethod.invoke(_composer, new Object[] {replyMsg,fileIn});
-						}
-						catch (CourierTimeoutException e)
-						{
-							thrown = e;
-							text = "Expected response was not received from invoked service";
-							replyMsg = MessageFactory.getInstance().getMessage();
-							String timedOut = "Service <"
-								+_targetServiceCategory+","+"_targetServiceName"
-								+"> timed out without sending response";
-							replyMsg.getBody().setByteArray(timedOut.getBytes());
-							_responderMethod.invoke(_composer, new Object[] {replyMsg,fileIn});
-						}
-						finally
-						{
-							if (null!=replyCourier)
-								CourierUtil.cleanCourier(replyCourier);
-						}
-					}
-				}
-				catch (InvocationTargetException e)
-				{
-					thrown = e;
-					text = "Problems invoking method <"
-							+ _processMethod.getName() + ">";
-
-				}
-				catch (IllegalAccessException e)
-				{
-					thrown = e;
-					text = "Problems invoking method <"
-							+ _processMethod.getName() + ">";
-				}
-				catch (ClassCastException e)
-				{
-					thrown = e;
-					text = "Action class method <" + _processMethod.getName()
-							+ "> returned a non Message object";
-				}
-				catch (CourierException e)
-				{
-					thrown = e;
-					if (null != _courier)
-						text = "Courier <" + _courier.getClass().getName()
-								+ ".deliverAsync(Message) FAILED";
-					else
-						text = "NULL courier can't deliverAsync Message";
-				}
-				catch (MalformedEPRException e)
-				{
-					thrown = e;
-					if (null != _courier)
-						text = "Courier <" + _courier.getClass().getName()
-								+ ".deliverAsync(Message) FAILED with malformed EPR.";
-					else
-						text = "NULL courier can't deliverAsync Message";
-				}
-
-				if (null == thrown)
-				{
-					File fileOK = new File(_postProcessDirectory, fileIn
-							.getName()
-							+ _postProcessSuffix);
-					if (_deleteAfterOK)
-					{
-						try
-						{
-							deleteFile(fileWork);
-						}
-						catch (GatewayException e)
-						{
-							_logger
-									.error(
-											"File "
-													+ fileIn
-													+ " has been processed and renamed to "
-													+ fileWork
-													+ ", but there were problems deleting it from the input directory ",
-											e);
-						}
-					}
-					else
-					{
-						try
-						{
-							renameFile(fileWork, fileOK);
-						}
-						catch (GatewayException e)
-						{
-							_logger
-									.error(
-											"File "
-													+ fileIn
-													+ " has been processed and renamed to "
-													+ fileWork
-													+ ", but there were problems renaming it to "
-													+ fileOK, e);
-						}
-					}
-				}
-				else
-				{
-					thrown.printStackTrace();
-					_logger.error(text, thrown);
-					File fileError = new File(_errorDirectory, fileIn.getName() + _errorSuffix);
-					try
-					{
-						deleteFile(fileError);
-					}
-					catch (GatewayException e)
-					{
-						_logger.warn( "File : " + fileError + " did not exist.");
-					}
-					try
-					{
-						renameFile(fileWork, fileError);
-					}
-					catch (GatewayException e)
-					{
-						_logger.error("Problems renaming file " + fileWork + " to " + fileError, e);
-					}
-				}
-			}
-	} // ________________________________
-        
-        protected File getWorkFileName( File fileIn, String suffix )
+	    for (File fileIn : fileList)
+	    {
+		// Try to rename - if unsuccessful, somebody else got it first
+		File fileWork = getWorkFileName(fileIn, _workingSuffix);
+		try
 		{
-			return new File(fileIn.toString() + _workingSuffix);
+		    if (!renameFile(fileIn, fileWork))
+			continue;
 		}
-
-		/* 
-         * Extracted to simplify testing
-         */
-        protected Courier getCourier( EPR current ) throws CourierException, MalformedEPRException
+		catch (GatewayException e)
 		{
-			return CourierFactory.getCourier(current);
+		    _logger.error("Problems renaming file " + fileIn + " to "
+			    + fileWork);
+		    continue;
 		}
 
-		/**
-         * Handle the destroy of the managed instance.
-         * 
-         * @throws ManagedLifecycleException for errors while destroying.
-         */
-        protected void doDestroy() throws ManagedLifecycleException
-        {
-        	super.doDestroy();
-        }
+		Throwable thrown = null;
+		String text = null;
+		try
+		{
+		    Object obj = _processMethod.invoke(_composer, new Object[]
+		    { fileWork });
+		    if (null == obj)
+		    {
+			_logger.warn("Action class method <"
+				+ _processMethod.getName()
+				+ "> returned a null object");
+			continue;
+		    }
+		    boolean bSent = false;
 
-        /*
-         * Is the input suffix valid for this type of gateway?
-         */
-        
-        protected void checkInputSuffix () throws ConfigurationException
-        {
-            if (_inputSuffix.length() < 1)
-		throw new ConfigurationException("Invalid "
-			+ ListenerTagNames.FILE_INPUT_SFX_TAG + " attribute");
-        }
-  
-	/**
-	 * Check for mandatory and optional attributes in parameter tree
-	 * 
-	 * @throws ConfigurationException -
-	 *             if mandatory atts are not right or actionClass not in
-	 *             classpath
-	 */
-	private void checkMyParms() throws ConfigurationException, RegistryException, GatewayException
-	{
-		// Third arg is null - Exception will be thrown if attribute is not
-		// found
-		_targetServiceCategory = ListenerUtil.obtainAtt(_config,
-				ListenerTagNames.TARGET_SERVICE_CATEGORY_TAG, null);
-		_targetServiceName = ListenerUtil.obtainAtt(_config,
-				ListenerTagNames.TARGET_SERVICE_NAME_TAG, null);
+		    Message outMessage = (Message) obj;
+		    Map<String, Object> params = new HashMap<String, Object>();
 
-		// Polling interval; moved to AbstractPollingInverval
-		/*
-		String sAux = _config
-				.getAttribute(ListenerTagNames.POLL_LATENCY_SECS_TAG);
-		
-		if (!Util.isNullString(sAux))
-		{
+		    params.put(Environment.ORIGINAL_FILE, fileIn);
+		    params.put(Environment.GATEWAY_CONFIG, _config);
+		    
+		    outMessage = FilterManager.getInstance().doOutputWork(outMessage, params);
+		    
+		    for (EPR current : _targetEprs)
+		    {
+			if (current instanceof FileEpr)
+			{
+			    try
+			    {
+				FileEpr fpr = (FileEpr) current;
+				FileEpr newEpr = new FileEpr(fpr.getURL());
+				newEpr.setPostDelete(false);
+				newEpr.setPostDirectory(fpr.getURL().getFile());
+				newEpr.setPostSuffix(fpr.getInputSuffix());
+				current = newEpr;
+			    }
+			    catch (Exception e)
+			    {
+				_logger.error("Problems with file EPR", e);
+			    }
+			}
+			_courier = getCourier(current);
 			try
 			{
-				_sleepBetweenPolls = 1000 * Long.parseLong(sAux);
+			    replyEpr = null;
+			    outMessage.getHeader().getCall().setTo(current);
+			    if (_maxMillisForResponse > 0)
+			    {
+				replyEpr = CourierUtil
+					.getDefaultReplyToEpr(current);
+				outMessage.getHeader().getCall().setReplyTo(
+					replyEpr);
+			    }
+			    if (_courier.deliver(outMessage))
+			    {
+				bSent = true;
+				break;
+			    }
 			}
-			catch (NumberFormatException e)
+			finally
 			{
-				_logger.warn("Invalid poll latency - keeping default of "
-						+ (_sleepBetweenPolls / 1000));
+			    CourierUtil.cleanCourier(_courier);
 			}
-		}
-		else
-		{
-			_logger.warn("No value specified for: "
-					+ ListenerTagNames.POLL_LATENCY_SECS_TAG
-					+ " -  Using default of " + (_sleepBetweenPolls / 1000));
-		}
-		*/
 
-		resolveComposerClass();
-
-		boolean hasResponder = _responderMethod!=null; 
-		_maxMillisForResponse = ListenerUtil.getMaxMillisGatewayWait
-			(_config, _logger, hasResponder);
-		try
-		{
-			// INPUT directory and suffix (used for FileFilter)
-			String url = _config.getAttribute(ListenerTagNames.URL_TAG);
-			String sInpDir = (null != url) ? new URL(url).getFile() :
-                            ListenerUtil.obtainAtt(_config, ListenerTagNames.FILE_INPUT_DIR_TAG, null);
-			_inputDirectory = fileFromString(sInpDir);
-			seeIfOkToWorkOnDir(_inputDirectory);
-	
-			_inputSuffix = ListenerUtil.obtainAtt(_config,
-					ListenerTagNames.FILE_INPUT_SFX_TAG, null);
-			_inputSuffix = _inputSuffix.trim();
-			
-			checkInputSuffix();
-	
-			// WORK suffix (will rename in input directory)
-			_workingSuffix = ListenerUtil.obtainAtt(_config,
-					ListenerTagNames.FILE_WORK_SFX_TAG, ".esbWork").trim();
-			if (_workingSuffix.length() < 1)
-				throw new ConfigurationException("Invalid " + ListenerTagNames.FILE_WORK_SFX_TAG
-						+ " attribute");
-			
-			if (_inputSuffix.equals(_workingSuffix))
-				throw new ConfigurationException("Work suffix must differ from input suffix <"
-						+ _workingSuffix + ">");
-	
-			// ERROR directory and suffix (defaults to input dir and ".esbError"
-			// suffix)
-			String sErrDir = ListenerUtil.obtainAtt(_config,
-					ListenerTagNames.FILE_ERROR_DIR_TAG, sInpDir);
-			_errorDirectory = fileFromString(sErrDir);
-			seeIfOkToWorkOnDir(_errorDirectory);
-	
-			_errorSuffix = ListenerUtil.obtainAtt(_config,
-					ListenerTagNames.FILE_ERROR_SFX_TAG, ".esbError").trim();
-			if (_errorSuffix.length() < 1)
-				throw new ConfigurationException("Invalid "
-						+ ListenerTagNames.FILE_ERROR_SFX_TAG + " attribute");
-			if (_errorDirectory.equals(_inputDirectory)
-					&& _inputSuffix.equals(_errorSuffix))
-				throw new ConfigurationException("Error suffix must differ from input suffix <"
-						+ _errorSuffix + ">");
-	
-			// Do users wish to delete files that were processed OK ?
-			String sPostDel = ListenerUtil.obtainAtt(_config,
-					ListenerTagNames.FILE_POST_DEL_TAG, "false").trim();
-			_deleteAfterOK = Boolean.parseBoolean(sPostDel);
-			if (_deleteAfterOK)
-				return;
-	
-			// POST (done) directory and suffix (defaults to input dir and
-			// ".esbDone" suffix)
-			String sPostDir = ListenerUtil.obtainAtt(_config,
-					ListenerTagNames.FILE_POST_DIR_TAG, sInpDir);
-			_postProcessDirectory = fileFromString(sPostDir);
-			seeIfOkToWorkOnDir(_postProcessDirectory);
-			_postProcessSuffix = ListenerUtil.obtainAtt(_config,
-					ListenerTagNames.FILE_POST_SFX_TAG, ".esbDone").trim();
-			
-			if (_postProcessDirectory.equals(_inputDirectory))
-		        {
-					if (_postProcessSuffix.length() < 1)
-						throw new ConfigurationException("Invalid "
-								+ ListenerTagNames.FILE_POST_SFX_TAG + " attribute");
-					if (_postProcessSuffix.equals(_inputSuffix))
-						throw new ConfigurationException(
-								"Post process suffix must differ from input suffix <"
-										+ _postProcessSuffix + ">");
-		        }
-		}
-		catch (GatewayException ex)
-		{
-			throw ex;
-		}
-		catch (MalformedURLException ex)
-		{
-			throw new ConfigurationException(ex);
-		}
-	} // ________________________________
-
-	protected void resolveComposerClass() throws ConfigurationException, GatewayException
-	{
-		String sProcessMethod 	= null;
-		String sResponderMethod = null;
-		try
-		{
-			_composerName = _config.getAttribute(ListenerTagNames.GATEWAY_COMPOSER_CLASS_TAG);
-			if (null != _composerName)
-			{ // class attribute
-				_composerClass = ClassUtil.forName(_composerName, getClass());
-				Constructor oConst = _composerClass.getConstructor(new Class[]
-				{ ConfigTree.class });
-				_composer = oConst.newInstance(_config);
-				sProcessMethod = _config.getAttribute(ListenerTagNames.GATEWAY_COMPOSER_METHOD_TAG, "process");
-				sResponderMethod = _config.getAttribute(ListenerTagNames.GATEWAY_RESPONDER_METHOD_TAG);
+		    }
+		    if (!bSent)
+		    {
+			text = "Target service <" + _targetServiceCategory
+				+ "," + _targetServiceName
+				+ "> is not registered";
+			thrown = new Exception(text);
+		    }
+		    else if (null != replyEpr)
+		    {
+			TwoWayCourier replyCourier = CourierFactory
+				.getPickupCourier(replyEpr);
+			try
+			{
+			    replyMsg = replyCourier
+				    .pickup(_maxMillisForResponse);
+			    _responderMethod.invoke(_composer, new Object[]
+			    { replyMsg, fileIn });
 			}
-			else
+			catch (CourierTimeoutException e)
 			{
-				getDefaultComposer();
-				sProcessMethod 	 = "process";
-				sResponderMethod = "respond";
+			    thrown = e;
+			    text = "Expected response was not received from invoked service";
+			    replyMsg = MessageFactory.getInstance()
+				    .getMessage();
+			    String timedOut = "Service <"
+				    + _targetServiceCategory + ","
+				    + "_targetServiceName"
+				    + "> timed out without sending response";
+			    replyMsg.getBody()
+				    .setByteArray(timedOut.getBytes());
+			    _responderMethod.invoke(_composer, new Object[]
+			    { replyMsg, fileIn });
 			}
-	
-			_processMethod = _composerClass.getMethod
-				(sProcessMethod, new Class[]{ Object.class });
-
-			_responderMethod = (null==sResponderMethod) ? null
-				: _composerClass.getMethod(sResponderMethod
-						, new Class[] {Message.class, File.class});
+			finally
+			{
+			    if (null != replyCourier)
+				CourierUtil.cleanCourier(replyCourier);
+			}
+		    }
 		}
-		catch (InvocationTargetException ex)
+		catch (InvocationTargetException e)
 		{
-			throw new ConfigurationException(ex);
+		    thrown = e;
+		    text = "Problems invoking method <"
+			    + _processMethod.getName() + ">";
+
 		}
-		catch (IllegalAccessException ex)
+		catch (IllegalAccessException e)
 		{
-			throw new ConfigurationException(ex);
+		    thrown = e;
+		    text = "Problems invoking method <"
+			    + _processMethod.getName() + ">";
 		}
-		catch (InstantiationException ex)
+		catch (ClassCastException e)
 		{
-			throw new ConfigurationException(ex);
+		    thrown = e;
+		    text = "Action class method <" + _processMethod.getName()
+			    + "> returned a non Message object";
 		}
-		catch (NoSuchMethodException ex)
+		catch (CourierException e)
 		{
-			throw new ConfigurationException(ex);
+		    thrown = e;
+		    if (null != _courier)
+			text = "Courier <" + _courier.getClass().getName()
+				+ ".deliverAsync(Message) FAILED";
+		    else
+			text = "NULL courier can't deliverAsync Message";
 		}
-		catch (ClassNotFoundException ex)
+		catch (MalformedEPRException e)
 		{
-			throw new ConfigurationException(ex);
+		    thrown = e;
+		    if (null != _courier)
+			text = "Courier <"
+				+ _courier.getClass().getName()
+				+ ".deliverAsync(Message) FAILED with malformed EPR.";
+		    else
+			text = "NULL courier can't deliverAsync Message";
 		}
-	} // ________________________________
 
-	private File fileFromString(String file)
-	{
-		try
+		if (null == thrown)
 		{
-			return new File(new URI(file));
+		    File fileOK = new File(_postProcessDirectory, fileIn
+			    .getName()
+			    + _postProcessSuffix);
+		    if (_deleteAfterOK)
+		    {
+			try
+			{
+			    deleteFile(fileWork);
+			}
+			catch (GatewayException e)
+			{
+			    _logger
+				    .error(
+					    "File "
+						    + fileIn
+						    + " has been processed and renamed to "
+						    + fileWork
+						    + ", but there were problems deleting it from the input directory ",
+					    e);
+			}
+		    }
+		    else
+		    {
+			try
+			{
+			    renameFile(fileWork, fileOK);
+			}
+			catch (GatewayException e)
+			{
+			    _logger
+				    .error(
+					    "File "
+						    + fileIn
+						    + " has been processed and renamed to "
+						    + fileWork
+						    + ", but there were problems renaming it to "
+						    + fileOK, e);
+			}
+		    }
 		}
-		catch (Exception e)
+		else
 		{
-			return new File(file);
+		    thrown.printStackTrace();
+		    _logger.error(text, thrown);
+		    File fileError = new File(_errorDirectory, fileIn.getName()
+			    + _errorSuffix);
+		    try
+		    {
+			deleteFile(fileError);
+		    }
+		    catch (GatewayException e)
+		    {
+			_logger.warn("File : " + fileError + " did not exist.");
+		    }
+		    try
+		    {
+			renameFile(fileWork, fileError);
+		    }
+		    catch (GatewayException e)
+		    {
+			_logger.error("Problems renaming file " + fileWork
+				+ " to " + fileError, e);
+		    }
 		}
-	} // ________________________________
+	    }
 
-	protected final static Logger _logger = Logger
-			.getLogger(AbstractFileGateway.class);
+	if (_logger.isDebugEnabled())
+	{
+	    _logger
+		    .debug("run() method of " + this.getClass().getSimpleName()
+			    + " finished on thread "
+			    + Thread.currentThread().getName());
+	}
+    } // ________________________________
 
-	protected ConfigTree _config;
+    protected File getWorkFileName (File fileIn, String suffix)
+    {
+	return new File(fileIn.toString() + _workingSuffix);
+    }
 
-	protected long _sleepBetweenPolls; // milliseconds
-	protected long _maxMillisForResponse;
+    /*
+         * Extracted to simplify testing
+         */
+    protected Courier getCourier (EPR current) throws CourierException,
+	    MalformedEPRException
+    {
+	return CourierFactory.getCourier(current);
+    }
 
-	protected String _targetServiceCategory, _targetServiceName;
+    /**
+         * Handle the destroy of the managed instance.
+         * 
+         * @throws ManagedLifecycleException
+         *                 for errors while destroying.
+         */
+    protected void doDestroy () throws ManagedLifecycleException
+    {
+    	super.doDestroy();
+    }
 
-	protected Collection<EPR> _targetEprs;
+    /*
+         * Is the input suffix valid for this type of gateway?
+         */
 
-	protected String _composerName;
+    protected void checkInputSuffix () throws ConfigurationException
+    {
+	if (_inputSuffix.length() < 1)
+	    throw new ConfigurationException("Invalid "
+		    + ListenerTagNames.FILE_INPUT_SFX_TAG + " attribute");
+    }
 
-	protected Class _composerClass;
+    /**
+         * Check for mandatory and optional attributes in parameter tree
+         * 
+         * @throws ConfigurationException -
+         *                 if mandatory atts are not right or actionClass not in
+         *                 classpath
+         */
+    private void checkMyParms () throws ConfigurationException,
+	    RegistryException, GatewayException
+    {
+	// Third arg is null - Exception will be thrown if attribute is not
+	// found
+	_targetServiceCategory = ListenerUtil.obtainAtt(_config,
+		ListenerTagNames.TARGET_SERVICE_CATEGORY_TAG, null);
+	_targetServiceName = ListenerUtil.obtainAtt(_config,
+		ListenerTagNames.TARGET_SERVICE_NAME_TAG, null);
 
-	protected Object _composer;
+	resolveComposerClass();
 
-	protected Method _processMethod;
-	protected Method _responderMethod;
+	boolean hasResponder = _responderMethod != null;
+	_maxMillisForResponse = ListenerUtil.getMaxMillisGatewayWait(_config,
+		_logger, hasResponder);
+	try
+	{
+	    // INPUT directory and suffix (used for FileFilter)
+	    String url = _config.getAttribute(ListenerTagNames.URL_TAG);
+	    String sInpDir = (null != url) ? new URL(url).getFile()
+		    : ListenerUtil.obtainAtt(_config,
+			    ListenerTagNames.FILE_INPUT_DIR_TAG, null);
+	    _inputDirectory = fileFromString(sInpDir);
+	    seeIfOkToWorkOnDir(_inputDirectory);
 
-	protected Courier _courier;
+	    _inputSuffix = ListenerUtil.obtainAtt(_config,
+		    ListenerTagNames.FILE_INPUT_SFX_TAG, null);
+	    _inputSuffix = _inputSuffix.trim();
 
-	protected boolean _deleteAfterOK;
+	    checkInputSuffix();
 
-	protected File _inputDirectory, _errorDirectory, _postProcessDirectory;
+	    // WORK suffix (will rename in input directory)
+	    _workingSuffix = ListenerUtil.obtainAtt(_config,
+		    ListenerTagNames.FILE_WORK_SFX_TAG, ".esbWork").trim();
+	    if (_workingSuffix.length() < 1)
+		throw new ConfigurationException("Invalid "
+			+ ListenerTagNames.FILE_WORK_SFX_TAG + " attribute");
 
-	protected String _inputSuffix, _postProcessSuffix, _workingSuffix,
-			_errorSuffix;
+	    if (_inputSuffix.equals(_workingSuffix))
+		throw new ConfigurationException(
+			"Work suffix must differ from input suffix <"
+				+ _workingSuffix + ">");
 
-	protected FileFilter _fileFilter;
-	
-	/** Message property name for original filename */
-	public static final String ORIGINAL_FILE_NAME_MSG_PROP = "org.jboss.soa.esb.gateway.original.file.name";
-	
+	    // ERROR directory and suffix (defaults to input dir and
+                // ".esbError"
+	    // suffix)
+	    String sErrDir = ListenerUtil.obtainAtt(_config,
+		    ListenerTagNames.FILE_ERROR_DIR_TAG, sInpDir);
+	    _errorDirectory = fileFromString(sErrDir);
+	    seeIfOkToWorkOnDir(_errorDirectory);
+
+	    _errorSuffix = ListenerUtil.obtainAtt(_config,
+		    ListenerTagNames.FILE_ERROR_SFX_TAG, ".esbError").trim();
+	    if (_errorSuffix.length() < 1)
+		throw new ConfigurationException("Invalid "
+			+ ListenerTagNames.FILE_ERROR_SFX_TAG + " attribute");
+	    if (_errorDirectory.equals(_inputDirectory)
+		    && _inputSuffix.equals(_errorSuffix))
+		throw new ConfigurationException(
+			"Error suffix must differ from input suffix <"
+				+ _errorSuffix + ">");
+
+	    // Do users wish to delete files that were processed OK ?
+	    String sPostDel = ListenerUtil.obtainAtt(_config,
+		    ListenerTagNames.FILE_POST_DEL_TAG, "false").trim();
+	    _deleteAfterOK = Boolean.parseBoolean(sPostDel);
+	    if (_deleteAfterOK)
+		return;
+
+	    // POST (done) directory and suffix (defaults to input dir and
+	    // ".esbDone" suffix)
+	    String sPostDir = ListenerUtil.obtainAtt(_config,
+		    ListenerTagNames.FILE_POST_DIR_TAG, sInpDir);
+	    _postProcessDirectory = fileFromString(sPostDir);
+	    seeIfOkToWorkOnDir(_postProcessDirectory);
+	    _postProcessSuffix = ListenerUtil.obtainAtt(_config,
+		    ListenerTagNames.FILE_POST_SFX_TAG, ".esbDone").trim();
+
+	    if (_postProcessDirectory.equals(_inputDirectory))
+	    {
+		if (_postProcessSuffix.length() < 1)
+		    throw new ConfigurationException("Invalid "
+			    + ListenerTagNames.FILE_POST_SFX_TAG + " attribute");
+		if (_postProcessSuffix.equals(_inputSuffix))
+		    throw new ConfigurationException(
+			    "Post process suffix must differ from input suffix <"
+				    + _postProcessSuffix + ">");
+	    }
+	}
+	catch (GatewayException ex)
+	{
+	    throw ex;
+	}
+	catch (MalformedURLException ex)
+	{
+	    throw new ConfigurationException(ex);
+	}
+    } // ________________________________
+
+    protected void resolveComposerClass () throws ConfigurationException,
+	    GatewayException
+    {
+	String sProcessMethod = null;
+	String sResponderMethod = null;
+	try
+	{
+	    _composerName = _config
+		    .getAttribute(ListenerTagNames.GATEWAY_COMPOSER_CLASS_TAG);
+	    if (null != _composerName)
+	    { // class attribute
+		_composerClass = ClassUtil.forName(_composerName, getClass());
+		Constructor oConst = _composerClass.getConstructor(new Class[]
+		{ ConfigTree.class });
+		_composer = oConst.newInstance(_config);
+		sProcessMethod = _config
+			.getAttribute(
+				ListenerTagNames.GATEWAY_COMPOSER_METHOD_TAG,
+				"process");
+		sResponderMethod = _config
+			.getAttribute(ListenerTagNames.GATEWAY_RESPONDER_METHOD_TAG);
+	    }
+	    else
+	    {
+		getDefaultComposer();
+		sProcessMethod = "process";
+		sResponderMethod = "respond";
+	    }
+
+	    _processMethod = _composerClass.getMethod(sProcessMethod,
+		    new Class[]
+		    { Object.class });
+
+	    _responderMethod = (null == sResponderMethod) ? null
+		    : _composerClass.getMethod(sResponderMethod, new Class[]
+		    { Message.class, File.class });
+	}
+	catch (InvocationTargetException ex)
+	{
+	    throw new ConfigurationException(ex);
+	}
+	catch (IllegalAccessException ex)
+	{
+	    throw new ConfigurationException(ex);
+	}
+	catch (InstantiationException ex)
+	{
+	    throw new ConfigurationException(ex);
+	}
+	catch (NoSuchMethodException ex)
+	{
+	    throw new ConfigurationException(ex);
+	}
+	catch (ClassNotFoundException ex)
+	{
+	    throw new ConfigurationException(ex);
+	}
+    } // ________________________________
+
+    private File fileFromString (String file)
+    {
+	try
+	{
+	    return new File(new URI(file));
+	}
+	catch (Exception e)
+	{
+	    return new File(file);
+	}
+    } // ________________________________
+
+    protected final static Logger _logger = Logger
+	    .getLogger(AbstractFileGateway.class);
+
+    protected ConfigTree _config;
+
+    protected long _sleepBetweenPolls; // milliseconds
+
+    protected long _maxMillisForResponse;
+
+    protected String _targetServiceCategory, _targetServiceName;
+
+    protected Collection<EPR> _targetEprs;
+
+    protected String _composerName;
+
+    protected Class _composerClass;
+
+    protected Object _composer;
+
+    protected Method _processMethod;
+
+    protected Method _responderMethod;
+
+    protected Courier _courier;
+
+    protected boolean _deleteAfterOK;
+
+    protected File _inputDirectory, _errorDirectory, _postProcessDirectory;
+
+    protected String _inputSuffix, _postProcessSuffix, _workingSuffix,
+	    _errorSuffix;
+
+    protected FileFilter _fileFilter;
+
 } // ____________________________________________________________________________

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -26,6 +26,8 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
@@ -43,10 +45,12 @@
 import org.jboss.soa.esb.ConfigurationException;
 import org.jboss.soa.esb.addressing.EPR;
 import org.jboss.soa.esb.addressing.eprs.JMSEpr;
+import org.jboss.soa.esb.common.Environment;
 import org.jboss.soa.esb.couriers.Courier;
 import org.jboss.soa.esb.couriers.CourierException;
 import org.jboss.soa.esb.couriers.CourierFactory;
 import org.jboss.soa.esb.couriers.CourierUtil;
+import org.jboss.soa.esb.filter.FilterManager;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.helpers.NamingContext;
 import org.jboss.soa.esb.listeners.ListenerTagNames;
@@ -61,386 +65,462 @@
 
 public class JmsGatewayListener extends AbstractThreadedManagedLifecycle
 {
-        /**
+    /**
          * serial version uid for this class
          */
-        private static final long serialVersionUID = 5070422864110923930L;
+    private static final long serialVersionUID = 5070422864110923930L;
 
-        public JmsGatewayListener (ConfigTree listenerConfig) throws ConfigurationException
-	{
-            super(listenerConfig) ;
-            _config = listenerConfig;
-            checkMyParms();
-	} // __________________________________
+    public JmsGatewayListener(ConfigTree listenerConfig)
+	    throws ConfigurationException
+    {
+	super(listenerConfig);
+	_config = listenerConfig;
+	checkMyParms();
+    } // __________________________________
 
-
-        /**
+    /**
          * Handle the initialisation of the managed instance.
-         *
-         * @throws ManagedLifecycleException for errors while initialisation.
+         * 
+         * @throws ManagedLifecycleException
+         *                 for errors while initialisation.
          */
-        protected void doInitialise()
-            throws ManagedLifecycleException
-        {
-            try
-            {
-                _targetEprs = RegistryUtil.getEprs(_targetServiceCategory,_targetServiceName);
-                if (null == _targetEprs || _targetEprs.size() < 1)
-                    throw new ManagedLifecycleException("EPR <" + _targetServiceName + "> not found in registry") ;
-            }
-            catch (final RegistryException re)
-            {
-                throw new ManagedLifecycleException("Unexpected registry exception", re) ;
-            }
+    protected void doInitialise () throws ManagedLifecycleException
+    {
+	try
+	{
+	    _targetEprs = RegistryUtil.getEprs(_targetServiceCategory,
+		    _targetServiceName);
+	    if (null == _targetEprs || _targetEprs.size() < 1)
+		throw new ManagedLifecycleException("EPR <"
+			+ _targetServiceName + "> not found in registry");
+	}
+	catch (final RegistryException re)
+	{
+	    throw new ManagedLifecycleException(
+		    "Unexpected registry exception", re);
+	}
 
-            try
-            {
-                prepareMessageReceiver();
-            }
-            catch (final ConnectionException ce)
-            {
-               throw new ManagedLifecycleException("Unexpected connection exception from prepareMessageReceiver", ce);
-            }
-            catch (final JMSException jmse)
-            {
-                throw new ManagedLifecycleException("Unexpected JMS error from prepareMessageReceiver", jmse);
-            }
-            catch (final ConfigurationException ce)
-            {
-                throw new ManagedLifecycleException("Unexpected configuration exception from prepareMessageReceiver", ce);
-            }
+	try
+	{
+	    prepareMessageReceiver();
+	}
+	catch (final ConnectionException ce)
+	{
+	    throw new ManagedLifecycleException(
+		    "Unexpected connection exception from prepareMessageReceiver",
+		    ce);
+	}
+	catch (final JMSException jmse)
+	{
+	    throw new ManagedLifecycleException(
+		    "Unexpected JMS error from prepareMessageReceiver", jmse);
+	}
+	catch (final ConfigurationException ce)
+	{
+	    throw new ManagedLifecycleException(
+		    "Unexpected configuration exception from prepareMessageReceiver",
+		    ce);
+	}
 
-            if (_serviceName != null)
-            {
-                try
-                {
-                    RegistryUtil.register(_config, _myEpr);
-                }
-                catch (final RegistryException re)
-                {
-                    throw new ManagedLifecycleException("Unexpected error during registration for epr " + _myEpr, re);
-                }
-            }
-        }
+	if (_serviceName != null)
+	{
+	    try
+	    {
+		RegistryUtil.register(_config, _myEpr);
+	    }
+	    catch (final RegistryException re)
+	    {
+		throw new ManagedLifecycleException(
+			"Unexpected error during registration for epr "
+				+ _myEpr, re);
+	    }
+	}
+    }
 
-        /**
+    /**
          * Execute on the thread.
          */
-        protected void doRun()
-        {
-                if (_logger.isDebugEnabled())
-                {
-                    _logger.debug("run() method of " + this.getClass().getSimpleName() +
-                        " started on thread " + Thread.currentThread().getName());
-                }
+    protected void doRun ()
+    {
+	if (_logger.isDebugEnabled())
+	{
+	    _logger.debug("run() method of " + this.getClass().getSimpleName()
+		    + " started on thread " + Thread.currentThread().getName());
+	}
 
-		while (isRunning())
+	while (isRunning())
+	{
+	    javax.jms.Message msgIn = receiveOne();
+	    if (null != msgIn)
+	    {
+		try
 		{
-			javax.jms.Message msgIn = receiveOne();
-			if (null != msgIn) {
-                try {
-                    Object obj = _processMethod.invoke(_composer,
-                            new Object[]{msgIn});
-                    if (null == obj) {
-                        _logger.warn("Action class method <" + _processMethod
-                                .getName() + "> returned a null object");
-                        continue;
-                    }
-                    // try to deliverAsync the composed message, using the
-                    // appropriate courier
-                    // to the target service
-                    try {
-                        boolean bSent = false;
-                        for (EPR current : _targetEprs) {
-                            _courier = CourierFactory.getCourier(current);
-                            try {
-                                if (_courier
-                                        .deliver((Message) obj)) {
-                                    bSent = true;
-                                    break;
-                                }
-                            }
-                            finally {
-                                CourierUtil.cleanCourier(_courier);
-                            }
-                        }
-                        if (!bSent) {
-                            String text = "Target service <" + _targetServiceCategory + "," + _targetServiceName + "> is not registered";
-                            throw new Exception(text);
-                        }
-                    }
-                    catch (ClassCastException e) {
-                        _logger.error("Action class method <" + _processMethod
-                                .getName() + "> returned a non Message object",
-                                e);
-                        continue;
-                    }
-                    catch (CourierException e) {
-                        String text = (null != _courier) ? "Courier <" + _courier
-                                .getClass().getName() + ".deliverAsync(Message) FAILED" : "NULL courier can't deliverAsync Message";
-                        _logger.error(text, e);
-                        continue;
-                    }
-                    continue;
-                }
-                catch (InvocationTargetException e) {
-                    _logger.error("Problems invoking method <" + _processMethod
-                            .getName() + ">", e);
-                }
-                catch (IllegalAccessException e) {
-                    _logger.error("Problems invoking method <" + _processMethod
-                            .getName() + ">", e);
-                }
-                catch (Exception e) {
-                    _logger.error("Unexpected problem", e);
-                }
-            }
-        }
+		    Object obj = _processMethod.invoke(_composer, new Object[]
+		    { msgIn });
+		    if (null == obj)
+		    {
+			_logger.warn("Action class method <"
+				+ _processMethod.getName()
+				+ "> returned a null object");
+			continue;
+		    }
+		    // try to deliverAsync the composed message, using the
+		    // appropriate courier
+		    // to the target service
+		    
+		    Map<String, Object> params = new HashMap<String, Object>();
+		    
+		    params.put(Environment.GATEWAY_CONFIG, _config);
+		    
+		    obj = FilterManager.getInstance().doOutputWork((Message) obj, params);
+		    
+		    try
+		    {
+			boolean bSent = false;
+			for (EPR current : _targetEprs)
+			{
+			    _courier = CourierFactory.getCourier(current);
+			    try
+			    {
+				if (_courier.deliver((Message) obj))
+				{
+				    bSent = true;
+				    break;
+				}
+			    }
+			    finally
+			    {
+				CourierUtil.cleanCourier(_courier);
+			    }
+			}
+			if (!bSent)
+			{
+			    String text = "Target service <"
+				    + _targetServiceCategory + ","
+				    + _targetServiceName
+				    + "> is not registered";
+			    throw new Exception(text);
+			}
+		    }
+		    catch (ClassCastException e)
+		    {
+			_logger.error("Action class method <"
+				+ _processMethod.getName()
+				+ "> returned a non Message object", e);
+			continue;
+		    }
+		    catch (CourierException e)
+		    {
+			String text = (null != _courier) ? "Courier <"
+				+ _courier.getClass().getName()
+				+ ".deliverAsync(Message) FAILED"
+				: "NULL courier can't deliverAsync Message";
+			_logger.error(text, e);
+			continue;
+		    }
+		    continue;
+		}
+		catch (InvocationTargetException e)
+		{
+		    _logger.error("Problems invoking method <"
+			    + _processMethod.getName() + ">", e);
+		}
+		catch (IllegalAccessException e)
+		{
+		    _logger.error("Problems invoking method <"
+			    + _processMethod.getName() + ">", e);
+		}
+		catch (Exception e)
+		{
+		    _logger.error("Unexpected problem", e);
+		}
+	    }
+	}
 
-		_logger
-				.debug("run() method of " + this.getClass().getSimpleName() + " finished on thread " + Thread
-						.currentThread().getName());
-	} // ________________________________
+	_logger.debug("run() method of " + this.getClass().getSimpleName()
+		+ " finished on thread " + Thread.currentThread().getName());
+    } // ________________________________
 
-        /**
+    /**
          * Handle the destroy of the managed instance.
-         *
-         * @throws ManagedLifecycleException for errors while destroying.
+         * 
+         * @throws ManagedLifecycleException
+         *                 for errors while destroying.
          */
-        protected void doDestroy()
-            throws ManagedLifecycleException
-        {
-            if (_serviceName != null)
-            {
-                RegistryUtil.unregister(_serviceCategory, _serviceName, _myEpr) ;
-            }
+    protected void doDestroy () throws ManagedLifecycleException
+    {
+	if (_serviceName != null)
+	{
+	    RegistryUtil.unregister(_serviceCategory, _serviceName, _myEpr);
+	}
 
-            if (_messageReceiver != null)
-            {
-                try
-                {
-                    _messageReceiver.close();
-                }
-                catch (final JMSException jmse) {} // ignore
-            }
+	if (_messageReceiver != null)
+	{
+	    try
+	    {
+		_messageReceiver.close();
+	    }
+	    catch (final JMSException jmse)
+	    {
+	    } // ignore
+	}
 
-            if (_queueSession != null)
-            {
-                    _pool.closeSession(_queueSession);
-            }
-        }
-
-	/**
-	 * Check for mandatory and optional attributes in parameter tree
-	 *
-	 * @throws ConfigurationException -
-	 *             if mandatory atts are not right or actionClass not in
-	 *             classpath
-	 */
-	protected void checkMyParms () throws ConfigurationException
+	if (_queueSession != null)
 	{
-		// Third arg is null - Exception will be thrown if attribute is not
-		// found
-		_targetServiceCategory = ListenerUtil.obtainAtt(_config,
-				ListenerTagNames.TARGET_SERVICE_CATEGORY_TAG, null);
-		_targetServiceName = ListenerUtil.obtainAtt(_config,
-				ListenerTagNames.TARGET_SERVICE_NAME_TAG, null);
+	    _pool.closeSession(_queueSession);
+	}
+    }
 
-		_queueName = ListenerUtil.obtainAtt(_config,
-				JMSEpr.DESTINATION_NAME_TAG, null);
+    /**
+         * Check for mandatory and optional attributes in parameter tree
+         * 
+         * @throws ConfigurationException -
+         *                 if mandatory atts are not right or actionClass not in
+         *                 classpath
+         */
+    protected void checkMyParms () throws ConfigurationException
+    {
+	// Third arg is null - Exception will be thrown if attribute is not
+	// found
+	_targetServiceCategory = ListenerUtil.obtainAtt(_config,
+		ListenerTagNames.TARGET_SERVICE_CATEGORY_TAG, null);
+	_targetServiceName = ListenerUtil.obtainAtt(_config,
+		ListenerTagNames.TARGET_SERVICE_NAME_TAG, null);
 
-		resolveComposerClass();
+	_queueName = ListenerUtil.obtainAtt(_config,
+		JMSEpr.DESTINATION_NAME_TAG, null);
 
-		// No problem if selector is null - everything in queue will be returned
-		_messageSelector = _config.getAttribute(JMSEpr.MESSAGE_SELECTOR_TAG);
+	resolveComposerClass();
+
+	// No problem if selector is null - everything in queue will be returned
+	_messageSelector = _config.getAttribute(JMSEpr.MESSAGE_SELECTOR_TAG);
+	_logger.debug("No value specified for: " + JMSEpr.MESSAGE_SELECTOR_TAG
+		+ " - All messages in queue will be received by this listener");
+    } // ________________________________
+
+    protected void resolveComposerClass () throws ConfigurationException
+    {
+	try
+	{
+	    String sProcessMethod = null;
+	    _composerName = _config
+		    .getAttribute(ListenerTagNames.GATEWAY_COMPOSER_CLASS_TAG);
+	    if (null != _composerName)
+	    { // class attribute
+		_composerClass = ClassUtil.forName(_composerName, getClass());
+		Constructor oConst = _composerClass.getConstructor(new Class[]
+		{ ConfigTree.class });
+		_composer = oConst.newInstance(_config);
+		sProcessMethod = _config
+			.getAttribute(
+				ListenerTagNames.GATEWAY_COMPOSER_METHOD_TAG,
+				"process");
+	    }
+	    else
+	    {
+		_composerName = PackageJmsMessageContents.class.getName();
+		_composerClass = PackageJmsMessageContents.class;
+		_composer = new PackageJmsMessageContents();
+		sProcessMethod = "process";
 		_logger
-				.debug("No value specified for: " + JMSEpr.MESSAGE_SELECTOR_TAG + " - All messages in queue will be received by this listener");
-	} // ________________________________
+			.debug("No <" + ListenerTagNames.ACTION_ELEMENT_TAG
+				+ "> element found in configuration"
+				+ " -  Using default composer class : "
+				+ _composerName);
+	    }
 
-	protected void resolveComposerClass () throws ConfigurationException
+	    _processMethod = _composerClass.getMethod(sProcessMethod,
+		    new Class[]
+		    { Object.class });
+	}
+	catch (Exception ex)
 	{
-		try
-		{
-            String sProcessMethod = null;
-            _composerName = _config.getAttribute(ListenerTagNames.GATEWAY_COMPOSER_CLASS_TAG);
-            if (null != _composerName)
-            { // class attribute
-                _composerClass = ClassUtil.forName(_composerName, getClass());
-                Constructor oConst = _composerClass.getConstructor(new Class[]
-                { ConfigTree.class });
-                _composer = oConst.newInstance(_config);
-                sProcessMethod = _config.getAttribute(ListenerTagNames.GATEWAY_COMPOSER_METHOD_TAG, "process");
-            }
-			else
-			{
-				_composerName = PackageJmsMessageContents.class.getName();
-				_composerClass = PackageJmsMessageContents.class;
-				_composer = new PackageJmsMessageContents();
-				sProcessMethod = "process";
-				_logger
-						.debug("No <" + ListenerTagNames.ACTION_ELEMENT_TAG + "> element found in configuration" + " -  Using default composer class : " + _composerName);
-			}
+	    throw new ConfigurationException(ex);
+	}
+    } // ________________________________
 
-			_processMethod = _composerClass.getMethod(sProcessMethod,
-					new Class[] { Object.class });
-		}
-		catch (Exception ex)
-		{
-			throw new ConfigurationException(ex);
-		}
-	} // ________________________________
+    private void prepareMessageReceiver () throws ConfigurationException,
+	    JMSException, ConnectionException
+    {
+	_queueSession = null;
+	_queue = null;
 
-	private void prepareMessageReceiver () throws ConfigurationException, JMSException, ConnectionException
+	Properties environment = new Properties();
+
+	String sJndiURL = _config.getAttribute(JMSEpr.JNDI_URL_TAG);
+	String sJndiContextFactory = _config
+		.getAttribute(JMSEpr.JNDI_CONTEXT_FACTORY_TAG);
+	String sJndiPkgPrefix = _config
+		.getAttribute(JMSEpr.JNDI_PKG_PREFIX_TAG);
+	if (sJndiURL != null)
+	    environment.setProperty(Context.PROVIDER_URL, sJndiURL);
+	if (sJndiContextFactory != null)
+	    environment.setProperty(Context.INITIAL_CONTEXT_FACTORY,
+		    sJndiContextFactory);
+	if (sJndiPkgPrefix != null)
+	    environment.setProperty(Context.URL_PKG_PREFIXES, sJndiPkgPrefix);
+	Set<String> names = _config.getAttributeNames();
+	for (String name : names)
 	{
-		_queueSession = null;
-		_queue = null;
+	    if (name.startsWith("java.naming."))
+	    {
+		environment.setProperty(name, _config.getAttribute(name));
+	    }
+	}
+	Context oJndiCtx = NamingContext.getServerContext(environment);
 
-        Properties environment = new Properties();
+	if (null == oJndiCtx)
+	    throw new ConfigurationException("Unable fo obtain jndi context <"
+		    + sJndiURL + "," + sJndiContextFactory + ","
+		    + sJndiPkgPrefix + ">");
 
-        String sJndiURL = _config.getAttribute(JMSEpr.JNDI_URL_TAG);
-        String sJndiContextFactory = _config.getAttribute(JMSEpr.JNDI_CONTEXT_FACTORY_TAG);
-        String sJndiPkgPrefix = _config.getAttribute(JMSEpr.JNDI_PKG_PREFIX_TAG);
-        if (sJndiURL!=null) environment.setProperty(Context.PROVIDER_URL, sJndiURL);
-        if (sJndiContextFactory!=null) environment.setProperty(Context.INITIAL_CONTEXT_FACTORY, sJndiContextFactory);
-        if (sJndiPkgPrefix!=null) environment.setProperty(Context.URL_PKG_PREFIXES, sJndiPkgPrefix);
-        Set<String> names=_config.getAttributeNames();
-        for (String name : names) {
-            if (name.startsWith("java.naming.")) {
-                environment.setProperty(name, _config.getAttribute(name));
-            }
-        }
-        Context oJndiCtx = NamingContext.getServerContext(environment);
+	String sFactClass = ListenerUtil.obtainAtt(_config,
+		JMSEpr.CONNECTION_FACTORY_TAG, "ConnectionFactory");
+	if (null == _config.getAttribute(JMSEpr.CONNECTION_FACTORY_TAG))
+	    _logger.debug("No value specified for "
+		    + JMSEpr.CONNECTION_FACTORY_TAG + " attribute"
+		    + " -  Using default of: '" + sFactClass + "'");
+	_serviceCategory = _config
+		.getAttribute(ListenerTagNames.SERVICE_CATEGORY_NAME_TAG);
+	_serviceName = _config.getAttribute(ListenerTagNames.SERVICE_NAME_TAG);
+	_myEpr = (null == _serviceName) ? null : new JMSEpr(JMSEpr.QUEUE_TYPE,
+		_queueName, sFactClass, environment, _messageSelector);
 
-        if (null == oJndiCtx)
-            throw new ConfigurationException(
-                    "Unable fo obtain jndi context <" + sJndiURL + "," + sJndiContextFactory + "," + sJndiPkgPrefix + ">");
+	_pool = JmsConnectionPoolContainer.getPool(environment, sFactClass,
+		JMSEpr.QUEUE_TYPE);
 
-         String sFactClass = ListenerUtil.obtainAtt(_config,
-                 JMSEpr.CONNECTION_FACTORY_TAG, "ConnectionFactory");
-         if (null == _config.getAttribute(JMSEpr.CONNECTION_FACTORY_TAG))
-            _logger
-                    .debug("No value specified for " + JMSEpr.CONNECTION_FACTORY_TAG + " attribute" + " -  Using default of: '" + sFactClass + "'");
-         _serviceCategory = _config
-                 .getAttribute(ListenerTagNames.SERVICE_CATEGORY_NAME_TAG);
-         _serviceName = _config.getAttribute(ListenerTagNames.SERVICE_NAME_TAG);
-         _myEpr = (null == _serviceName) ? null : new JMSEpr(JMSEpr.QUEUE_TYPE,
-                 _queueName, sFactClass, environment, _messageSelector);
+	try
+	{
+	    _queueSession = _pool.getQueueSession();
+	}
+	catch (NamingException ne)
+	{
+	    throw new ConfigurationException(
+		    "Failed to obtain queue session from pool", ne);
+	}
 
-         _pool = JmsConnectionPoolContainer.getPool(environment, sFactClass, JMSEpr.QUEUE_TYPE);
+	try
+	{
+	    _queue = (Queue) oJndiCtx.lookup(_queueName);
+	}
+	catch (NamingException nex)
+	{
+	    try
+	    {
+		oJndiCtx = NamingContext.getServerContext(environment);
+		_queue = (Queue) oJndiCtx.lookup(_queueName);
+	    }
+	    catch (NamingException ne)
+	    {
+		_queue = _queueSession.createQueue(_queueName);
+	    }
+	}
 
-         try {
-             _queueSession = _pool.getQueueSession();
-         } catch (NamingException ne) {
-             throw new ConfigurationException("Failed to obtain queue session from pool", ne) ;
-         }
+	_messageReceiver = _queueSession.createReceiver(_queue,
+		_messageSelector);
+    } // ________________________________
 
-         try {
-             _queue = (Queue) oJndiCtx.lookup(_queueName);
-         } catch (NamingException nex) {
-             try {
-                 oJndiCtx = NamingContext.getServerContext(environment);
-                 _queue = (Queue) oJndiCtx.lookup(_queueName);
-             } catch (NamingException ne) {
-                 _queue = _queueSession.createQueue(_queueName);
-             }
-         }
+    /**
+         * Receive one message and retry if connection
+         * 
+         * @return javax.jms.Message - One input message, or null
+         */
+    protected javax.jms.Message receiveOne ()
+    {
+	while (isRunning())
+	    try
+	    {
+		javax.jms.Message ret = _messageReceiver.receive(200);
+		if (null != ret)
+		    return ret;
+	    }
+	    catch (JMSException oJ)
+	    {
+		if (_logger.isDebugEnabled())
+		{
+		    _logger
+			    .debug(
+				    "JMS error on receive.  Attempting JMS Destination reconnect.",
+				    oJ);
+		}
+		try
+		{
+		    prepareMessageReceiver();
+		    errorDelay = 0;
+		}
+		// try to reconnect to the queue
+		catch (Exception e)
+		{
+		    if (_logger.isDebugEnabled())
+		    {
+			_logger.debug("Reconnecting to Queue", e);
+		    }
+		    if (errorDelay == 0)
+		    {
+			errorDelay = MIN_ERROR_DELAY;
+		    }
+		    else if (errorDelay < MAX_ERROR_DELAY)
+		    {
+			errorDelay <<= 1;
+		    }
+		    _logger
+			    .warn("Error reconnecting to Queue, backing off for "
+				    + errorDelay + " milliseconds");
+		    waitForRunningStateChange(
+			    ManagedLifecycleThreadState.STOPPING, errorDelay);
+		}
+	    }
+	return null;
+    } // ________________________________
 
-		_messageReceiver = _queueSession.createReceiver(_queue,
-				_messageSelector);
-	} // ________________________________
+    protected final static Logger _logger = Logger
+	    .getLogger(JmsGatewayListener.class);
 
-	/**
-	 * Receive one message and retry if connection
-	 *
-	 * @return javax.jms.Message - One input message, or null
-	 */
-	protected javax.jms.Message receiveOne ()
-	{
-		while (isRunning())
-			try
-			{
-				javax.jms.Message ret = _messageReceiver.receive(200);
-				if (null != ret) return ret;
-			}
-			catch (JMSException oJ)
-			{
-                                if (_logger.isDebugEnabled())
-                                {
-                                    _logger.debug("JMS error on receive.  Attempting JMS Destination reconnect.",oJ);
-                                }
-				try
-				{
-					prepareMessageReceiver();
-                                        errorDelay = 0 ;
-				}
-				// try to reconnect to the queue
-				catch (Exception e)
-				{
-                                        if (_logger.isDebugEnabled())
-                                        {
-                                            _logger.debug("Reconnecting to Queue", e);
-                                        }
-                                        if (errorDelay == 0)
-                                        {
-                                            errorDelay = MIN_ERROR_DELAY ;
-                                        }
-                                        else if (errorDelay < MAX_ERROR_DELAY)
-                                        {
-                                            errorDelay <<= 1 ;
-                                        }
-                                        _logger.warn("Error reconnecting to Queue, backing off for " + errorDelay + " milliseconds") ;
-                                        waitForRunningStateChange(ManagedLifecycleThreadState.STOPPING, errorDelay) ;
-				}
-			}
-		return null;
-	} // ________________________________
+    protected String _queueName;
 
-   protected final static Logger _logger = Logger
-			.getLogger(JmsGatewayListener.class);
+    protected QueueSession _queueSession;
 
-	protected String _queueName;
+    protected Queue _queue;
 
-	protected QueueSession _queueSession;
+    protected MessageConsumer _messageReceiver;
 
-	protected Queue _queue;
+    protected String _messageSelector;
 
-	protected MessageConsumer _messageReceiver;
+    protected ConfigTree _config;
 
-	protected String _messageSelector;
+    protected String _serviceCategory, _serviceName;
 
-	protected ConfigTree _config;
+    protected String _targetServiceCategory, _targetServiceName;
 
-	protected String _serviceCategory, _serviceName;
+    protected EPR _myEpr;
 
-	protected String _targetServiceCategory, _targetServiceName;
+    protected Collection<EPR> _targetEprs;
 
-	protected EPR _myEpr;
+    protected String _composerName;
 
-	protected Collection<EPR> _targetEprs;
+    protected Class _composerClass;
 
-	protected String _composerName;
+    protected Object _composer;
 
-	protected Class _composerClass;
+    protected Method _processMethod;
 
-	protected Object _composer;
+    protected Courier _courier;
 
-	protected Method _processMethod;
+    protected JmsConnectionPool _pool;
 
-	protected Courier _courier;
-    
-    protected JmsConnectionPool _pool;
     /**
-     * The minimum error delay.
-     */
-    private static final long MIN_ERROR_DELAY = 1000 ;
+         * The minimum error delay.
+         */
+    private static final long MIN_ERROR_DELAY = 1000;
+
     /**
-     * The maximum error delay.
-     */
-    private static final long MAX_ERROR_DELAY = (MIN_ERROR_DELAY << 5) ;
-    
+         * The maximum error delay.
+         */
+    private static final long MAX_ERROR_DELAY = (MIN_ERROR_DELAY << 5);
+
     /**
-     * The error delay.
-     */
-    private long errorDelay ;
+         * The error delay.
+         */
+    private long errorDelay;
 
 }

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/PackageJmsMessageContents.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/PackageJmsMessageContents.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/PackageJmsMessageContents.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -30,6 +30,7 @@
 import javax.jms.ObjectMessage;
 import javax.jms.TextMessage;
 
+import org.jboss.soa.esb.common.Environment;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.message.format.MessageFactory;
 
@@ -62,7 +63,7 @@
          message.getBody().add(msg.getObject());
      }
      if (jmsMsg.getJMSMessageID()!=null) {
-         message.getBody().add("MessageId", jmsMsg.getJMSMessageID());
+         message.getBody().add(Environment.JMS_MESSAGE_ID, jmsMsg.getJMSMessageID());
      }
      Enumeration<String> EE = jmsMsg.getPropertyNames();
      if (null != EE)

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -46,10 +46,12 @@
 import org.jboss.soa.esb.addressing.EPR;
 import org.jboss.soa.esb.addressing.MalformedEPRException;
 import org.jboss.soa.esb.addressing.eprs.JDBCEpr;
+import org.jboss.soa.esb.common.Environment;
 import org.jboss.soa.esb.couriers.Courier;
 import org.jboss.soa.esb.couriers.CourierException;
 import org.jboss.soa.esb.couriers.CourierFactory;
 import org.jboss.soa.esb.couriers.CourierUtil;
+import org.jboss.soa.esb.filter.FilterManager;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.helpers.persist.JdbcCleanConn;
 import org.jboss.soa.esb.helpers.persist.SimpleDataSource;
@@ -86,742 +88,781 @@
 public class SqlTableGatewayListener extends AbstractThreadedManagedLifecycle
 {
 
-        /**
+    /**
          * serial version uid for this class
          */
-        private static final long serialVersionUID = -4394272471377134121L;
-    
-        public SqlTableGatewayListener(ConfigTree config)
-            throws ConfigurationException
-	{
-            super(config) ;
-            _config = config;
-            _sleepBetweenPolls = 10000; // milliseconds TODO magic number
-            checkMyParms();
-	} // __________________________________
-        
-        /**
+    private static final long serialVersionUID = -4394272471377134121L;
+
+    public SqlTableGatewayListener(ConfigTree config)
+	    throws ConfigurationException
+    {
+	super(config);
+	_config = config;
+	_sleepBetweenPolls = 10000; // milliseconds TODO magic number
+	checkMyParms();
+    } // __________________________________
+
+    /**
          * Handle the initialisation of the managed instance.
          * 
-         * @throws ManagedLifecycleException for errors while initialisation.
+         * @throws ManagedLifecycleException
+         *                 for errors while initialisation.
          */
-        protected void doInitialise()
-            throws ManagedLifecycleException
-        {
-            try
-            {
-                _targetEprs = RegistryUtil.getEprs(_targetServiceCategory,_targetServiceName);
-                if (null == _targetEprs || _targetEprs.size() < 1)
-                    throw new ManagedLifecycleException("EPR <" + _targetServiceName + "> not found in registry") ;
-            }
-            catch (final RegistryException re)
-            {
-                throw new ManagedLifecycleException("Unexpected registry exception", re) ;
-            }
-            
-            boolean failure = true ;
-            try
-            {
-                prepareStatements();
-                failure = false ;
-            }
-            catch (final SQLException sqle)
-            {
-                throw new ManagedLifecycleException("Unexpected error initialising statements", sqle);
-            }
-            finally
-            {
-                if (failure)
-                {
-                    if (_dbConn != null)
-                    {
-                        _dbConn.release();
-                        _dbConn = null ;
-                    }
-                }
-            }
-        }
+    protected void doInitialise () throws ManagedLifecycleException
+    {
+	try
+	{
+	    _targetEprs = RegistryUtil.getEprs(_targetServiceCategory,
+		    _targetServiceName);
+	    if (null == _targetEprs || _targetEprs.size() < 1)
+		throw new ManagedLifecycleException("EPR <"
+			+ _targetServiceName + "> not found in registry");
+	}
+	catch (final RegistryException re)
+	{
+	    throw new ManagedLifecycleException(
+		    "Unexpected registry exception", re);
+	}
 
-        /**
-         * Execute on the thread.
-         */
-        protected void doRun()
-        {
-                if (_logger.isDebugEnabled())
-                {
-                    _logger.debug("doRun() method of " + this.getClass().getSimpleName() +
-                            " started on thread " + Thread.currentThread().getName());
-                }
-
-                do
+	boolean failure = true;
+	try
+	{
+	    prepareStatements();
+	    failure = false;
+	}
+	catch (final SQLException sqle)
+	{
+	    throw new ManagedLifecycleException(
+		    "Unexpected error initialising statements", sqle);
+	}
+	finally
+	{
+	    if (failure)
+	    {
+		if (_dbConn != null)
 		{
-			for (Map<String, Object> row : pollForCandidates())
-			{
-				_currentRow = row;
-				// Try to mark as 'in process' - if unsuccessful, somebody else
-				// got it first
-				if (!changeStatusToWorking()) continue;
-
-				Throwable thrown = null;
-				String text = null;
-				try
-				{
-					Object obj = _processMethod.invoke(_composer,
-							new Object[] { _currentRow });
-					if (null == obj)
-					{
-						_logger.warn("Action class method <" + _processMethod
-								.getName() + "> returned a null object");
-						continue;
-					}
-					Message message = (Message) obj;
-
-					// if(_composerClass.equals(PackageRowContents.class))
-					// {
-					// Properties props = message.getProperties();
-					// props.setProperty(JDBCEpr.DRIVER_TAG ,_driver);
-					// props.setProperty(JDBCEpr.URL_TAG ,_url);
-					// props.setProperty(JDBCEpr.USERNAME_TAG ,_user);
-					// props.setProperty(JDBCEpr.PASSWORD_TAG , _password);
-					//	        			
-					// }
-					boolean bSent = false;
-					for (EPR current : _targetEprs)
-					{
-						_courier = CourierFactory.getCourier(current);
-                                                try
-                                                {
-                                                    if (_courier.deliver(message))
-                                                    {
-                                                    	bSent = true;
-                                                    	break;
-                                                    }
-                                                }
-                                                finally
-                                                {
-                                                    CourierUtil.cleanCourier(_courier) ;
-                                                }
-					}
-					if (!bSent)
-					{
-						text = "Target service <" + _targetServiceCategory + "," + _targetServiceName + "> is not registered";
-						thrown = new Exception(text);
-					}
-				}
-				catch (InvocationTargetException e)
-				{
-					thrown = e;
-					text = "Problems invoking method <" + _processMethod
-							.getName() + ">";
-				}
-				catch (IllegalAccessException e)
-				{
-					thrown = e;
-					text = "Problems invoking method <" + _processMethod
-							.getName() + ">";
-				}
-				catch (ClassCastException e)
-				{
-					thrown = e;
-					text = "Action class method <" + _processMethod.getName() + "> returned a non Message object";
-				}
-				catch (CourierException e)
-				{
-					thrown = e;
-					text = "Courier <" + _courier.getClass().getName() + ".deliverAsync(Message) FAILED";
-				}
-				catch (MalformedEPRException ex)
-				{
-					thrown = ex;
-					text = "Courier <" + _courier.getClass().getName() + ".deliverAsync(Message) FAILED with malformed EPR.";
-				}
-
-				if (null == thrown)
-				{
-					if (_deleteAfterOK) deleteCurrentRow();
-					else
-						changeStatusToDone();
-				}
-				else
-				{
-                                        _logger.error(text);
-					_logger.debug(text, thrown);
-					changeStatusToError();
-				}
-			}
+		    _dbConn.release();
+		    _dbConn = null;
 		}
-                while (!waitForRunningStateChange(ManagedLifecycleThreadState.STOPPING, _sleepBetweenPolls)) ;
+	    }
+	}
+    }
 
-                if (_logger.isDebugEnabled())
-                {
-                    _logger.debug("run() method of " + this.getClass().getSimpleName() +
-                        " finished on thread " + Thread.currentThread().getName());
-                }
-	} // ________________________________
-
-        /**
-         * Handle the destroy of the managed instance.
-         * 
-         * @throws ManagedLifecycleException for errors while destroying.
+    /**
+         * Execute on the thread.
          */
-        protected void doDestroy()
-            throws ManagedLifecycleException
-        {
-            if (_dbConn != null)
-            {
-                _dbConn.release();
-            }
-        }
+    protected void doRun ()
+    {
+	if (_logger.isDebugEnabled())
+	{
+	    _logger.debug("doRun() method of "
+		    + this.getClass().getSimpleName() + " started on thread "
+		    + Thread.currentThread().getName());
+	}
 
-	/**
-	 * Check for mandatory and optional attributes in parameter tree
-	 * 
-	 * @throws ConfigurationException -
-	 *             if mandatory atts are not right or actionClass not in
-	 *             classpath
-	 */
-	private void checkMyParms () throws ConfigurationException
+	do
 	{
-		// Third arg is null - Exception will be thrown if attribute is not
-		// found
-		_targetServiceCategory = ListenerUtil.obtainAtt(_config,
-				ListenerTagNames.TARGET_SERVICE_CATEGORY_TAG, null);
-		_targetServiceName = ListenerUtil.obtainAtt(_config,
-				ListenerTagNames.TARGET_SERVICE_NAME_TAG, null);
+	    for (Map<String, Object> row : pollForCandidates())
+	    {
+		_currentRow = row;
+		// Try to mark as 'in process' - if unsuccessful, somebody else
+		// got it first
+		if (!changeStatusToWorking())
+		    continue;
 
-		// Polling interval
-		String sAux = _config
-				.getAttribute(ListenerTagNames.POLL_LATENCY_SECS_TAG);
-
-		if (!Util.isNullString(sAux))
+		Throwable thrown = null;
+		String text = null;
+		try
 		{
+		    Object obj = _processMethod.invoke(_composer, new Object[]
+		    { _currentRow });
+		    if (null == obj)
+		    {
+			_logger.warn("Action class method <"
+				+ _processMethod.getName()
+				+ "> returned a null object");
+			continue;
+		    }
+		    Message message = (Message) obj;
+		    Map<String, Object> params = new HashMap<String, Object>();
+		    
+		    params.put(Environment.GATEWAY_CONFIG, _config);
+		    
+		    message = FilterManager.getInstance().doOutputWork(message, params);
+		    
+		    boolean bSent = false;
+		    for (EPR current : _targetEprs)
+		    {
+			_courier = CourierFactory.getCourier(current);
 			try
 			{
-				_sleepBetweenPolls = 1000 * Long.parseLong(sAux);
+			    if (_courier.deliver(message))
+			    {
+				bSent = true;
+				break;
+			    }
 			}
-			catch (NumberFormatException e)
+			finally
 			{
-				_logger
-						.warn("Invalid poll latency - keeping default of " + (_sleepBetweenPolls / 1000));
+			    CourierUtil.cleanCourier(_courier);
 			}
+		    }
+		    if (!bSent)
+		    {
+			text = "Target service <" + _targetServiceCategory
+				+ "," + _targetServiceName
+				+ "> is not registered";
+			thrown = new Exception(text);
+		    }
 		}
+		catch (InvocationTargetException e)
+		{
+		    thrown = e;
+		    text = "Problems invoking method <"
+			    + _processMethod.getName() + ">";
+		}
+		catch (IllegalAccessException e)
+		{
+		    thrown = e;
+		    text = "Problems invoking method <"
+			    + _processMethod.getName() + ">";
+		}
+		catch (ClassCastException e)
+		{
+		    thrown = e;
+		    text = "Action class method <" + _processMethod.getName()
+			    + "> returned a non Message object";
+		}
+		catch (CourierException e)
+		{
+		    thrown = e;
+		    text = "Courier <" + _courier.getClass().getName()
+			    + ".deliverAsync(Message) FAILED";
+		}
+		catch (MalformedEPRException ex)
+		{
+		    thrown = ex;
+		    text = "Courier <"
+			    + _courier.getClass().getName()
+			    + ".deliverAsync(Message) FAILED with malformed EPR.";
+		}
+
+		if (null == thrown)
+		{
+		    if (_deleteAfterOK)
+			deleteCurrentRow();
+		    else
+			changeStatusToDone();
+		}
 		else
 		{
-			_logger
-					.warn("No value specified for: " + ListenerTagNames.POLL_LATENCY_SECS_TAG + " -  Using default of " + (_sleepBetweenPolls / 1000));
+		    _logger.error(text);
+		    _logger.debug(text, thrown);
+		    changeStatusToError();
 		}
+	    }
+	}
+	while (!waitForRunningStateChange(ManagedLifecycleThreadState.STOPPING,
+		_sleepBetweenPolls));
 
-		resolveComposerClass();
+	if (_logger.isDebugEnabled())
+	{
+	    _logger
+		    .debug("run() method of " + this.getClass().getSimpleName()
+			    + " finished on thread "
+			    + Thread.currentThread().getName());
+	}
+    } // ________________________________
 
-		_driver = ListenerUtil.obtainAtt(_config, JDBCEpr.DRIVER_TAG, null);
-		_url = ListenerUtil.obtainAtt(_config, JDBCEpr.URL_TAG, null);
-		_user = ListenerUtil.obtainAtt(_config, JDBCEpr.USERNAME_TAG, null);
-		_password = ListenerUtil.obtainAtt(_config, JDBCEpr.PASSWORD_TAG, "");
+    /**
+         * Handle the destroy of the managed instance.
+         * 
+         * @throws ManagedLifecycleException
+         *                 for errors while destroying.
+         */
+    protected void doDestroy () throws ManagedLifecycleException
+    {
+	if (_dbConn != null)
+	{
+	    _dbConn.release();
+	}
+    }
 
-		_tableName = _config.getAttribute(ListenerTagNames.SQL_TABLE_NAME_TAG);
-		if (null == _tableName)
-			_tableName = _config.getRequiredAttribute(JDBCEpr.TABLE_NAME_TAG);
-		if (Util.isNullString(_tableName))
-			throw new ConfigurationException("Empty or invalid table name");
+    /**
+         * Check for mandatory and optional attributes in parameter tree
+         * 
+         * @throws ConfigurationException -
+         *                 if mandatory atts are not right or actionClass not in
+         *                 classpath
+         */
+    private void checkMyParms () throws ConfigurationException
+    {
+	// Third arg is null - Exception will be thrown if attribute is not
+	// found
+	_targetServiceCategory = ListenerUtil.obtainAtt(_config,
+		ListenerTagNames.TARGET_SERVICE_CATEGORY_TAG, null);
+	_targetServiceName = ListenerUtil.obtainAtt(_config,
+		ListenerTagNames.TARGET_SERVICE_NAME_TAG, null);
 
-		_selectFields = ListenerUtil.obtainAtt(_config,
-				ListenerTagNames.SQL_SELECT_FIELDS_TAG, "*");
-		if (Util.isNullString(_selectFields))
-			throw new ConfigurationException(
-					"Empty or invalid list of select fields");
-		_keyFields = _config.getAttribute(ListenerTagNames.SQL_KEY_FIELDS_TAG);
-		if (null == _keyFields)
-			_keyFields = _config.getRequiredAttribute(JDBCEpr.MESSAGE_ID_COLUMN_TAG);
-		if (Util.isNullString(_keyFields))
-			throw new ConfigurationException(
-					"Empty or invalid list of key fields");
-		_inProcessField = _config
-				.getAttribute(ListenerTagNames.SQL_IN_PROCESS_FIELD_TAG);
-		if (null == _inProcessField)
-			_inProcessField = _config.getAttribute(JDBCEpr.STATUS_COLUMN_TAG);
-		if (Util.isNullString(_inProcessField))
-			throw new ConfigurationException(
-					"A valid inProcessField attribute must be specified");
+	// Polling interval
+	String sAux = _config
+		.getAttribute(ListenerTagNames.POLL_LATENCY_SECS_TAG);
 
-		_where = ListenerUtil.obtainAtt(_config,
-				ListenerTagNames.SQL_WHERE_CONDITION_TAG, "");
-		if (_where.trim().length() < 1)
-			_logger
-					.debug("No value specified for: " + ListenerTagNames.SQL_WHERE_CONDITION_TAG);
-		_orderBy = ListenerUtil.obtainAtt(_config,
-				ListenerTagNames.SQL_ORDER_BY_TAG, "");
-		if (_orderBy.trim().length() < 1)
-			_logger
-					.debug("No value specified for: " + ListenerTagNames.SQL_ORDER_BY_TAG);
-		_inProcessVals = ListenerUtil.obtainAtt(_config,
-				ListenerTagNames.SQL_IN_PROCESS_VALUES_TAG,
-				DEFAULT_IN_PROCESS_STATES);
+	if (!Util.isNullString(sAux))
+	{
+	    try
+	    {
+		_sleepBetweenPolls = 1000 * Long.parseLong(sAux);
+	    }
+	    catch (NumberFormatException e)
+	    {
+		_logger.warn("Invalid poll latency - keeping default of "
+			+ (_sleepBetweenPolls / 1000));
+	    }
+	}
+	else
+	{
+	    _logger.warn("No value specified for: "
+		    + ListenerTagNames.POLL_LATENCY_SECS_TAG
+		    + " -  Using default of " + (_sleepBetweenPolls / 1000));
+	}
 
-		_deleteAfterOK = Boolean.parseBoolean(ListenerUtil.obtainAtt(_config,
-				ListenerTagNames.SQL_POST_DEL_TAG, "false"));
-		if (null == _config.getAttribute(ListenerTagNames.SQL_POST_DEL_TAG))
-			_logger
-					.debug("No value specified for: " + ListenerTagNames.SQL_POST_DEL_TAG + " - trigger row will not be deleted - 'in process field' will be used to show processing status");
+	resolveComposerClass();
 
-		if (_inProcessVals.length() < 4)
-			throw new ConfigurationException(
-					"Parameter <" + ListenerTagNames.SQL_IN_PROCESS_VALUES_TAG + "> must be at least 4 characters long (PWED)");
+	_driver = ListenerUtil.obtainAtt(_config, JDBCEpr.DRIVER_TAG, null);
+	_url = ListenerUtil.obtainAtt(_config, JDBCEpr.URL_TAG, null);
+	_user = ListenerUtil.obtainAtt(_config, JDBCEpr.USERNAME_TAG, null);
+	_password = ListenerUtil.obtainAtt(_config, JDBCEpr.PASSWORD_TAG, "");
 
-		_columns = _selectFields.split(",");
-		if (_columns.length < 1)
-			throw new ConfigurationException("Empty list of select fields");
+	_tableName = _config.getAttribute(ListenerTagNames.SQL_TABLE_NAME_TAG);
+	if (null == _tableName)
+	    _tableName = _config.getRequiredAttribute(JDBCEpr.TABLE_NAME_TAG);
+	if (Util.isNullString(_tableName))
+	    throw new ConfigurationException("Empty or invalid table name");
 
-		_keys = _keyFields.split(",");
-		if (!"*".equals(_selectFields))
-		{
-			Set<String> colSet = new HashSet<String>(Arrays.asList(_columns));
-			if (_keys.length < 1)
-				throw new ConfigurationException("Empty list of keyFields");
-			for (String currKey : _keys)
-			{
-				if (colSet.contains(currKey)) continue;
-				else
-				{
-					StringBuilder sb = new StringBuilder().append(
-							"All key field names in the <").append(
-							ListenerTagNames.SQL_KEY_FIELDS_TAG).append(
-							"> attribute must be in the ").append(
-							ListenerTagNames.SQL_SELECT_FIELDS_TAG).append(
-							"list - '").append(currKey)
-							.append("' is not there");
-					throw new ConfigurationException(sb.toString());
-				}
-			}
-		}
-	} // ________________________________
+	_selectFields = ListenerUtil.obtainAtt(_config,
+		ListenerTagNames.SQL_SELECT_FIELDS_TAG, "*");
+	if (Util.isNullString(_selectFields))
+	    throw new ConfigurationException(
+		    "Empty or invalid list of select fields");
+	_keyFields = _config.getAttribute(ListenerTagNames.SQL_KEY_FIELDS_TAG);
+	if (null == _keyFields)
+	    _keyFields = _config
+		    .getRequiredAttribute(JDBCEpr.MESSAGE_ID_COLUMN_TAG);
+	if (Util.isNullString(_keyFields))
+	    throw new ConfigurationException(
+		    "Empty or invalid list of key fields");
+	_inProcessField = _config
+		.getAttribute(ListenerTagNames.SQL_IN_PROCESS_FIELD_TAG);
+	if (null == _inProcessField)
+	    _inProcessField = _config.getAttribute(JDBCEpr.STATUS_COLUMN_TAG);
+	if (Util.isNullString(_inProcessField))
+	    throw new ConfigurationException(
+		    "A valid inProcessField attribute must be specified");
 
-	protected void prepareStatements () throws SQLException
-	{
-		_PSscan = getDbConn().prepareStatement(scanStatement());
-		_PSupdate = getDbConn().prepareStatement(updateStatement());
-		_PSdeleteRow = getDbConn().prepareStatement(deleteStatement());
-	} // ________________________________
+	_where = ListenerUtil.obtainAtt(_config,
+		ListenerTagNames.SQL_WHERE_CONDITION_TAG, "");
+	if (_where.trim().length() < 1)
+	    _logger.debug("No value specified for: "
+		    + ListenerTagNames.SQL_WHERE_CONDITION_TAG);
+	_orderBy = ListenerUtil.obtainAtt(_config,
+		ListenerTagNames.SQL_ORDER_BY_TAG, "");
+	if (_orderBy.trim().length() < 1)
+	    _logger.debug("No value specified for: "
+		    + ListenerTagNames.SQL_ORDER_BY_TAG);
+	_inProcessVals = ListenerUtil.obtainAtt(_config,
+		ListenerTagNames.SQL_IN_PROCESS_VALUES_TAG,
+		DEFAULT_IN_PROCESS_STATES);
 
-	/*
-	 * Throw ConfigurationException for anything to do with setup. Ultimately
-	 * could do with finer grained error handling. Probably need different types
-	 * of setup exceptions.
-	 */
-	
-	protected void resolveComposerClass () throws ConfigurationException
+	_deleteAfterOK = Boolean.parseBoolean(ListenerUtil.obtainAtt(_config,
+		ListenerTagNames.SQL_POST_DEL_TAG, "false"));
+	if (null == _config.getAttribute(ListenerTagNames.SQL_POST_DEL_TAG))
+	    _logger
+		    .debug("No value specified for: "
+			    + ListenerTagNames.SQL_POST_DEL_TAG
+			    + " - trigger row will not be deleted - 'in process field' will be used to show processing status");
+
+	if (_inProcessVals.length() < 4)
+	    throw new ConfigurationException("Parameter <"
+		    + ListenerTagNames.SQL_IN_PROCESS_VALUES_TAG
+		    + "> must be at least 4 characters long (PWED)");
+
+	_columns = _selectFields.split(",");
+	if (_columns.length < 1)
+	    throw new ConfigurationException("Empty list of select fields");
+
+	_keys = _keyFields.split(",");
+	if (!"*".equals(_selectFields))
 	{
-		try
+	    Set<String> colSet = new HashSet<String>(Arrays.asList(_columns));
+	    if (_keys.length < 1)
+		throw new ConfigurationException("Empty list of keyFields");
+	    for (String currKey : _keys)
+	    {
+		if (colSet.contains(currKey))
+		    continue;
+		else
 		{
-            String sProcessMethod = null;
-            _composerName = _config.getAttribute(ListenerTagNames.GATEWAY_COMPOSER_CLASS_TAG);
-            if (null != _composerName)
-            { // class attribute
-                _composerClass = ClassUtil.forName(_composerName, getClass());
-                Constructor oConst = _composerClass.getConstructor(new Class[]
-                { ConfigTree.class });
-                _composer = oConst.newInstance(_config);
-                sProcessMethod = _config.getAttribute(ListenerTagNames.GATEWAY_COMPOSER_METHOD_TAG, "process");
-            }
-			else
-			{
-				_composerName = PackageRowContents.class.getName();
-				_composerClass = PackageRowContents.class;
-				_composer = new PackageRowContents();
-				sProcessMethod = "process";
-				_logger
-						.debug("No <" + ListenerTagNames.ACTION_ELEMENT_TAG + "> element found in configuration" + " -  Using default composer class : " + _composerName);
-			}
-	
-			_processMethod = _composerClass.getMethod(sProcessMethod,
-					new Class[] { Object.class });
+		    StringBuilder sb = new StringBuilder().append(
+			    "All key field names in the <").append(
+			    ListenerTagNames.SQL_KEY_FIELDS_TAG).append(
+			    "> attribute must be in the ").append(
+			    ListenerTagNames.SQL_SELECT_FIELDS_TAG).append(
+			    "list - '").append(currKey)
+			    .append("' is not there");
+		    throw new ConfigurationException(sb.toString());
 		}
-		catch (InvocationTargetException ex)
-		{
-			_logger.debug(ex);
-			
-			throw new ConfigurationException(ex);
-		}
-		catch (IllegalAccessException ex)
-		{
-			_logger.debug(ex);
-			
-			throw new ConfigurationException(ex);
-		}
-		catch (InstantiationException ex)
-		{
-			_logger.debug(ex);
-			
-			throw new ConfigurationException(ex);
-		}
-		catch (ClassNotFoundException ex)
-		{
-			_logger.debug(ex);
-			
-			throw new ConfigurationException(ex);
-		}
-		catch (NoSuchMethodException ex)
-		{
-			_logger.debug(ex);
-			
-			throw new ConfigurationException(ex);
-		}
-	} // ________________________________
+	    }
+	}
+    } // ________________________________
 
-	protected List<Map<String, Object>> pollForCandidates ()
+    protected void prepareStatements () throws SQLException
+    {
+	_PSscan = getDbConn().prepareStatement(scanStatement());
+	_PSupdate = getDbConn().prepareStatement(updateStatement());
+	_PSdeleteRow = getDbConn().prepareStatement(deleteStatement());
+    } // ________________________________
+
+    /*
+         * Throw ConfigurationException for anything to do with setup.
+         * Ultimately could do with finer grained error handling. Probably need
+         * different types of setup exceptions.
+         */
+
+    protected void resolveComposerClass () throws ConfigurationException
+    {
+	try
 	{
-		List<Map<String, Object>> oResults = new ArrayList<Map<String, Object>>();
-                final JdbcCleanConn oConn = getDbConn();
-		try
-		{
-			ResultSet RS = oConn.execQueryWait(_PSscan, 1);
-			ResultSetMetaData meta = RS.getMetaData();
-			while (RS.next())
-			{
-				Map<String, Object> row = new HashMap<String, Object>();
-				for (int iCurr = 1; iCurr <= meta.getColumnCount(); iCurr++)
-				{
-					String sCol = meta.getColumnName(iCurr);
-					if (!_inProcessField.equals(sCol))
-						row.put(sCol, RS.getObject(iCurr));
-				}
+	    String sProcessMethod = null;
+	    _composerName = _config
+		    .getAttribute(ListenerTagNames.GATEWAY_COMPOSER_CLASS_TAG);
+	    if (null != _composerName)
+	    { // class attribute
+		_composerClass = ClassUtil.forName(_composerName, getClass());
+		Constructor oConst = _composerClass.getConstructor(new Class[]
+		{ ConfigTree.class });
+		_composer = oConst.newInstance(_config);
+		sProcessMethod = _config
+			.getAttribute(
+				ListenerTagNames.GATEWAY_COMPOSER_METHOD_TAG,
+				"process");
+	    }
+	    else
+	    {
+		_composerName = PackageRowContents.class.getName();
+		_composerClass = PackageRowContents.class;
+		_composer = new PackageRowContents();
+		sProcessMethod = "process";
+		_logger
+			.debug("No <" + ListenerTagNames.ACTION_ELEMENT_TAG
+				+ "> element found in configuration"
+				+ " -  Using default composer class : "
+				+ _composerName);
+	    }
 
-				oResults.add(row);
-			}
-		}
-		catch (Exception e)
-		{
-                    _logger.debug("Some triggers might not have been returned", e);
-		}
-                finally
-                {
-                    try
-                    {
-                        oConn.rollback() ;
-                    }
-                    catch (final SQLException sqle) {}
-                }
-                if (_logger.isDebugEnabled())
-                {
-                    _logger.debug("Returning " + oResults.size() + " rows.\n");
-                }
-		return oResults;
-	} // ________________________________
+	    _processMethod = _composerClass.getMethod(sProcessMethod,
+		    new Class[]
+		    { Object.class });
+	}
+	catch (InvocationTargetException ex)
+	{
+	    _logger.debug(ex);
 
-	/**
-	 * Obtain a new database connection with parameter info
-	 * 
-	 * @return A new connection
-	 * @throws ConfigurationException -
-	 *             if problems are encountered
-	 */
-	protected JdbcCleanConn getDbConn()
+	    throw new ConfigurationException(ex);
+	}
+	catch (IllegalAccessException ex)
 	{
-		if (null == _dbConn)
-		{
-			DataSource oDS = new SimpleDataSource(_driver, _url, _user,
-					_password);
-			_dbConn = new JdbcCleanConn(oDS);
-		}
-		return _dbConn;
-	} // ________________________________
+	    _logger.debug(ex);
 
-	/**
-	 * Assemble the SQL statement to scan (poll) the table
-	 * 
-	 * @return - The resulting SQL statement
-	 */
-	protected String scanStatement ()
+	    throw new ConfigurationException(ex);
+	}
+	catch (InstantiationException ex)
 	{
-		StringBuilder sb = new StringBuilder().append("select ").append(
-				_selectFields).append(" from ").append(_tableName);
+	    _logger.debug(ex);
 
-		boolean bWhere = !Util.isNullString(_where);
-		if (bWhere) sb.append(" where ").append(_where);
-		sb.append((bWhere) ? " and " : " where ");
+	    throw new ConfigurationException(ex);
+	}
+	catch (ClassNotFoundException ex)
+	{
+	    _logger.debug(ex);
 
-		String sLike = _inProcessVals.substring(0, 1).toUpperCase();
-		sb.append(" upper(").append(_inProcessField).append(") like '").append(
-				sLike).append("%'");
+	    throw new ConfigurationException(ex);
+	}
+	catch (NoSuchMethodException ex)
+	{
+	    _logger.debug(ex);
 
-		if (!Util.isNullString(_orderBy))
-			sb.append(" order by ").append(_orderBy);
-		return sb.toString();
-	} // ________________________________
+	    throw new ConfigurationException(ex);
+	}
+    } // ________________________________
 
-	/**
-	 * Assemble the SQL statement to update the field in the "inProcessField"
-	 * parameter
-	 * 
-	 * in the table row uniquely identified by the list of fields in the
-	 * "keyFields" parameter
-	 * 
-	 * @return - The resulting SQL statement
-	 */
-	protected String updateStatement ()
+    protected List<Map<String, Object>> pollForCandidates ()
+    {
+	List<Map<String, Object>> oResults = new ArrayList<Map<String, Object>>();
+	final JdbcCleanConn oConn = getDbConn();
+	try
 	{
-		StringBuilder sb = new StringBuilder().append("update ").append(
-				_tableName).append(" set ").append(_inProcessField).append(
-				" = ? where ").append(_inProcessField).append(" = ?");
-		for (String sCurr : _keys)
+	    ResultSet RS = oConn.execQueryWait(_PSscan, 1);
+	    ResultSetMetaData meta = RS.getMetaData();
+	    while (RS.next())
+	    {
+		Map<String, Object> row = new HashMap<String, Object>();
+		for (int iCurr = 1; iCurr <= meta.getColumnCount(); iCurr++)
 		{
-			sb.append(" and ").append(sCurr).append(" = ?");
+		    String sCol = meta.getColumnName(iCurr);
+		    if (!_inProcessField.equals(sCol))
+			row.put(sCol, RS.getObject(iCurr));
 		}
-		return sb.toString();
-	} // ________________________________
 
-	/**
-	 * Assemble the SQL "select for update" statement for the "inProcessField"
-	 * parameter
-	 * 
-	 * in the table row uniquely identified by the list of fields in the
-	 * "keyFields" parameter
-	 * 
-	 * @return - The resulting SQL statement
-	 */
-	protected String selectForUpdStatement ()
+		oResults.add(row);
+	    }
+	}
+	catch (Exception e)
 	{
-		StringBuilder sb = new StringBuilder().append("select ").append(
-				_inProcessField).append(" from ").append(_tableName).append(
-				" where ");
-		int iCurr = 0;
-		for (String sCurr : _keys)
-		{
-			if (iCurr++ > 0) sb.append(" and ");
-			sb.append(sCurr).append(" = ?");
-		}
-		
-		/*
-		 * HS QL does not support FOR UPDATE! All tables appear to
-		 * be inherently updatable!
-		 */
-		
-		if (_driver.contains("hsqldb"))
-			return sb.toString();
-		else
-			return sb.append(" for update").toString();
-	} // ________________________________
+	    _logger.debug("Some triggers might not have been returned", e);
+	}
+	finally
+	{
+	    try
+	    {
+		oConn.rollback();
+	    }
+	    catch (final SQLException sqle)
+	    {
+	    }
+	}
+	if (_logger.isDebugEnabled())
+	{
+	    _logger.debug("Returning " + oResults.size() + " rows.\n");
+	}
+	return oResults;
+    } // ________________________________
 
-	/**
-	 * Assemble the SQL statement to delete the current row in the table row
-	 * uniquely identified by the list of fields in the "keyFields" parameter
-	 * 
-	 * @return - The resulting SQL statement
-	 */
-	protected String deleteStatement ()
+    /**
+         * Obtain a new database connection with parameter info
+         * 
+         * @return A new connection
+         * @throws ConfigurationException -
+         *                 if problems are encountered
+         */
+    protected JdbcCleanConn getDbConn ()
+    {
+	if (null == _dbConn)
 	{
-		StringBuilder sb = new StringBuilder().append("delete from ").append(
-				_tableName).append(" where ");
-		int iCurr = 0;
-		for (String sCurr : _keys)
-		{
-			if (iCurr++ > 0) sb.append(" and ");
-			sb.append(sCurr).append(" = ?");
-		}
-		return sb.toString();
-	} // ________________________________
+	    DataSource oDS = new SimpleDataSource(_driver, _url, _user,
+		    _password);
+	    _dbConn = new JdbcCleanConn(oDS);
+	}
+	return _dbConn;
+    } // ________________________________
 
-	/**
-	 * Try to delete 'current row' from polled table
-	 * 
-	 * @return true if row deletion was successful - false otherwise
-	 */
-	protected boolean deleteCurrentRow ()
+    /**
+         * Assemble the SQL statement to scan (poll) the table
+         * 
+         * @return - The resulting SQL statement
+         */
+    protected String scanStatement ()
+    {
+	StringBuilder sb = new StringBuilder().append("select ").append(
+		_selectFields).append(" from ").append(_tableName);
+
+	boolean bWhere = !Util.isNullString(_where);
+	if (bWhere)
+	    sb.append(" where ").append(_where);
+	sb.append((bWhere) ? " and " : " where ");
+
+	String sLike = _inProcessVals.substring(0, 1).toUpperCase();
+	sb.append(" upper(").append(_inProcessField).append(") like '").append(
+		sLike).append("%'");
+
+	if (!Util.isNullString(_orderBy))
+	    sb.append(" order by ").append(_orderBy);
+	return sb.toString();
+    } // ________________________________
+
+    /**
+         * Assemble the SQL statement to update the field in the
+         * "inProcessField" parameter
+         * 
+         * in the table row uniquely identified by the list of fields in the
+         * "keyFields" parameter
+         * 
+         * @return - The resulting SQL statement
+         */
+    protected String updateStatement ()
+    {
+	StringBuilder sb = new StringBuilder().append("update ").append(
+		_tableName).append(" set ").append(_inProcessField).append(
+		" = ? where ").append(_inProcessField).append(" = ?");
+	for (String sCurr : _keys)
 	{
-		try
-		{
-			int iParm = 1;
-			for (String sColName : _keys)
-                        {
-                                final String val = String.valueOf(_currentRow.get(sColName));
-				_PSdeleteRow.setString(iParm++, val);
-                        }
+	    sb.append(" and ").append(sCurr).append(" = ?");
+	}
+	return sb.toString();
+    } // ________________________________
 
-			try
-			{
-				getDbConn().execUpdWait(_PSdeleteRow, 5);
-				getDbConn().commit();
-				return true;
-			}
-			catch (Exception e)
-			{
-				_logger.debug("Delete row has failed.  Rolling back!!", e);
-			}
+    /**
+         * Assemble the SQL "select for update" statement for the
+         * "inProcessField" parameter
+         * 
+         * in the table row uniquely identified by the list of fields in the
+         * "keyFields" parameter
+         * 
+         * @return - The resulting SQL statement
+         */
+    protected String selectForUpdStatement ()
+    {
+	StringBuilder sb = new StringBuilder().append("select ").append(
+		_inProcessField).append(" from ").append(_tableName).append(
+		" where ");
+	int iCurr = 0;
+	for (String sCurr : _keys)
+	{
+	    if (iCurr++ > 0)
+		sb.append(" and ");
+	    sb.append(sCurr).append(" = ?");
+	}
 
-			try
-			{
-				getDbConn().rollback();
-			}
-			catch (Exception e)
-			{
-				_logger.debug("Unable to rollback delete row", e);
-			}
-		}
-		catch (Exception e)
-		{
-			_logger.debug("Unexpected exception.", e);
-		}
-		return false;
-	} // ________________________________
+	/*
+         * HS QL does not support FOR UPDATE! All tables appear to be inherently
+         * updatable!
+         */
 
-	protected String getStatus (ROW_STATE p_oState)
+	if (_driver.contains("hsqldb"))
+	    return sb.toString();
+	else
+	    return sb.append(" for update").toString();
+    } // ________________________________
+
+    /**
+         * Assemble the SQL statement to delete the current row in the table row
+         * uniquely identified by the list of fields in the "keyFields"
+         * parameter
+         * 
+         * @return - The resulting SQL statement
+         */
+    protected String deleteStatement ()
+    {
+	StringBuilder sb = new StringBuilder().append("delete from ").append(
+		_tableName).append(" where ");
+	int iCurr = 0;
+	for (String sCurr : _keys)
 	{
-		int iPos = p_oState.ordinal();
-		return _inProcessVals.substring(iPos, ++iPos);
-	} // ________________________________
+	    if (iCurr++ > 0)
+		sb.append(" and ");
+	    sb.append(sCurr).append(" = ?");
+	}
+	return sb.toString();
+    } // ________________________________
 
-	protected boolean changeStatusToWorking ()
+    /**
+         * Try to delete 'current row' from polled table
+         * 
+         * @return true if row deletion was successful - false otherwise
+         */
+    protected boolean deleteCurrentRow ()
+    {
+	try
 	{
-		return changeStatus(ROW_STATE.Pending, ROW_STATE.Working);
-	} // ________________________________
+	    int iParm = 1;
+	    for (String sColName : _keys)
+	    {
+		final String val = String.valueOf(_currentRow.get(sColName));
+		_PSdeleteRow.setString(iParm++, val);
+	    }
 
-	protected boolean changeStatusToDone ()
+	    try
+	    {
+		getDbConn().execUpdWait(_PSdeleteRow, 5);
+		getDbConn().commit();
+		return true;
+	    }
+	    catch (Exception e)
+	    {
+		_logger.debug("Delete row has failed.  Rolling back!!", e);
+	    }
+
+	    try
+	    {
+		getDbConn().rollback();
+	    }
+	    catch (Exception e)
+	    {
+		_logger.debug("Unable to rollback delete row", e);
+	    }
+	}
+	catch (Exception e)
 	{
-		return changeStatus(ROW_STATE.Working, ROW_STATE.Done);
-	} // ________________________________
+	    _logger.debug("Unexpected exception.", e);
+	}
+	return false;
+    } // ________________________________
 
-	protected boolean changeStatusToError ()
+    protected String getStatus (ROW_STATE p_oState)
+    {
+	int iPos = p_oState.ordinal();
+	return _inProcessVals.substring(iPos, ++iPos);
+    } // ________________________________
+
+    protected boolean changeStatusToWorking ()
+    {
+	return changeStatus(ROW_STATE.Pending, ROW_STATE.Working);
+    } // ________________________________
+
+    protected boolean changeStatusToDone ()
+    {
+	return changeStatus(ROW_STATE.Working, ROW_STATE.Done);
+    } // ________________________________
+
+    protected boolean changeStatusToError ()
+    {
+	return changeStatus(ROW_STATE.Working, ROW_STATE.Error);
+    } // ________________________________
+
+    protected boolean changeStatus (ROW_STATE fromState, ROW_STATE toState)
+    {
+	try
 	{
-		return changeStatus(ROW_STATE.Working, ROW_STATE.Error);
-	} // ________________________________
+	    getDbConn();
+	}
+	catch (Exception e)
+	{
+	    _logger.debug("Unable to get DB connection.", e);
+	    throw new IllegalStateException("Unable to get DB connection.", e);
+	}
 
-	protected boolean changeStatus (ROW_STATE fromState, ROW_STATE toState)
+	try
 	{
-		try
-		{
-			getDbConn();
-		}
-		catch (Exception e)
-		{
-			_logger.debug("Unable to get DB connection.", e);
-			throw new IllegalStateException("Unable to get DB connection.", e);
-		}
+	    int iParm = 3;
+	    for (String sColName : _keys)
+	    {
+		Object oVal = String.valueOf(_currentRow.get(sColName));
+		_PSupdate.setObject(iParm++, oVal);
+	    }
 
-		try
+	    try
+	    {
+		_PSupdate.setString(1, getStatus(toState));
+		_PSupdate.setString(2, getStatus(fromState));
+		final int count = getDbConn().execUpdWait(_PSupdate, 5);
+		if (count == 1)
 		{
-			int iParm = 3;
-			for (String sColName : _keys)
-			{
-				Object oVal = String.valueOf(_currentRow.get(sColName));
-				_PSupdate.setObject(iParm++, oVal);
-			}
+		    getDbConn().commit();
 
-			try
-			{
-                            _PSupdate.setString(1, getStatus(toState));
-                            _PSupdate.setString(2, getStatus(fromState));
-                            final int count = getDbConn().execUpdWait(_PSupdate, 5);
-                            if (count == 1)
-                            {
-                                getDbConn().commit();
+		    if (_logger.isDebugEnabled())
+			_logger.debug("Successfully changed row state from "
+				+ fromState + " to " + toState + ".");
 
-				if (_logger.isDebugEnabled())
-					_logger.debug("Successfully changed row state from " + fromState + " to " + toState + ".");
-
-				return true;
-                            }
-                            else
-                            {
-                                    _logger.warn("Cannot change row state from " + fromState + " to " + toState + ".  Number of rows in state " + fromState + " = " + count);
-                                    return false;
-                            }
-			}
-			catch (Exception e)
-			{
-                            final String message = "Row status change to " + toState + " has failed.  Rolling back!!" ;
-                            _logger.error(message);
-                            _logger.debug(message, e);
-			}
-
-			try
-			{
-				getDbConn().rollback();
-			}
-			catch (Exception e)
-			{
-                            final String message = "Unable to rollback row status change to " + fromState ;
-                            _logger.error(message) ;
-                            _logger.debug(message, e) ;
-			}
+		    return true;
 		}
-		catch (Exception e)
+		else
 		{
-                    final String message = "Unexpected exception." ;
-                    _logger.error(message) ;
-                    _logger.debug(message, e) ;
+		    _logger.warn("Cannot change row state from " + fromState
+			    + " to " + toState + ".  Number of rows in state "
+			    + fromState + " = " + count);
+		    return false;
 		}
+	    }
+	    catch (Exception e)
+	    {
+		final String message = "Row status change to " + toState
+			+ " has failed.  Rolling back!!";
+		_logger.error(message);
+		_logger.debug(message, e);
+	    }
 
-		return false;
-	} // ________________________________
+	    try
+	    {
+		getDbConn().rollback();
+	    }
+	    catch (Exception e)
+	    {
+		final String message = "Unable to rollback row status change to "
+			+ fromState;
+		_logger.error(message);
+		_logger.debug(message, e);
+	    }
+	}
+	catch (Exception e)
+	{
+	    final String message = "Unexpected exception.";
+	    _logger.error(message);
+	    _logger.debug(message, e);
+	}
 
-	/**
-	 * Default gateway action for SQL table rows <p/>It will just drop the
-	 * result set contents into a Message
-	 * 
-	 * @author <a
-	 *         href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
-	 * @since Version 4.0
-	 * 
-	 */
-	public static class PackageRowContents
+	return false;
+    } // ________________________________
+
+    /**
+         * Default gateway action for SQL table rows <p/>It will just drop the
+         * result set contents into a Message
+         * 
+         * @author <a
+         *         href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
+         * @since Version 4.0
+         * 
+         */
+    public static class PackageRowContents
+    {
+	public Message process (Object obj)
 	{
-		public Message process (Object obj)
-		{
-			if (!(obj instanceof Serializable))
-				throw new IllegalArgumentException("Object must be instance of Map");
+	    if (!(obj instanceof Serializable))
+		throw new IllegalArgumentException(
+			"Object must be instance of Map");
 
-			Message message = MessageFactory.getInstance().getMessage();
-			org.jboss.soa.esb.message.Properties props = message
-					.getProperties();
+	    Message message = MessageFactory.getInstance().getMessage();
+	    org.jboss.soa.esb.message.Properties props = message
+		    .getProperties();
 
-			props.setProperty(ListenerTagNames.SQL_ROW_DATA_TAG, obj);
+	    props.setProperty(ListenerTagNames.SQL_ROW_DATA_TAG, obj);
 
-			return message;
-		}
-	} // ____________________________________________________
+	    return message;
+	}
+    } // ____________________________________________________
 
-	protected final static Logger _logger = Logger
-			.getLogger(SqlTableGatewayListener.class);
+    protected final static Logger _logger = Logger
+	    .getLogger(SqlTableGatewayListener.class);
 
-	protected ConfigTree _config;
+    protected ConfigTree _config;
 
-	protected long _sleepBetweenPolls; // milliseconds
+    protected long _sleepBetweenPolls; // milliseconds
 
-	protected String _targetServiceCategory, _targetServiceName;
+    protected String _targetServiceCategory, _targetServiceName;
 
-	protected Collection<EPR> _targetEprs;
+    protected Collection<EPR> _targetEprs;
 
-	protected String _composerName;
+    protected String _composerName;
 
-	protected Class _composerClass;
+    protected Class _composerClass;
 
-	protected Object _composer;
+    protected Object _composer;
 
-	protected Method _processMethod;
+    protected Method _processMethod;
 
-	protected Courier _courier;
+    protected Courier _courier;
 
-	protected String _driver, _url, _user, _password;
+    protected String _driver, _url, _user, _password;
 
-	protected String _tableName, _selectFields, _keyFields;
+    protected String _tableName, _selectFields, _keyFields;
 
-	protected String _where, _orderBy;
+    protected String _where, _orderBy;
 
-	protected String _inProcessField, _inProcessVals;
+    protected String _inProcessField, _inProcessVals;
 
-	protected boolean _deleteAfterOK;
+    protected boolean _deleteAfterOK;
 
-	protected String[] _columns, _keys;
+    protected String[] _columns, _keys;
 
-	protected PreparedStatement _PSscan, _PSupdate, _PSdeleteRow;
+    protected PreparedStatement _PSscan, _PSupdate, _PSdeleteRow;
 
-	protected JdbcCleanConn _dbConn;
+    protected JdbcCleanConn _dbConn;
 
-	protected Map<String, Object> _currentRow;
+    protected Map<String, Object> _currentRow;
 
-	public static enum ROW_STATE
-	{
-		Pending, Working, Error, Done
-	}
+    public static enum ROW_STATE
+    {
+	Pending, Working, Error, Done
+    }
 
-	public static final String DEFAULT_IN_PROCESS_STATES = "PWED";
+    public static final String DEFAULT_IN_PROCESS_STATES = "PWED";
 } // ____________________________________________________________________________

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/AbstractManagedLifecycle.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/AbstractManagedLifecycle.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/AbstractManagedLifecycle.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -78,6 +78,8 @@
      */
     private ConfigTree config;
 
+    private LifecycleController lifecycleController;
+    
     /**
      * Construct the managed lifecycle.
      * @param config The configuration associated with this instance.
@@ -107,8 +109,10 @@
 
         this.config = config;
         
-        LifecycleController lc = new LifecycleController(this, config);
-        lc.registerMBean();
+
+        lifecycleController = new LifecycleController(this, config);
+        lifecycleController.registerMBean();
+
     }
     
     /**
@@ -163,10 +167,12 @@
         {
             doStart() ;
             changeState(ManagedLifecycleState.STARTED) ;
+            lifecycleController.setStartTime(System.currentTimeMillis());
         }
         catch (final ManagedLifecycleException mle)
         {
-            changeState(ManagedLifecycleState.STOPPED) ;
+            changeState(ManagedLifecycleState.STOPPED);
+            lifecycleController.unsetStartTime();
             throw mle ;
         }
         catch (final Exception ex)
@@ -214,6 +220,7 @@
         finally
         {
             changeState(ManagedLifecycleState.STOPPED) ;
+            lifecycleController.unsetStartTime();
         }
     }
 
@@ -252,6 +259,7 @@
         finally
         {
             changeState(ManagedLifecycleState.DESTROYED) ;
+            lifecycleController.unsetStartTime();
         }
     }
 

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/LifecycleController.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/LifecycleController.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/LifecycleController.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -21,6 +21,7 @@
  */
 package org.jboss.soa.esb.listeners.lifecycle;
 
+import java.sql.Timestamp;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.SortedSet;
@@ -56,7 +57,17 @@
 public class LifecycleController implements DynamicMBean {
 	private ManagedLifecycle m_lifecycle;
 	private ConfigTree m_config;
+	private String m_startTime;
 	
+	public static final String LIFECYCLESTATE_ATTRIB = "LifeCycleState";
+	public static final String STARTTIME_ATTRIB = "StartTime";
+	public static final String XML_ATTRIB = "ListenerXMLAsHtml";
+	
+	public static final String INIT_ACTION = "initialise";
+	public static final String START_ACTION = "start";
+	public static final String STOP_ACTION = "stop";
+	public static final String DESTROY_ACTION = "destroy";
+		
 	/**
 	 * Constructor using lifecycle and config tree.
 	 * @param f_lifecycle lifecycle
@@ -65,9 +76,26 @@
 	public LifecycleController(ManagedLifecycle f_lifecycle, ConfigTree f_configtree) {
 		m_lifecycle = f_lifecycle;
 		m_config = f_configtree;
+		m_startTime = "";
 	}
 
 	/**
+	 * StartTime mutator.
+	 * @param f_startTime start time
+	 */
+	protected void setStartTime(long f_startTime) {
+		Timestamp ts = new Timestamp(f_startTime);
+		m_startTime = ts.toString();
+	}
+	
+	/**
+	 * 
+	 */
+	protected void unsetStartTime() {
+		m_startTime = "";
+	}
+	
+	/**
 	 * Lifecycle mutator.
 	 * @param f_aml lifecycle
 	 */
@@ -75,6 +103,14 @@
 		m_lifecycle = f_aml;
 	}
 
+    /**
+     * Gets the configtree XML as escaped HTML.
+     * @return configtree XML
+     */
+    public String getListenerXMLAsHtml() {
+    	return m_config.toXml().replace("<", "&lt;").replace(">", "&gt;");
+    }
+	
 	/**
 	 * ConfigTree mutator.
 	 * @param f_ct config tree
@@ -110,7 +146,7 @@
 	public void stop() throws ManagedLifecycleException {
 		m_lifecycle.stop();
 	}
-		
+	
 	/**
 	 * Register this MBean with JBoss.
 	 */
@@ -126,19 +162,35 @@
 		
 		ObjectName listObjectName = null;
 		try {
-			String name = m_config.getName();
+			String categoryName = m_config.getAttribute(ListenerTagNames.SERVICE_CATEGORY_NAME_TAG);
+			String serviceName = m_config.getAttribute(ListenerTagNames.SERVICE_NAME_TAG);
+			String listenerName = m_config.getName();
 
-			String serviceName = m_config.getAttribute(ListenerTagNames.SERVICE_NAME_TAG);
-			String targetName = m_config.getAttribute(ListenerTagNames.TARGET_SERVICE_NAME_TAG);
+			StringBuffer objectName = new StringBuffer();
+			if (categoryName != null) {
+				objectName.append(ListenerTagNames.SERVICE_CATEGORY_NAME_TAG + "=" + categoryName);
+			}
+			
 			if (serviceName != null) {
-				listObjectName = new ObjectName("jboss.esb:name=" + name 
-						+ "," + ListenerTagNames.SERVICE_NAME_TAG + "=" + serviceName);
-			} else if (targetName != null) {
-				listObjectName = new ObjectName("jboss.esb:name=" + name
-						+ "," + ListenerTagNames.TARGET_SERVICE_NAME_TAG + "=" + targetName );				
-			} else {
-				listObjectName = new ObjectName("jboss.esb:name=" + name);
+				if (objectName.length() > 0) {
+					objectName.append(",");
+				}
+				objectName.append(ListenerTagNames.SERVICE_NAME_TAG + "=" + serviceName);
 			}
+			
+			if (listenerName != null) {
+				if (objectName.length() > 0) {
+					objectName.append(",");
+				}
+				if ("true".equals(m_config.getAttribute(ListenerTagNames.IS_GATEWAY_TAG))) {
+					objectName.append("gateway-name=" + listenerName);
+				} else {
+					objectName.append("listener-name=" +  listenerName);					
+				}
+				
+			}
+			
+			listObjectName = new ObjectName("jboss.esb:" + objectName.toString());
 		} catch (MalformedObjectNameException e1) {
 			e1.printStackTrace();
 		} catch (NullPointerException e1) {
@@ -167,7 +219,8 @@
 	}
 
 	/**
-	 * Gets the list of attributes.    We return all Lifecycle attributes from 
+	 * Gets the list of attributes.    We return all Lifecycle attributes from the ConfigTree, 
+	 * and the start time, configtree XML, and the lifecycle state.
 	 */
 	public AttributeList getAttributes(String[] arg0) {
 		AttributeList attributeList = new AttributeList();
@@ -179,9 +232,15 @@
 		}
 		
 		// Add lifecycle state to the list of properties
-		Attribute lifecycleState = new Attribute("LifecycleState", m_lifecycle.getState().toString());
+		Attribute lifecycleState = new Attribute(LIFECYCLESTATE_ATTRIB, m_lifecycle.getState().toString());
 		attributeList.add(lifecycleState);
 		
+		Attribute startTimeAttrib = new Attribute(STARTTIME_ATTRIB, m_startTime);
+		attributeList.add(startTimeAttrib);
+		
+		Attribute xmlAttrib = new Attribute(XML_ATTRIB, getListenerXMLAsHtml());
+		attributeList.add(xmlAttrib);
+		
 		return attributeList;
 	}
 
@@ -190,8 +249,12 @@
 	 */
     public synchronized String getAttribute(String name) throws AttributeNotFoundException {
     	String value = null;
-    	if (name.equals("LifecycleState")) {
+    	if (name.equals(LIFECYCLESTATE_ATTRIB)) {
         	value = m_lifecycle.getState().toString();
+        } else if (name.equals(STARTTIME_ATTRIB)) {
+        	value = m_startTime.toString();
+        } else if (name.equals(XML_ATTRIB)) {
+        	value = getListenerXMLAsHtml();
         } else {
         	value = m_config.getAttribute(name);
         }
@@ -211,7 +274,9 @@
 		SortedSet<String> names = new TreeSet<String>();
         for (Object name : m_config.getAttributeNames())
             names.add((String) name);
-        names.add("LifecycleState");
+        names.add(LIFECYCLESTATE_ATTRIB);
+        names.add(STARTTIME_ATTRIB);
+        names.add(XML_ATTRIB);
         MBeanAttributeInfo[] attrs = new MBeanAttributeInfo[names.size()];
         Iterator<String> it = names.iterator();
         for (int i = 0; i < attrs.length; i++) {
@@ -220,18 +285,19 @@
                     name, "java.lang.String", "Property " + name, true, false, false);
         }
         MBeanOperationInfo[] opers = {
+        	new MBeanOperationInfo(
+        			INIT_ACTION, "Initialise the lifecycle",
+                	null, "void", MBeanOperationInfo.ACTION),
             new MBeanOperationInfo(
-            		"start", "Start the lifecycle",
+            		START_ACTION, "Start the lifecycle",
                     null, "void", MBeanOperationInfo.ACTION),
+
             new MBeanOperationInfo(
-                    "initialise", "Initialise the lifecycle",
+            		STOP_ACTION, "Stop the lifecycle",
                     null, "void", MBeanOperationInfo.ACTION),
             new MBeanOperationInfo(
-            		"stop", "Stop the lifecycle",
+            		DESTROY_ACTION, "Destroy the lifecycle",
                     null, "void", MBeanOperationInfo.ACTION),
-            new MBeanOperationInfo(
-            		"destroy", "Destroy the lifecycle",
-                    null, "void", MBeanOperationInfo.ACTION),
         };
         return new MBeanInfo(
                 this.getClass().getName(), "Lifecycle Controller MBean",
@@ -245,28 +311,28 @@
      * an exception.
      */
 	public Object invoke(String method, Object[] arg1, String[] arg2) throws MBeanException, ReflectionException {
-		if (method.equalsIgnoreCase("start")) {
+		if (method.equalsIgnoreCase(START_ACTION)) {
 			try {
 				start();
 			} catch (ManagedLifecycleException e) {
 				throw new MBeanException(e);
 			}
 			return "Invoking the " + method + " on the lifecycle.";
-		} else if (method.equalsIgnoreCase("initialise")) {
+		} else if (method.equalsIgnoreCase(INIT_ACTION)) {
 			try {
 				initialise();
 			} catch (ManagedLifecycleException e) {
 				throw new MBeanException(e);
 			}
 			return "Invoking the " + method + " on the lifecycle.";
-		} else if (method.equalsIgnoreCase("stop")) {
+		} else if (method.equalsIgnoreCase(STOP_ACTION)) {
 			try {
 				stop();
 			} catch (ManagedLifecycleException e) {
 				throw new MBeanException(e);
 			}
 			return "Invoking the " + method + " on the lifecycle.";
-		} else if (method.equalsIgnoreCase("destroy")) {
+		} else if (method.equalsIgnoreCase(DESTROY_ACTION)) {
 			try {
 				destroy();
 			} catch (ManagedLifecycleException e) {
@@ -290,7 +356,6 @@
 	 * not used because all of the attributes provided are read-only.
 	 */
 	public AttributeList setAttributes(AttributeList arg0) {
-		// TODO Auto-generated method stub
 		return null;
 	}	
 }

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/LifecycleControllerMBean.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/LifecycleControllerMBean.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/LifecycleControllerMBean.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -28,7 +28,6 @@
  * @author <a href="mailto:tcunning at redhat.com">tcunning at redhat.com</a>
  */
 public interface LifecycleControllerMBean {
-	
 	public void initialise() throws ManagedLifecycleException;
 	public void start() throws ManagedLifecycleException;
 	public void stop() throws ManagedLifecycleException;

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -70,6 +70,11 @@
 	private final AtomicBoolean active = new AtomicBoolean(false);
 
 	/**
+	 * 
+	 */
+	private ServiceMessageCounter serviceMessageCounter;
+	
+	/**
 	 * public constructor
 	 * 
 	 * @param config
@@ -94,10 +99,13 @@
 
 		final ArrayList<ActionPipelineProcessor> processorList = new ArrayList<ActionPipelineProcessor>();
 
+		serviceMessageCounter = new ServiceMessageCounter(config);
+		serviceMessageCounter.registerMBean();
+		
 		for (final ConfigTree actionConfig : actionList)
 		{
 			final String actionClassTag = actionConfig
-					.getAttribute(ListenerTagNames.ACTION_CLASS_TAG);
+ 					.getAttribute(ListenerTagNames.ACTION_CLASS_TAG);
 			if (LOGGER.isDebugEnabled())
 			{
 				LOGGER.debug("Registering action class " + actionClassTag);
@@ -228,7 +236,7 @@
 	public boolean process(final Message message)
 	{
 		final EPR faultToAddress = getFaultToAddress(message);
-		long start = System.currentTimeMillis();
+		long start = System.nanoTime();
 		
 		if (active.get())
 		{
@@ -288,12 +296,16 @@
 						faultTo(faultToAddress, Factory.createErrorMessage(Factory.UNEXPECTED_ERROR, message, ex));
 					}
 
-					long procTime = System.currentTimeMillis() - start;
+					long procTime = System.nanoTime() - start;
+					serviceMessageCounter.update(new ActionStatusBean(procTime, count,
+							ActionStatusBean.ACTION_FAILED));
 		        	DeliveryObservableLogger.getInstance().logMessage(new MessageStatusBean(procTime, message, 
 		        			MessageStatusBean.MESSAGE_FAILED));
 					
 					return false;
 				}
+				serviceMessageCounter.update(new ActionStatusBean((System.nanoTime() - start), count,
+						ActionStatusBean.ACTION_SENT));
 			}
 
 			// Reply...
@@ -303,7 +315,7 @@
 			}
 
 			notifySuccess(messages);
-			long procTime = System.currentTimeMillis() - start;
+			long procTime = System.nanoTime() - start;
         	DeliveryObservableLogger.getInstance().logMessage(new MessageStatusBean(procTime, message, 
         			MessageStatusBean.MESSAGE_SENT));
 			return true;
@@ -313,7 +325,7 @@
 			LOGGER.debug("pipeline process disabled for message");
 
 			faultTo(faultToAddress, Factory.createErrorMessage(Factory.NOT_ENABLED, message, null));
-			long procTime = System.currentTimeMillis() - start;
+			long procTime = System.nanoTime() - start;
         	DeliveryObservableLogger.getInstance().logMessage(new MessageStatusBean(procTime, message, 
         			MessageStatusBean.MESSAGE_FAILED));
         	

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionStatusBean.java (from rev 13241, labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionStatusBean.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionStatusBean.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionStatusBean.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,75 @@
+/*
+ * 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.listeners.message;
+
+/**
+ * ActionStatusBean is a bean which wraps the information necessary to update the
+ * ServiceMessageCounter MBean.
+ * 
+ * @author <a href="mailto:tcunning at redhat.com">tcunning at redhat.com</a>
+ * @since Version 4.2
+ */
+public class ActionStatusBean {
+	private int m_procCount;
+	private String m_status;
+	private long m_procTime;
+	
+	public static final String ACTION_SENT = "SENT";
+	public static final String ACTION_FAILED = "FAILED";
+	
+	/**
+	 * Constructor
+	 * @param procTime processing time
+	 * @param f_procCount counter that identifies the action processor in the ConfigTree
+	 * @param f_status status string
+	 */
+	public ActionStatusBean(long procTime, int f_procCount, String f_status) {
+		m_procTime = procTime;
+		m_procCount = f_procCount;
+		m_status = f_status;
+	}
+	
+	/**
+	 * Process counter getter.
+	 * @return counter that identifies the action processor in the ConfigTree
+	 */
+	public int getProcCount() {
+		return m_procCount;
+	}
+	
+	/**
+	 * Status getter.
+	 * @return status of action process
+	 */
+	public String getStatus() {
+		return m_status;
+	}
+	
+	/**
+	 * Processing Time getter.
+	 * @return processing time elapsed
+	 */
+	public long getProcTime() {
+		return m_procTime;
+	}
+}

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageCounter.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageCounter.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageCounter.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -35,7 +35,8 @@
  */
 public class MessageCounter extends ServiceMBeanSupport implements MessageCounterMBean, Observer {
 
-	private String lastMessageTime;
+	private String lastSuccessfulMessageTime;
+	private String lastFailedMessageTime;
 	private int failedMessageCount;
 	private int successMessageCount;
 	private long totalProcessTime;
@@ -61,11 +62,23 @@
 	 * Get the time the last message was processed at.
 	 * @return time the last message was processed at
 	 */
-	public String getLastMessageTime() {
-		return lastMessageTime;
+	public String getLastSuccessfulMessageTime() {
+		return lastSuccessfulMessageTime;
 	}
 
 	/**
+	 * Get the time the last message was processed at.
+	 * @return time the last message was processed at
+	 */
+	public String getLastFailedMessageTime() {
+		if (lastFailedMessageTime != null) {
+			return lastFailedMessageTime;
+		} else {
+			return "No messages failed";
+		}
+	}
+	
+	/**
 	 * Get the total number of processed messages, both successful and failed.
 	 * @return total number of processed messages
 	 */
@@ -92,11 +105,13 @@
 		
 		if (msb.getMessageStatus().equals(MessageStatusBean.MESSAGE_SENT)) {
 			successMessageCount++;
+			Timestamp ts = new Timestamp(msb.getMessageTime());
+			lastSuccessfulMessageTime = ts.toString();
 		} else if (msb.getMessageStatus().equals(MessageStatusBean.MESSAGE_FAILED)) {
 			failedMessageCount++;
+			Timestamp ts = new Timestamp(msb.getMessageTime());
+			lastFailedMessageTime = ts.toString();
 		}
-		Timestamp ts = new Timestamp(msb.getMessageTime());
-		lastMessageTime = ts.toString();
 		
 		totalProcessTime += msb.getProcessTime();
         byte[] byteArray = msb.getMessage().getBody().getByteArray();
@@ -110,11 +125,12 @@
 	 * Get the average time to process a message.
 	 * @return average time to process a message 
 	 */
-	public long getAverageTime() {
-		if ((successMessageCount + failedMessageCount ) > 0) {
-			return (totalProcessTime / (successMessageCount + failedMessageCount));
+	public String getAverageSuccessTime() {
+		if ((successMessageCount) > 0) {
+			double ms = (double) totalProcessTime / (1000000 * successMessageCount);
+			return ms + " ms";
 		} else {
-			return 0;
+			return "No successful messages processed.";
 		}
 	}
 
@@ -122,9 +138,9 @@
 	 * Get the average bytes of the processed messages.
 	 * @return average bytes of the messages processed
 	 */
-	public long getAverageBytes() {
-		if ((successMessageCount + failedMessageCount) > 0 ) {
-			return (totalBytes / (successMessageCount + failedMessageCount));			
+	public long getAverageSuccessBytes() {
+		if ((successMessageCount) > 0 ) {
+			return (totalBytes / (successMessageCount));			
 		} else {
 			return 0;
 		}
@@ -134,7 +150,8 @@
 	 * Reset the counts - this resets the totals and the last message time. 
 	 */
 	public void resetCounts() {
-		lastMessageTime = null;
+		lastSuccessfulMessageTime = null;
+		lastFailedMessageTime = null;
 		successMessageCount = 0;
 		failedMessageCount = 0;
 		totalProcessTime = 0;

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageCounterMBean.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageCounterMBean.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageCounterMBean.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -36,11 +36,13 @@
 	
 	public int getFailedMessageCount();
 	
-	public String getLastMessageTime();
+	public String getLastSuccessfulMessageTime();
 
-	public long getAverageTime();
+	public String getLastFailedMessageTime();
 	
-	public long getAverageBytes();
+	public String getAverageSuccessTime();
 	
+	public long getAverageSuccessBytes();
+	
 	public void resetCounts();
 }

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/OverriddenActionProcessor.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/OverriddenActionProcessor.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/OverriddenActionProcessor.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -92,7 +92,7 @@
             }
             catch (final ConfigurationException ce)
             {
-                throw new ActionProcessingException("Unexpected exception creating action class instance") ;
+                throw new ActionProcessingException("Unexpected exception creating action class instance", ce) ;
             }
             
             messageInstanceMap.put(message, instance) ;

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/ServiceMessageCounter.java (from rev 13241, labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/ServiceMessageCounter.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/ServiceMessageCounter.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/listeners/message/ServiceMessageCounter.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,344 @@
+/*
+ * 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.listeners.message;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.management.Attribute;
+import javax.management.AttributeList;
+import javax.management.AttributeNotFoundException;
+import javax.management.DynamicMBean;
+import javax.management.InstanceAlreadyExistsException;
+import javax.management.InstanceNotFoundException;
+import javax.management.InvalidAttributeValueException;
+import javax.management.MBeanAttributeInfo;
+import javax.management.MBeanException;
+import javax.management.MBeanInfo;
+import javax.management.MBeanOperationInfo;
+import javax.management.MBeanRegistrationException;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.NotCompliantMBeanException;
+import javax.management.ObjectName;
+import javax.management.ReflectionException;
+
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.listeners.ListenerTagNames;
+
+/**
+ * Service message counter is a MBean that displays an action-by-action breakdown of
+ * how many failed and successful messages have been processed and shows the processing time
+ * of each.
+ * 
+ * @author <a href="mailto:tcunning at redhat.com">tcunning at redhat.com</a>
+ * @since Version 4.2
+ */
+public class ServiceMessageCounter implements DynamicMBean {
+	private HashMap<String, Integer> actionCounterHash;
+	private HashMap<String, Integer> actionFailedCounterHash;
+	private HashMap<String, Long> actionProcessTimeHash;
+	private ConfigTree m_config;
+	private ConfigTree[] actionArray;
+	
+	public static final String RESET_COUNTER = "resetCounter";
+	private static final String MESSAGE_COUNTER = "messages successfully processed";
+	private static final String FAILED_MESSAGE_COUNTER = "messages failed";
+	private static final String PROCESSING_TIME = "processing time";
+
+	/**
+	 * Constructor
+	 * @param f_config config tree
+	 */
+	public ServiceMessageCounter(ConfigTree f_config) {
+		actionCounterHash = new HashMap<String, Integer>();
+		actionFailedCounterHash = new HashMap<String, Integer>();
+		actionProcessTimeHash = new HashMap<String, Long>();
+		
+		m_config = f_config;
+		actionArray = m_config.getChildren(ListenerTagNames.ACTION_ELEMENT_TAG);
+
+		initHashes();
+	}
+	
+	/**
+	 * Return an action id.   If there's an action name, use that, if not,
+	 * use the "action" attribute on the action.
+	 * @param ct config tree
+	 * @return action id
+	 */
+	public String getActionId(ConfigTree ct) {
+		if (ct.getAttribute("name") != null) {
+			return ct.getAttribute("name");
+		} else if (ct.getAttribute("action") != null) {
+			return ct.getAttribute("action");
+		}
+		return null;
+	}
+	
+	/**
+	 * Initialize the hashes by setting the counts and the processing time to an initial value of 0. 
+	 */
+	public void initHashes() {
+		ConfigTree[] actionList = m_config.getChildren(ListenerTagNames.ACTION_ELEMENT_TAG);
+		
+		for (ConfigTree actionConfig : actionList) {
+			String actionId = getActionId(actionConfig);
+		 	actionCounterHash.put(actionId + " " + MESSAGE_COUNTER, new Integer(0));
+			actionFailedCounterHash.put(actionId + " " + FAILED_MESSAGE_COUNTER, new Integer(0));
+			actionProcessTimeHash.put(actionId + " " + PROCESSING_TIME, new Long(0));
+		}		
+	}
+	
+	/**
+	 * Reset the counters - set all the entries in the action counter hash 
+	 * and in the action process time hash to zero.
+	 */
+	public void resetCounter() {
+		for (String key : actionCounterHash.keySet()) {
+			actionCounterHash.put(key + " " + MESSAGE_COUNTER, new Integer(0));
+		}
+		
+		for (String key : actionFailedCounterHash.keySet()) {
+			actionFailedCounterHash.put(key + " " + FAILED_MESSAGE_COUNTER, new Integer(0));
+		}
+		
+		for (String key : actionProcessTimeHash.keySet()) {
+			actionProcessTimeHash.put(key + " " + PROCESSING_TIME, new Long(0));
+		}
+	}
+	
+	/**
+	 *  This creates the MBeanInfo object provided.     We are returning generic 
+	 *  text for the attribute descriptions (the word Property and the name of the 
+	 *  attribute), all of the attributes are read-only, and we provide four 
+	 *  invocation methods - start/stop/initialise/destroy on the Lifecycle. 
+	 */
+    public MBeanInfo getMBeanInfo() {
+		SortedSet<String> names = new TreeSet<String>();
+		
+		for (String key : actionCounterHash.keySet()) {
+			names.add(key);
+		}
+		
+		for (String key : actionProcessTimeHash.keySet()) {
+			names.add(key);
+		}
+		
+		for (String key : actionFailedCounterHash.keySet()) {
+			names.add(key);
+		}
+		
+        MBeanAttributeInfo[] attrs = new MBeanAttributeInfo[names.size()];
+        Iterator<String> it = names.iterator();
+        for (int i = 0; i < attrs.length; i++) {
+            String name = it.next();
+            attrs[i] = new MBeanAttributeInfo(
+                    name, "java.lang.String", "Property " + name, true, false, false);
+        }
+        MBeanOperationInfo[] opers = {
+        	new MBeanOperationInfo(
+        			RESET_COUNTER, "Reset the counter",
+                	null, "void", MBeanOperationInfo.ACTION)
+        };
+        return new MBeanInfo(
+                this.getClass().getName(), "Service Message Counter MBean",
+                attrs, null, opers, null); // notifications
+	}
+
+	/* (non-Javadoc)
+	 * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
+	 */
+	public Object getAttribute(String key) throws AttributeNotFoundException, MBeanException, ReflectionException {
+    	String value = null;
+    	
+    	if (actionCounterHash.containsKey(key)) {
+    		value = actionCounterHash.get(key).toString();
+    	} else if (actionProcessTimeHash.containsKey(key)) {
+    		Long processTotal = actionProcessTimeHash.get(key);
+    		String actionId = key.substring(0, key.indexOf(PROCESSING_TIME)-1);
+    		Integer successCount = actionCounterHash.get(actionId + " " + MESSAGE_COUNTER);
+    		value = "-----";
+    		if (successCount.intValue() > 0) {
+    			value = ((double) processTotal / successCount.intValue()) + " ns";
+    		}
+    	} else if (actionFailedCounterHash.containsKey(key)) {
+    		value = actionFailedCounterHash.get(key).toString();
+    	}
+
+    	if (value != null)
+            return value;
+        else
+            throw new AttributeNotFoundException("No such property: " + key);
+	}
+
+	/* (non-Javadoc)
+	 * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
+	 */
+	public AttributeList getAttributes(String[] arg0) {
+		AttributeList attributeList = new AttributeList();
+		for (String key : actionCounterHash.keySet()) {
+			Attribute at = new Attribute(key, actionCounterHash.get(key).toString());
+			attributeList.add(at);
+		}
+		
+		for (String key : actionProcessTimeHash.keySet()) {
+			Long processTotal = actionProcessTimeHash.get(key);
+			String actionId = key.substring(0, key.indexOf(PROCESSING_TIME));
+			Integer successCount = actionCounterHash.get(actionId + " " + MESSAGE_COUNTER);
+			String avgTime = "-----";
+			if (successCount.intValue() > 0) {
+				avgTime = ((double) processTotal / successCount.intValue()) + " ns";
+			}
+			Attribute at = new Attribute(key, avgTime);
+			attributeList.add(at);
+		}
+		
+		for (String key : actionFailedCounterHash.keySet()) {
+			Attribute at = new Attribute(key, actionFailedCounterHash.get(key).toString());
+			attributeList.add(at);
+		}
+
+		return attributeList;
+	}
+
+	/* (non-Javadoc)
+	 * @see javax.management.DynamicMBean#invoke(java.lang.String, java.lang.Object[], java.lang.String[])
+	 */
+	public Object invoke(String method, Object[] arg1, String[] arg2) throws MBeanException, ReflectionException {
+		if (method.equalsIgnoreCase(RESET_COUNTER)) {
+				resetCounter();
+			return "Invoking the " + method + " on the lifecycle.";
+		} else {
+			throw new ReflectionException(new NoSuchMethodException(method));
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
+	 */
+	public void setAttribute(Attribute arg0) throws AttributeNotFoundException, InvalidAttributeValueException, MBeanException, ReflectionException {
+	}
+
+	/* (non-Javadoc)
+	 * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
+	 */
+	public AttributeList setAttributes(AttributeList arg0) {
+		return null;
+	}
+
+	/**
+	 * Register this MBean with JBoss.
+	 */
+	protected void registerMBean() {
+		MBeanServer mbeanServer = null;
+		try {
+			mbeanServer = MBeanServerLocator.locateJBoss();
+		} catch (IllegalStateException ise) {
+			// If we can't find a JBoss MBeanServer, just return
+			// Needed for unit tests
+			return;
+		}
+		
+		ObjectName listObjectName = null;
+		try {
+			String categoryName = m_config.getAttribute(ListenerTagNames.SERVICE_CATEGORY_NAME_TAG);
+			String serviceName = m_config.getAttribute(ListenerTagNames.SERVICE_NAME_TAG);
+			String listenerName = m_config.getName();
+
+			StringBuffer objectName = new StringBuffer("category=MessageCounter,");
+			if (categoryName != null) {
+				objectName.append(ListenerTagNames.SERVICE_CATEGORY_NAME_TAG + "=" + categoryName);
+			}
+			
+			if (serviceName != null) {
+				if (objectName.length() > 0) {
+					objectName.append(",");
+				}
+				objectName.append(ListenerTagNames.SERVICE_NAME_TAG + "=" + serviceName);
+			}
+			
+			if (listenerName != null) {
+				if (objectName.length() > 0) {
+					objectName.append(",");
+				}
+				if ("true".equals(m_config.getAttribute(ListenerTagNames.IS_GATEWAY_TAG))) {
+					objectName.append("gateway-name=" + listenerName);
+				} else {
+					objectName.append("listener-name=" +  listenerName);					
+				}
+				
+			}
+			
+			listObjectName = new ObjectName("jboss.esb:" + objectName.toString());
+		} catch (MalformedObjectNameException e1) {
+			e1.printStackTrace();
+		} catch (NullPointerException e1) {
+			e1.printStackTrace();
+		}
+		
+		if (mbeanServer.isRegistered(listObjectName)) {
+	    	try {
+	    		mbeanServer.unregisterMBean(listObjectName);
+			} catch (InstanceNotFoundException e) {
+				e.printStackTrace();
+			} catch (MBeanRegistrationException e) {
+				e.printStackTrace();
+			}
+        }
+		
+	    try {
+	    	mbeanServer.registerMBean(this, listObjectName);
+		} catch (InstanceAlreadyExistsException e) {
+			e.printStackTrace();
+		} catch (MBeanRegistrationException e) {
+			e.printStackTrace();
+		} catch (NotCompliantMBeanException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	/**
+	 * Update the ServiceMessageCounter
+	 * @param asb ActionStatusBean
+	 */
+	public void update(ActionStatusBean asb) {		
+		String actionName = getActionId(actionArray[asb.getProcCount()]); 
+
+		if (ActionStatusBean.ACTION_SENT.equals(asb.getStatus())) {
+			Integer count = actionCounterHash.get(actionName + " " + MESSAGE_COUNTER);
+			count = count.intValue() + 1;
+			actionCounterHash.put(actionName + " " + MESSAGE_COUNTER, count);
+			Long time = actionProcessTimeHash.get(actionName + " " + PROCESSING_TIME);
+			time = time.longValue() + asb.getProcTime();
+			actionProcessTimeHash.put(actionName + " " + PROCESSING_TIME, time);
+		} else if (ActionStatusBean.ACTION_FAILED.equals(asb.getStatus())) {
+			Integer count = actionFailedCounterHash.get(actionName + " " + FAILED_MESSAGE_COUNTER);
+			count = count.intValue() + 1;
+			actionFailedCounterHash.put(actionName + " " + FAILED_MESSAGE_COUNTER, count);
+		}		
+	}
+}

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -35,6 +35,7 @@
 import org.apache.log4j.Logger;
 import org.jboss.internal.soa.esb.rosetta.pooling.JmsConnectionPool;
 import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.common.Environment;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.message.format.MessageType;
 
@@ -189,8 +190,8 @@
                 }
 				oMsg = m_oSess[0].createTextMessage(content);
 			}
-            if (message.getBody().get("MessageId")!=null) {
-                oMsg.setJMSCorrelationID((String)message.getBody().get("MessageId"));
+            if (message.getBody().get(Environment.JMS_MESSAGE_ID)!=null) {
+                oMsg.setJMSCorrelationID((String)message.getBody().get(Environment.JMS_MESSAGE_ID));
             }
 	
 			for (Iterator II = m_oProps.keySet().iterator(); II.hasNext();)

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/util/ClassUtil.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/util/ClassUtil.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/src/org/jboss/soa/esb/util/ClassUtil.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -63,7 +63,13 @@
             {
                 return Class.forName(className, true, threadClassLoader) ;
             }
-            catch (final ClassNotFoundException cnfe) {} // ignore
+            catch (final ClassNotFoundException cnfe)
+            {
+                if (cnfe.getException() != null)
+                {
+                    throw cnfe ;
+                }
+            }
         }
         
         
@@ -74,7 +80,13 @@
             {
                 return Class.forName(className, true, classLoader) ;
             }
-            catch (final ClassNotFoundException cnfe) {} // ignore
+            catch (final ClassNotFoundException cnfe)
+            {
+                if (cnfe.getException() != null)
+                {
+                    throw cnfe ;
+                }
+            }
         }
         
         return Class.forName(className, true, ClassLoader.getSystemClassLoader()) ;

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/build.xml	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/build.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -127,7 +127,6 @@
             </classpath>
 			<!-- emma jvm args -->
 			<jvmarg value="-Demma.coverage.out.file=${org.jboss.esb.module.tests.coverage.dir}/coverage.emma" />
-			<jvmarg value="-Demma.coverage.out.merge=true" />
         	<!--	
         	<sysproperty key="org.jboss.esb.test.db.driver" value="${org.jboss.esb.test.db.driver}"/>
         	<sysproperty key="org.jboss.esb.test.db.url" value="${org.jboss.esb.test.db.url}"/>
@@ -208,7 +207,6 @@
 	            </classpath>
 				<!-- emma jvm args -->
 				<jvmarg value="-Demma.coverage.out.file=${org.jboss.esb.module.tests.coverage.dir}/coverage.emma" />
-				<jvmarg value="-Demma.coverage.out.merge=true" />
 	        	
 				<!--
 	        	<sysproperty key="org.jboss.esb.test.db.driver" value="${org.jboss.esb.test.db.driver}"/>

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-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -26,6 +26,9 @@
 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;
@@ -36,6 +39,7 @@
 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;
@@ -45,6 +49,8 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import com.arjuna.common.util.propertyservice.PropertyManager;
+
 /**
  * Tests for internal FileCourier class 
  * @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
@@ -67,6 +73,9 @@
 	{
 		_logger.debug("tmp directory = <"+_tmpDir+">");
 		purgeStaleFiles();
+		
+		PropertyManager pm = ModulePropertyManager.getPropertyManager(ModulePropertyManager.FILTER_MODULE);
+		pm.setProperty("org.jboss.soa.esb.filter.0", "org.jboss.internal.soa.esb.message.filter.MetaDataFilter");
 	}
 	
 	@AfterClass
@@ -103,8 +112,6 @@
 	@Test
 	public void testMessageAttributes() throws Exception 
     {
-		ModulePropertyManager.getPropertyManager(ModulePropertyManager.FILTER_MODULE).setProperty("org.jboss.soa.esb.courier.filter.0", "org.jboss.internal.soa.esb.message.metadata.MetaDataFilter");
-
 		String contents = "This is the text that travels in the Message body";
 
 		// toEpr for files must be a directory

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_esbaware.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_esbaware.xml	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_esbaware.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><!--	NOTE: DO NOT MODIFY	This file was auto-generated.--><jbossesb-listeners parameterReloadSecs="180"><Bank-Listener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="2" service-category="Bank" service-description="Bank Reconciliation Service" service-name="Reconciliation"><EPR connection-factory="ConnectionFactory" destination-name="queue/B" destination-type="topic" jndi-URL="jnp://localhost:1099" message-selector="service='Reconciliation'" protocol="jms"/><action action="TestDefaultRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter" propName="propValue">						This is some complex..						<!-- property -->						value.						<xxxx>							boooo							<yyyy/>						</xxxx>						 Some CDATA data...					</action></Bank-Listener><Bank-Listener-Generic listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="2" my-generic-listener="my-generic-listener#someattribvalue" !
 service-category="Bank" service-description="Bank Reconciliation Service" service-name="Reconciliation"><EPR my-generic-bus="my-generic-bus#someattribvalue" my-generic-provider="my-generic-provider#someattribvalue"/><action action="TestDefaultRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter" propName="propValue">						This is some complex..						<!-- property -->						value.						<xxxx>							boooo							<yyyy/>						</xxxx>						 Some CDATA data...					</action></Bank-Listener-Generic><test-ftp-listener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="1" pollLatencySeconds="10" service-category="Test2" service-description="FTP server Test" service-name="FTPTest"><EPR URL="ftp://joe:secret@localhost:21/Temp" errorDelete="true" inputSuffix=".txt" passive="false" postDelete="true" workSuffix=".esbInProcess"/><action action="TestFtpRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter"/></test-ftp-listener><test-sq!
 l-listener listenerClass="org.jboss.soa.esb.listeners.message.MessageA
wareListener" maxThreads="1" pollLatencySeconds="10" service-category="Test3" service-description="SQL server Test" service-name="SQLTest"><EPR URL="jdbc:postgresql://myhost:5432/testDB" driver="org.postgresql.Driver" errorDelete="true" insert_timestamp_column="insert_timestamp" message_column="message" message_id_column="message_id" password="secret" postDelete="true" status_column="status" tablename="testtable" username="joe"/><action action="TestSqlRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter"/></test-sql-listener></jbossesb-listeners>
+<?xml version="1.0" encoding="UTF-8"?><!--	NOTE: DO NOT MODIFY	This file was auto-generated.--><jbossesb-listeners parameterReloadSecs="180"><Bank-Listener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="2" service-category="Bank" service-description="Bank Reconciliation Service" service-name="Reconciliation"><EPR connection-factory="ConnectionFactory" destination-name="queue/B" destination-type="topic" jndi-URL="jnp://localhost:1099" message-selector="service='Reconciliation'" protocol="jms"/><action action="TestDefaultRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter" propName="propValue">						This is some complex..						<!-- property -->						value.						<xxxx>							boooo							<yyyy/>						</xxxx>						 Some CDATA data...					</action></Bank-Listener><Bank-Listener-Generic listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="2" my-generic-listener="my-generic-listener#someattribvalue" !
 service-category="Bank" service-description="Bank Reconciliation Service" service-name="Reconciliation"><EPR my-generic-bus="my-generic-bus#someattribvalue" my-generic-provider="my-generic-provider#someattribvalue"/><action action="TestDefaultRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter" propName="propValue">						This is some complex..						<!-- property -->						value.						<xxxx>							boooo							<yyyy/>						</xxxx>						 Some CDATA data...					</action></Bank-Listener-Generic><test-ftp-listener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="1" pollLatencySeconds="10" service-category="Test2" service-description="FTP server Test" service-name="FTPTest"><EPR URL="ftp://joe:secret@localhost:21/Temp" errorDelete="true" inputSuffix=".txt" passive="false" postDelete="true" workSuffix=".esbInProcess"/><action action="TestFtpRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter"/></test-ftp-listener><test-sq!
 l-listener listenerClass="org.jboss.soa.esb.listeners.message.MessageA
wareListener" maxThreads="1" pollLatencySeconds="10" service-category="Test3" service-description="SQL server Test" service-name="SQLTest"><EPR URL="jdbc:postgresql://myhost:5432/testDB" driver="org.postgresql.Driver" errorDelete="true" insert_timestamp_column="insert_timestamp" message_column="message" message_id_column="message_id" password="secret" postDelete="true" status_column="status" tablename="testtable" username="joe"/><action action="TestSqlRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter"/></test-sql-listener></jbossesb-listeners>
\ No newline at end of file

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_gateways.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_gateways.xml	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_gateways.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><!--	NOTE: DO NOT MODIFY	This file was auto-generated.--><jbossesb-gateways parameterReloadSecs="180"><Bank-JMS-Gateway connection-factory="com.xyz.provider.XYZConnectionFactory" destination-name="queue/A" destination-type="queue" gatewayClass="org.jboss.soa.esb.listeners.gateway.JmsGatewayListener" jndi-URL="xyz://server1:9876" jndi-context-factory="com.xyz.provider.NamingContextFactory" jndi-pkg-prefix="com.xyz" maxThreads="1" message-selector="service='Reconciliation'" service-description="Bank Reconciliation Service" target-service-category="Bank" target-service-name="Reconciliation"/><Bank-HTTP-Gateway gatewayClass="org.jboss.soa.esb.listeners.gateway.JBossRemotingGatewayListener" jbr-serverBindAddress="192.168.1.111" jbr-serverBindPort="8765" jbr-serverProtocol="http" maxThreads="1" service-description="Bank Reconciliation Service" target-service-category="Bank" target-service-name="Reconciliation"/></jbossesb-gateways>        
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><!--	NOTE: DO NOT MODIFY	This file was auto-generated.--><jbossesb-gateways parameterReloadSecs="180"><Bank-JMS-Gateway connection-factory="com.xyz.provider.XYZConnectionFactory" destination-name="queue/A" destination-type="queue" gatewayClass="org.jboss.soa.esb.listeners.gateway.JmsGatewayListener" is-gateway="true" jndi-URL="xyz://server1:9876" jndi-context-factory="com.xyz.provider.NamingContextFactory" jndi-pkg-prefix="com.xyz" maxThreads="1" message-selector="service='Reconciliation'" service-description="Bank Reconciliation Service" target-service-category="Bank" target-service-name="Reconciliation"/><Bank-HTTP-Gateway gatewayClass="org.jboss.soa.esb.listeners.gateway.JBossRemotingGatewayListener" is-gateway="true" jbr-serverBindAddress="192.168.1.111" jbr-serverBindPort="8765" jbr-serverProtocol="http" maxThreads="1" service-description="Bank Reconciliation Service" target-service-category="Bank" target-service-name="Reconciliati!
 on"/></jbossesb-gateways>
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GatewayFilterUnitTest.java (from rev 13241, labs/jbossesb/trunk/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	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GatewayFilterUnitTest.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,104 @@
+/*
+ * 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.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;
+
+import com.arjuna.common.util.propertyservice.PropertyManager;
+
+/**
+ * Tests for internal FileCourier class
+ * 
+ * @author <a
+ *         href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
+ * @since Version 4.0
+ * 
+ */
+public class GatewayFilterUnitTest
+{
+    @BeforeClass
+    public static void setUp () throws Exception
+    {
+	PropertyManager pm = ModulePropertyManager
+		.getPropertyManager(ModulePropertyManager.FILTER_MODULE);
+	pm.setProperty("org.jboss.soa.esb.filter.0",
+		"org.jboss.internal.soa.esb.message.filter.MetaDataFilter");
+	pm.setProperty("org.jboss.soa.esb.filter.1",
+		"org.jboss.internal.soa.esb.message.filter.GatewayFilter");
+    }
+
+    public static junit.framework.Test suite ()
+    {
+	return new JUnit4TestAdapter(GatewayFilterUnitTest.class);
+    }
+
+    @Test
+    public void testMessageAttributes () throws Exception
+    {
+	ConfigTree config = new ConfigTree("test");
+	Message msg = MessageFactory.getInstance().getMessage();
+	msg.getBody().setByteArray("Hello World".getBytes());
+
+	Map<String, Object> params = new HashMap<String, Object>();
+
+	params.put(Environment.ORIGINAL_FILE, new File("foobar"));
+	params.put(Environment.GATEWAY_CONFIG, config);
+
+	Message output = FilterManager.getInstance().doOutputWork(msg, params);
+
+	Assert.assertNotNull(output);
+	Assert.assertEquals(output.getProperties().getProperty(
+		Environment.ORIGINAL_FILE_NAME_MSG_PROP), "foobar");
+	Assert.assertNull(output.getProperties().getProperty(
+		Environment.ORIGINAL_QUEUE_NAME_MSG_PROP));
+    }
+}

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

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/build.xml	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/build.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,56 +0,0 @@
-<project name="Quickstart_bpm_orchestration2" default="run" basedir=".">
-
-	<description>
-		${ant.project.name}
-		${line.separator}
-	</description>
-
-  <property name="deploy.exploded" value="true"/>
-
-  <!-- Import the base Ant build script... -->
-  <import file="../conf/base-build.xml"/>
-  
-  <property name="project.process.dir" value="processDefinition1"/>
-	
-  <target name="quickstart-specific-dependencies">
-  	<path id="quickstart-dependencies-classpath">
-	  <fileset dir="${product.dir}/services/jbpm/lib/ext/build-time/" includes="bsh.jar"/>
-    </path>
-  </target>
-
-  <target name="quickstart-specific-assemblies">   
-    <copy overwrite="true" file="${project.process.dir}/processdefinition.xml" todir="${classes}/${project.process.dir}" />
-    <copy todir="${classes}">
-      <fileset dir="${basedir}" includes="scripts/**/*"/>
-    </copy>
-  </target>
-  
-  <target name="refreshProcess" description="Moves the changed process definition to the server without restarting all the services">
-    <echo>Moves the changed process definition to the server without restarting all the services</echo>
-    <copy overwrite="true" 
-        file="${project.process.dir}/processdefinition.xml"
-	    tofile="${quickstart.org.jboss.esb.server.home}/server/${quickstart.org.jboss.esb.server.config}/deploy/${ant.project.name}.esb/${project.process.dir}/processdefinition.xml"/>
-	  <antcall target="deployProcess"/>
-  </target>
-	
-  <target name="runtest">
-	<echo>Use "ant deployProcess" followed by "ant startProcess"</echo>
-  </target>
-	
-  <target name="deployProcess" depends="compile" description="Sends a message to deploy the process definition">
-    <echo>Sends a message to deploy the process definition</echo>
-    <java fork="yes" classname="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.test.SendJMSMessageDeploy" failonerror="true">
-      <arg value="Hello World: Deploy the process def"/>
-      <classpath refid="exec-classpath"/>
-    </java>
-  </target>
-      
-  <target name="startProcess" depends="compile" description="Sends a message to start the process instance">
-  	<echo>Sends a message to start the process instance</echo>
-    <java fork="yes" classname="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.test.SendJMSMessageStart" failonerror="true">
-      <arg value="Getting Started"/>
-      <classpath refid="exec-classpath"/>
-    </java>  
-  </target>	
-
-</project>

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/build.xml (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/build.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/build.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/build.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,56 @@
+<project name="Quickstart_bpm_orchestration2" default="run" basedir=".">
+
+	<description>
+		${ant.project.name}
+		${line.separator}
+	</description>
+
+  <property name="deploy.exploded" value="true"/>
+
+  <!-- Import the base Ant build script... -->
+  <import file="../conf/base-build.xml"/>
+  
+  <property name="project.process.dir" value="processDefinition1"/>
+	
+  <target name="quickstart-specific-dependencies">
+  	<path id="quickstart-dependencies-classpath">
+	  <fileset dir="${product.dir}/services/jbpm/lib/ext/build-time/" includes="bsh.jar"/>
+    </path>
+  </target>
+
+  <target name="quickstart-specific-assemblies">   
+    <copy overwrite="true" file="${project.process.dir}/processdefinition.xml" todir="${classes}/${project.process.dir}" />
+    <copy todir="${classes}">
+      <fileset dir="${basedir}" includes="scripts/**/*"/>
+    </copy>
+  </target>
+  
+  <target name="refreshProcess" description="Moves the changed process definition to the server without restarting all the services">
+    <echo>Moves the changed process definition to the server without restarting all the services</echo>
+    <copy overwrite="true" 
+        file="${project.process.dir}/processdefinition.xml"
+	    tofile="${quickstart.org.jboss.esb.server.home}/server/${quickstart.org.jboss.esb.server.config}/deploy/${ant.project.name}.esb/${project.process.dir}/processdefinition.xml"/>
+	  <antcall target="deployProcess"/>
+  </target>
+	
+  <target name="runtest">
+	<echo>Use "ant deployProcess" followed by "ant startProcess"</echo>
+  </target>
+	
+  <target name="deployProcess" depends="compile" description="Sends a message to deploy the process definition">
+    <echo>Sends a message to deploy the process definition</echo>
+    <java fork="yes" classname="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.test.SendJMSMessageDeploy" failonerror="true">
+      <arg value="Hello World: Deploy the process def"/>
+      <classpath refid="exec-classpath"/>
+    </java>
+  </target>
+      
+  <target name="startProcess" depends="compile" description="Sends a message to start the process instance">
+  	<echo>Sends a message to start the process instance</echo>
+    <java fork="yes" classname="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.test.SendJMSMessageStart" failonerror="true">
+      <arg value="Getting Started"/>
+      <classpath refid="exec-classpath"/>
+    </java>  
+  </target>	
+
+</project>

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/deployment.xml	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/deployment.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbossesb-deployment>
-  <depends>jboss.esb:deployment=jbrules.esb</depends>
-  <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_orchestration2/deployment.xml (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/deployment.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbossesb-deployment>
+  <depends>jboss.esb:deployment=jbrules.esb</depends>
+  <depends>jboss.esb:deployment=jbpm.esb</depends>
+</jbossesb-deployment>
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/jbm-queue-service-scoped.xml	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbm-queue-service-scoped.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-  
-  <loader-repository>jboss.messaging:loader=ScopedLoaderRepository
-    <loader-repository-config>java2ParentDelegation=false</loader-repository-config>
-  </loader-repository>
-  
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_deploy_Request_esb"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_deploy_Request_gw"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_start_Request_esb"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_start_Request_gw"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>  
-
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service1_Request_esb"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-  
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service1_Request_esb_reply"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-    
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service2_Request_esb"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>  
-  
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service2_Request_esb_reply"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>   
-   
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service3_Request_esb"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>  
-  
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service3_Request_esb_reply"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>   
-
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service4_Request_esb"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>  
-  
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service4_Request_esb_reply"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>   
-
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service5_Request_esb"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>  
-  
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service5_Request_esb_reply"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>   
-
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service6_Request_esb"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>  
-  
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service6_Request_esb_reply"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>   
-  
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_results_service_esb"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>  
-
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service6_Alert"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>  
-
-</server>

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbm-queue-service-scoped.xml (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/jbm-queue-service-scoped.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbm-queue-service-scoped.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbm-queue-service-scoped.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  
+  <loader-repository>jboss.messaging:loader=ScopedLoaderRepository
+    <loader-repository-config>java2ParentDelegation=false</loader-repository-config>
+  </loader-repository>
+  
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_deploy_Request_esb"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_deploy_Request_gw"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_start_Request_esb"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_start_Request_gw"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>  
+
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service1_Request_esb"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service1_Request_esb_reply"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+    
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service2_Request_esb"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>  
+  
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service2_Request_esb_reply"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>   
+   
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service3_Request_esb"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>  
+  
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service3_Request_esb_reply"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>   
+
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service4_Request_esb"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>  
+  
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service4_Request_esb_reply"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>   
+
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service5_Request_esb"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>  
+  
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service5_Request_esb_reply"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>   
+
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service6_Request_esb"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>  
+  
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service6_Request_esb_reply"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>   
+  
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_results_service_esb"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>  
+
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service6_Alert"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>  
+
+</server>

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/jbm-queue-service.xml	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbm-queue-service.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_deploy_Request_esb"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_deploy_Request_gw"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_start_Request_esb"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_start_Request_gw"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service1_Request_esb"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service1_Request_esb_reply"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service2_Request_esb"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service2_Request_esb_reply"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service3_Request_esb"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service3_Request_esb_reply"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service4_Request_esb"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service4_Request_esb_reply"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service5_Request_esb"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service5_Request_esb_reply"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service6_Request_esb"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service6_Request_esb_reply"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service7_Request_esb"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service7_Request_esb_reply"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_results_service_esb"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service1_Alert"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service2_Alert"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service3_Alert"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service4_Alert"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service5_Alert"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service6_Alert"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service7_Alert"
-    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_results_Alert"
-    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/bpm_orchestration2/jbm-queue-service.xml (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/jbm-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbm-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbm-queue-service.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_deploy_Request_esb"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_deploy_Request_gw"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_start_Request_esb"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_start_Request_gw"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service1_Request_esb"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service1_Request_esb_reply"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service2_Request_esb"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service2_Request_esb_reply"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service3_Request_esb"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service3_Request_esb_reply"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service4_Request_esb"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service4_Request_esb_reply"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service5_Request_esb"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service5_Request_esb_reply"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service6_Request_esb"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service6_Request_esb_reply"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service7_Request_esb"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service7_Request_esb_reply"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_results_service_esb"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service1_Alert"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service2_Alert"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service3_Alert"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service4_Alert"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service5_Alert"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service6_Alert"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_service7_Alert"
+    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.messaging.destination:service=Queue,name=quickstart_bpm_orchestration2_results_Alert"
+    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/bpm_orchestration2/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/jbmq-queue-service.xml	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbmq-queue-service.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_deploy_Request_esb">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>
-	
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_deploy_Request_gw">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_start_Request_esb">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>	
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_start_Request_gw">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>	
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service1_Request_esb">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service1_Request_esb_reply">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service2_Request_esb">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service2_Request_esb_reply">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service3_Request_esb">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service3_Request_esb_reply">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service4_Request_esb">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service4_Request_esb_reply">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service5_Request_esb">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service5_Request_esb_reply">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service6_Request_esb">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service6_Request_esb_reply">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service7_Request_esb">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service7_Request_esb_reply">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_results_service_esb">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service1_Alert">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service2_Alert">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service3_Alert">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service4_Alert">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service5_Alert">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service6_Alert">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service7_Alert">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_results_Alert">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>		
-	
-</server>	
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbmq-queue-service.xml (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbmq-queue-service.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_deploy_Request_esb">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>
+	
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_deploy_Request_gw">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_start_Request_esb">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>	
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_start_Request_gw">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>	
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service1_Request_esb">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service1_Request_esb_reply">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service2_Request_esb">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service2_Request_esb_reply">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service3_Request_esb">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service3_Request_esb_reply">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service4_Request_esb">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service4_Request_esb_reply">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service5_Request_esb">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service5_Request_esb_reply">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service6_Request_esb">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service6_Request_esb_reply">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service7_Request_esb">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service7_Request_esb_reply">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_results_service_esb">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service1_Alert">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service2_Alert">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service3_Alert">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service4_Alert">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service5_Alert">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service6_Alert">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_service7_Alert">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+		 name="jboss.mq.destination:service=Queue,name=quickstart_bpm_orchestration2_results_Alert">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>		
+	
+</server>	
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/jboss-esb.xml	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jboss-esb.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,267 +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"
-                        jndi-URL="jnp://127.0.0.1:1099" jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-                        jndi-pkg-prefix="org.jboss.naming:org.jnp.interfaces">
-
-              <jms-bus busid="deployGwChannel">
-                  <jms-message-filter dest-type="QUEUE"
-                      dest-name="queue/quickstart_bpm_orchestration2_deploy_Request_gw" />
-              </jms-bus>
-              <jms-bus busid="deployEsbChannel">
-                  <jms-message-filter dest-type="QUEUE"
-                      dest-name="queue/quickstart_bpm_orchestration2_deploy_Request_esb" />
-              </jms-bus>              
-              <jms-bus busid="startGwChannel">
-                  <jms-message-filter dest-type="QUEUE"
-                      dest-name="queue/quickstart_bpm_orchestration2_start_Request_gw" />
-                     <!-- quickstart_bpm_orchestration2_start_Request_gw -->
-                     <!-- DVDStore_Orders -->
-                     <!-- Petstore_Orders -->
-              </jms-bus>
-              <jms-bus busid="startEsbChannel">
-                  <jms-message-filter dest-type="QUEUE"
-                      dest-name="queue/quickstart_bpm_orchestration2_start_Request_esb" />
-              </jms-bus>
-              <jms-bus busid="service1EsbChannel">
-                  <jms-message-filter dest-type="QUEUE"
-                      dest-name="queue/quickstart_bpm_orchestration2_service1_Request_esb" />
-              </jms-bus>
-              <jms-bus busid="service2EsbChannel">
-                  <jms-message-filter dest-type="QUEUE"
-                      dest-name="queue/quickstart_bpm_orchestration2_service2_Request_esb" />
-              </jms-bus>
-              <jms-bus busid="service3EsbChannel">
-                  <jms-message-filter dest-type="QUEUE"
-                      dest-name="queue/quickstart_bpm_orchestration2_service3_Request_esb" />
-              </jms-bus>
-              <jms-bus busid="service4EsbChannel">
-                  <jms-message-filter dest-type="QUEUE"
-                      dest-name="queue/quickstart_bpm_orchestration2_service4_Request_esb" />
-              </jms-bus>     
-              <jms-bus busid="service5EsbChannel">
-                  <jms-message-filter dest-type="QUEUE"
-                      dest-name="queue/quickstart_bpm_orchestration2_service5_Request_esb" />
-              </jms-bus>
-              <jms-bus busid="service6EsbChannel">
-                  <jms-message-filter dest-type="QUEUE"
-                      dest-name="queue/quickstart_bpm_orchestration2_service6_Request_esb" />
-              </jms-bus>
-              <jms-bus busid="service7EsbChannel">
-                  <jms-message-filter dest-type="QUEUE"
-                      dest-name="queue/quickstart_bpm_orchestration2_service7_Request_esb" />
-              </jms-bus>              
-              <jms-bus busid="resultsService">
-                  <jms-message-filter dest-type="QUEUE"
-                      dest-name="queue/quickstart_bpm_orchestration2_results_service_esb" />
-              </jms-bus>                       
-          </jms-provider>
-      </providers>
-
-      <services>
-        <service category="BPM_Orchestration2_Deploy_Service" name="Deploy_Service"
-                 description="BPM Orchestration Sample 2: Use this service to deploy a process instance">
-            <listeners>
-                <jms-listener name="JMS-Gateway" busidref="deployGwChannel"
-                    maxThreads="1"
-                    is-gateway="true" />
-                <jms-listener name="ESB-Listener" busidref="deployEsbChannel"
-                maxThreads="1"/>
-            </listeners>
-              <actions>
-                <action name="DeployFromFile" 
-                  class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
-                  <property name="command" value="DeployProcessDefinition" />
-                  <property name="process-definition-file" value="/processDefinition1/processdefinition.xml" />
-                </action>
-				<action name="deployed-message" class="org.jboss.soa.esb.actions.SystemPrintln">
-					<property name="message" value="Process Definition Deployed" />
-				</action>                
-              </actions>
-        </service>
-        
-        <service category="BPM_Orchestration2_Starter_Service" name="Starter_Service"
-                 description="BPM Orchestration Sample 2: Use this service to start a process instance">
-            <listeners>
-                <jms-listener name="JMS-Gateway" busidref="startGwChannel"
-                    maxThreads="1"
-                    is-gateway="true" />
-                <jms-listener name="ESB-Listener" busidref="startEsbChannel"
-                maxThreads="1"/>
-            </listeners>
-            <actions>
-                
-                <action name="spy" 
-                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.MessageSpy"/>
-                    
-                <!-- move the body.getContents() into jBPM -->    
-                <action name="create_new_process_instance" 
-                    class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
-                    <property name="command" value="NewProcessInstanceCommand" />
-                    <property name="process-definition-name" value="processDefinition1"/>   
-                    <property name="actor" value="FrankSinatra"/>                                                 
-                    <property name="esb-to-jbpm">
-                      <!-- esb-name maps to getBody().get("eVar1") -->
-                      <variables>
-                        <variable esb-name="BODY_CONTENT" jbpm-name="theBody" />
-                      </variables>
-                    </property>                    
-                 </action>  
-                 
-                 <action  name="signal_the_new_process_instance" 
-                   class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
-                    <property name="command" value="SignalCommand" />
-                     <property name="esb-to-jbpm">
-                     <variables>
-                        <variable esb-name="eVar1" jbpm-name="counter"  value="45" />
-                        <variable esb-name="BODY_CONTENT" jbpm-name="theBody" />
-                     </variables>
-                    </property>
-                 </action>
-
-                <action name="spy" 
-                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.MessageSpy"/>
-                            
-            </actions>
-        </service>
-        
-        <service category="BPM_Orchestration2_Service1" name="Service1"
-                 description="BPM Orchestration Sample 2: this is a service invoked within the process">
-            <listeners>
-                <jms-listener name="ESB-Listener" busidref="service1EsbChannel"
-                maxThreads="1"/>
-            </listeners>
-            <actions>
-
-                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-                  <property name="script" value="/scripts/service1.groovy" />
-                </action>
-                <action name="alert" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.SimpleJMSNotifier">
-								  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration2_service1_Alert" />     
-                </action>
-                                
-            </actions>
-        </service>
-        <service category="BPM_Orchestration2_Service2" name="Service2"
-                 description="BPM Orchestration Sample 2: this is a service invoked within the process">
-            <listeners>
-                <jms-listener name="ESB-Listener" busidref="service2EsbChannel"
-                maxThreads="1"/>
-            </listeners>
-            <actions>
-            
-                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-                  <property name="script" value="/scripts/service2.groovy" />
-                </action>
-                <action name="alert" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.SimpleJMSNotifier">
-								  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration2_service2_Alert" />     
-                </action>
-                
-            </actions>
-        </service>
-        <service category="BPM_Orchestration2_Service3" name="Service3"
-                 description="BPM Orchestration Sample 2: this is a service invoked within the process">
-            <listeners>
-                <jms-listener name="ESB-Listener" busidref="service3EsbChannel"
-                maxThreads="1"/>
-            </listeners>
-            <actions>
-            
-                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-                  <property name="script" value="/scripts/service3.groovy" />
-                </action>
-                <action name="alert" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.SimpleJMSNotifier">
-								  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration2_service3_Alert" />     
-                </action>
-                
-            </actions>
-        </service>
-        
-        <service category="BPM_Orchestration2_Service4" name="Service4"
-                 description="BPM Orchestration Sample 2: this is a service invoked within the process">
-            <listeners>
-                <jms-listener name="ESB-Listener" busidref="service4EsbChannel"
-                maxThreads="1"/>
-            </listeners>
-            <actions>            
-                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-                  <property name="script" value="/scripts/service4.groovy" />
-                </action>                
-                <action name="alert" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.SimpleJMSNotifier">
-								  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration2_service4_Alert" />     
-                </action>                
-            </actions>
-        </service>
-        <service category="BPM_Orchestration2_Service5" name="Service5"
-                 description="BPM Orchestration Sample 2: this is a service invoked within the process">
-            <listeners>
-                <jms-listener name="ESB-Listener" busidref="service5EsbChannel"
-                maxThreads="1"/>
-            </listeners>
-            <actions>            
-                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-                  <property name="script" value="/scripts/service5.groovy" />
-                </action>                
-                <action name="alert" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.SimpleJMSNotifier">
-								  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration2_service5_Alert" />     
-                </action>
-            </actions>
-        </service>
-        <service category="BPM_Orchestration2_Service6" name="Service6"
-                 description="BPM Orchestration Sample 2: this is a service invoked within the process">
-            <listeners>
-                <jms-listener name="ESB-Listener" busidref="service6EsbChannel"
-                maxThreads="1"/>
-            </listeners>
-            <actions>            
-                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-                  <property name="script" value="/scripts/service6.groovy" />
-                </action>  
-                 
-                <action name="alert" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.SimpleJMSNotifier">
-								  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration2_service6_Alert" />     
-                </action>
-            </actions>
-        </service>
-        <service category="BPM_Orchestration2_Service7" name="Service7"
-                 description="BPM Orchestration Sample 2: this is a service invoked within the process">
-            <listeners>
-                <jms-listener name="ESB-Listener" busidref="service7EsbChannel"
-                maxThreads="1"/>
-            </listeners>
-            <actions>            
-                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-                  <property name="script" value="/scripts/service7.groovy" />
-                </action>  
-                 
-                <action name="alert" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.SimpleJMSNotifier">
-								  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration2_service7_Alert" />     
-                </action>
-            </actions>
-        </service>
-
-        
-        <service category="BPM_Orchestration2_ResultsService" name="ResultsService"
-                 description="BPM Orchestration Sample 2: Sends outbound results of the process flow">
-            <listeners>
-                <jms-listener name="ESB-Listener" busidref="resultsService"
-                maxThreads="1"/>
-            </listeners>
-            <actions>
-                <action name="spy" 
-                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.MessageSpy"/>   
-                <action name="alert" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.SimpleJMSNotifier">
-								  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration2_results_Alert" />     
-                </action>     
-                <action name="results-message" class="org.jboss.soa.esb.actions.SystemPrintln">
-					<property name="message" value="SUCCESS!" />
-				</action>                
-                                             
-            </actions>
-        </service>
-      </services>
-
-</jbossesb>

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jboss-esb.xml (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/jboss-esb.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jboss-esb.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jboss-esb.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,267 @@
+<?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"
+                        jndi-URL="jnp://127.0.0.1:1099" jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
+                        jndi-pkg-prefix="org.jboss.naming:org.jnp.interfaces">
+
+              <jms-bus busid="deployGwChannel">
+                  <jms-message-filter dest-type="QUEUE"
+                      dest-name="queue/quickstart_bpm_orchestration2_deploy_Request_gw" />
+              </jms-bus>
+              <jms-bus busid="deployEsbChannel">
+                  <jms-message-filter dest-type="QUEUE"
+                      dest-name="queue/quickstart_bpm_orchestration2_deploy_Request_esb" />
+              </jms-bus>              
+              <jms-bus busid="startGwChannel">
+                  <jms-message-filter dest-type="QUEUE"
+                      dest-name="queue/quickstart_bpm_orchestration2_start_Request_gw" />
+                     <!-- quickstart_bpm_orchestration2_start_Request_gw -->
+                     <!-- DVDStore_Orders -->
+                     <!-- Petstore_Orders -->
+              </jms-bus>
+              <jms-bus busid="startEsbChannel">
+                  <jms-message-filter dest-type="QUEUE"
+                      dest-name="queue/quickstart_bpm_orchestration2_start_Request_esb" />
+              </jms-bus>
+              <jms-bus busid="service1EsbChannel">
+                  <jms-message-filter dest-type="QUEUE"
+                      dest-name="queue/quickstart_bpm_orchestration2_service1_Request_esb" />
+              </jms-bus>
+              <jms-bus busid="service2EsbChannel">
+                  <jms-message-filter dest-type="QUEUE"
+                      dest-name="queue/quickstart_bpm_orchestration2_service2_Request_esb" />
+              </jms-bus>
+              <jms-bus busid="service3EsbChannel">
+                  <jms-message-filter dest-type="QUEUE"
+                      dest-name="queue/quickstart_bpm_orchestration2_service3_Request_esb" />
+              </jms-bus>
+              <jms-bus busid="service4EsbChannel">
+                  <jms-message-filter dest-type="QUEUE"
+                      dest-name="queue/quickstart_bpm_orchestration2_service4_Request_esb" />
+              </jms-bus>     
+              <jms-bus busid="service5EsbChannel">
+                  <jms-message-filter dest-type="QUEUE"
+                      dest-name="queue/quickstart_bpm_orchestration2_service5_Request_esb" />
+              </jms-bus>
+              <jms-bus busid="service6EsbChannel">
+                  <jms-message-filter dest-type="QUEUE"
+                      dest-name="queue/quickstart_bpm_orchestration2_service6_Request_esb" />
+              </jms-bus>
+              <jms-bus busid="service7EsbChannel">
+                  <jms-message-filter dest-type="QUEUE"
+                      dest-name="queue/quickstart_bpm_orchestration2_service7_Request_esb" />
+              </jms-bus>              
+              <jms-bus busid="resultsService">
+                  <jms-message-filter dest-type="QUEUE"
+                      dest-name="queue/quickstart_bpm_orchestration2_results_service_esb" />
+              </jms-bus>                       
+          </jms-provider>
+      </providers>
+
+      <services>
+        <service category="BPM_Orchestration2_Deploy_Service" name="Deploy_Service"
+                 description="BPM Orchestration Sample 2: Use this service to deploy a process instance">
+            <listeners>
+                <jms-listener name="JMS-Gateway" busidref="deployGwChannel"
+                    maxThreads="1"
+                    is-gateway="true" />
+                <jms-listener name="ESB-Listener" busidref="deployEsbChannel"
+                maxThreads="1"/>
+            </listeners>
+              <actions>
+                <action name="DeployFromFile" 
+                  class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
+                  <property name="command" value="DeployProcessDefinition" />
+                  <property name="process-definition-file" value="/processDefinition1/processdefinition.xml" />
+                </action>
+				<action name="deployed-message" class="org.jboss.soa.esb.actions.SystemPrintln">
+					<property name="message" value="Process Definition Deployed" />
+				</action>                
+              </actions>
+        </service>
+        
+        <service category="BPM_Orchestration2_Starter_Service" name="Starter_Service"
+                 description="BPM Orchestration Sample 2: Use this service to start a process instance">
+            <listeners>
+                <jms-listener name="JMS-Gateway" busidref="startGwChannel"
+                    maxThreads="1"
+                    is-gateway="true" />
+                <jms-listener name="ESB-Listener" busidref="startEsbChannel"
+                maxThreads="1"/>
+            </listeners>
+            <actions>
+                
+                <action name="spy" 
+                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.MessageSpy"/>
+                    
+                <!-- move the body.getContents() into jBPM -->    
+                <action name="create_new_process_instance" 
+                    class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
+                    <property name="command" value="NewProcessInstanceCommand" />
+                    <property name="process-definition-name" value="processDefinition1"/>   
+                    <property name="actor" value="FrankSinatra"/>                                                 
+                    <property name="esb-to-jbpm">
+                      <!-- esb-name maps to getBody().get("eVar1") -->
+                      <variables>
+                        <variable esb-name="BODY_CONTENT" jbpm-name="theBody" />
+                      </variables>
+                    </property>                    
+                 </action>  
+                 
+                 <action  name="signal_the_new_process_instance" 
+                   class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
+                    <property name="command" value="SignalCommand" />
+                     <property name="esb-to-jbpm">
+                     <variables>
+                        <variable esb-name="eVar1" jbpm-name="counter"  value="45" />
+                        <variable esb-name="BODY_CONTENT" jbpm-name="theBody" />
+                     </variables>
+                    </property>
+                 </action>
+
+                <action name="spy" 
+                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.MessageSpy"/>
+                            
+            </actions>
+        </service>
+        
+        <service category="BPM_Orchestration2_Service1" name="Service1"
+                 description="BPM Orchestration Sample 2: this is a service invoked within the process">
+            <listeners>
+                <jms-listener name="ESB-Listener" busidref="service1EsbChannel"
+                maxThreads="1"/>
+            </listeners>
+            <actions>
+
+                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+                  <property name="script" value="/scripts/service1.groovy" />
+                </action>
+                <action name="alert" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.SimpleJMSNotifier">
+								  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration2_service1_Alert" />     
+                </action>
+                                
+            </actions>
+        </service>
+        <service category="BPM_Orchestration2_Service2" name="Service2"
+                 description="BPM Orchestration Sample 2: this is a service invoked within the process">
+            <listeners>
+                <jms-listener name="ESB-Listener" busidref="service2EsbChannel"
+                maxThreads="1"/>
+            </listeners>
+            <actions>
+            
+                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+                  <property name="script" value="/scripts/service2.groovy" />
+                </action>
+                <action name="alert" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.SimpleJMSNotifier">
+								  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration2_service2_Alert" />     
+                </action>
+                
+            </actions>
+        </service>
+        <service category="BPM_Orchestration2_Service3" name="Service3"
+                 description="BPM Orchestration Sample 2: this is a service invoked within the process">
+            <listeners>
+                <jms-listener name="ESB-Listener" busidref="service3EsbChannel"
+                maxThreads="1"/>
+            </listeners>
+            <actions>
+            
+                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+                  <property name="script" value="/scripts/service3.groovy" />
+                </action>
+                <action name="alert" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.SimpleJMSNotifier">
+								  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration2_service3_Alert" />     
+                </action>
+                
+            </actions>
+        </service>
+        
+        <service category="BPM_Orchestration2_Service4" name="Service4"
+                 description="BPM Orchestration Sample 2: this is a service invoked within the process">
+            <listeners>
+                <jms-listener name="ESB-Listener" busidref="service4EsbChannel"
+                maxThreads="1"/>
+            </listeners>
+            <actions>            
+                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+                  <property name="script" value="/scripts/service4.groovy" />
+                </action>                
+                <action name="alert" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.SimpleJMSNotifier">
+								  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration2_service4_Alert" />     
+                </action>                
+            </actions>
+        </service>
+        <service category="BPM_Orchestration2_Service5" name="Service5"
+                 description="BPM Orchestration Sample 2: this is a service invoked within the process">
+            <listeners>
+                <jms-listener name="ESB-Listener" busidref="service5EsbChannel"
+                maxThreads="1"/>
+            </listeners>
+            <actions>            
+                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+                  <property name="script" value="/scripts/service5.groovy" />
+                </action>                
+                <action name="alert" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.SimpleJMSNotifier">
+								  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration2_service5_Alert" />     
+                </action>
+            </actions>
+        </service>
+        <service category="BPM_Orchestration2_Service6" name="Service6"
+                 description="BPM Orchestration Sample 2: this is a service invoked within the process">
+            <listeners>
+                <jms-listener name="ESB-Listener" busidref="service6EsbChannel"
+                maxThreads="1"/>
+            </listeners>
+            <actions>            
+                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+                  <property name="script" value="/scripts/service6.groovy" />
+                </action>  
+                 
+                <action name="alert" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.SimpleJMSNotifier">
+								  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration2_service6_Alert" />     
+                </action>
+            </actions>
+        </service>
+        <service category="BPM_Orchestration2_Service7" name="Service7"
+                 description="BPM Orchestration Sample 2: this is a service invoked within the process">
+            <listeners>
+                <jms-listener name="ESB-Listener" busidref="service7EsbChannel"
+                maxThreads="1"/>
+            </listeners>
+            <actions>            
+                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+                  <property name="script" value="/scripts/service7.groovy" />
+                </action>  
+                 
+                <action name="alert" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.SimpleJMSNotifier">
+								  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration2_service7_Alert" />     
+                </action>
+            </actions>
+        </service>
+
+        
+        <service category="BPM_Orchestration2_ResultsService" name="ResultsService"
+                 description="BPM Orchestration Sample 2: Sends outbound results of the process flow">
+            <listeners>
+                <jms-listener name="ESB-Listener" busidref="resultsService"
+                maxThreads="1"/>
+            </listeners>
+            <actions>
+                <action name="spy" 
+                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.MessageSpy"/>   
+                <action name="alert" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.SimpleJMSNotifier">
+								  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration2_results_Alert" />     
+                </action>     
+                <action name="results-message" class="org.jboss.soa.esb.actions.SystemPrintln">
+					<property name="message" value="SUCCESS!" />
+				</action>                
+                                             
+            </actions>
+        </service>
+      </services>
+
+</jbossesb>

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/jbossesb-properties.xml	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbossesb-properties.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -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/bpm_orchestration2/jbossesb-properties.xml (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/jbossesb-properties.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbossesb-properties.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jbossesb-properties.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -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/bpm_orchestration2/jndi.properties
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/jndi.properties	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jndi.properties	2007-07-08 17:12:53 UTC (rev 13243)
@@ -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/bpm_orchestration2/jndi.properties (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/jndi.properties)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jndi.properties	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/jndi.properties	2007-07-08 17:12:53 UTC (rev 13243)
@@ -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/bpm_orchestration2/juddi.properties
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/juddi.properties	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/juddi.properties	2007-07-08 17:12:53 UTC (rev 13243)
@@ -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/bpm_orchestration2/juddi.properties (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/juddi.properties)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/juddi.properties	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/juddi.properties	2007-07-08 17:12:53 UTC (rev 13243)
@@ -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/bpm_orchestration2/lib (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/lib)

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/log4j.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/log4j.xml	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/log4j.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,79 +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"/>
-      <param name="Threshold" value="INFO"/>
-
-      <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="DEBUG"/>
-   </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/bpm_orchestration2/log4j.xml (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/log4j.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/log4j.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/log4j.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,79 @@
+<?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"/>
+      <param name="Threshold" value="INFO"/>
+
+      <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="DEBUG"/>
+   </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/bpm_orchestration2/processDefinition1 (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/processDefinition1)

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition1/gpd.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/processDefinition1/gpd.xml	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition1/gpd.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -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/processDefinition1/gpd.xml (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/processDefinition1/gpd.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition1/gpd.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition1/gpd.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -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/processDefinition1/processdefinition.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/processDefinition1/processdefinition.xml	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition1/processdefinition.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,140 +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>
-		    <jbpmToEsb_variables>theBody</jbpmToEsb_variables>
-            <jbpmToEsb_esbNames>BODY_CONTENT</jbpmToEsb_esbNames>
-            <return_variables>theBody</return_variables>
-            <return_esbNames>BODY_CONTENT</return_esbNames>
-         </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>
-            <jbpmToEsb_variables>theBody</jbpmToEsb_variables>
-            <jbpmToEsb_esbNames>BODY_CONTENT</jbpmToEsb_esbNames>            
-            <return_variables>theBody</return_variables>
-            <return_esbNames>BODY_CONTENT</return_esbNames>            
-         </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>            
-			<jbpmToEsb_variables>theBody</jbpmToEsb_variables>
-            <jbpmToEsb_esbNames>BODY_CONTENT</jbpmToEsb_esbNames>            
-            <return_variables>theBody</return_variables>
-            <return_esbNames>BODY_CONTENT</return_esbNames>            
-         </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>            
-			<jbpmToEsb_variables>theBody</jbpmToEsb_variables>
-            <jbpmToEsb_esbNames>BODY_CONTENT</jbpmToEsb_esbNames>            
-            <return_variables>theBody</return_variables>
-            <return_esbNames>BODY_CONTENT</return_esbNames>            
-         </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>            
-			<jbpmToEsb_variables>theBody</jbpmToEsb_variables>
-            <jbpmToEsb_esbNames>BODY_CONTENT</jbpmToEsb_esbNames>            
-            <return_variables>theBody</return_variables>
-            <return_esbNames>BODY_CONTENT</return_esbNames>            
-         </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>                 
-			<jbpmToEsb_variables>theBody</jbpmToEsb_variables>
-            <jbpmToEsb_esbNames>BODY_CONTENT</jbpmToEsb_esbNames>            
-            <return_variables>theBody</return_variables>
-            <return_esbNames>BODY_CONTENT</return_esbNames>            
-         </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>            
-			<jbpmToEsb_variables>theBody</jbpmToEsb_variables>
-            <jbpmToEsb_esbNames>BODY_CONTENT</jbpmToEsb_esbNames>            
-            <return_variables>theBody</return_variables>
-            <return_esbNames>BODY_CONTENT</return_esbNames>            
-         </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>            
-			<jbpmToEsb_variables>theBody</jbpmToEsb_variables>
-            <jbpmToEsb_esbNames>BODY_CONTENT</jbpmToEsb_esbNames>            
-            <return_variables>theBody</return_variables>
-            <return_esbNames>BODY_CONTENT</return_esbNames>            
-         </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/processDefinition1/processdefinition.xml (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/processDefinition1/processdefinition.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition1/processdefinition.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/processDefinition1/processdefinition.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,140 @@
+<?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>
+		    <jbpmToEsb_variables>theBody</jbpmToEsb_variables>
+            <jbpmToEsb_esbNames>BODY_CONTENT</jbpmToEsb_esbNames>
+            <return_variables>theBody</return_variables>
+            <return_esbNames>BODY_CONTENT</return_esbNames>
+         </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>
+            <jbpmToEsb_variables>theBody</jbpmToEsb_variables>
+            <jbpmToEsb_esbNames>BODY_CONTENT</jbpmToEsb_esbNames>            
+            <return_variables>theBody</return_variables>
+            <return_esbNames>BODY_CONTENT</return_esbNames>            
+         </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>            
+			<jbpmToEsb_variables>theBody</jbpmToEsb_variables>
+            <jbpmToEsb_esbNames>BODY_CONTENT</jbpmToEsb_esbNames>            
+            <return_variables>theBody</return_variables>
+            <return_esbNames>BODY_CONTENT</return_esbNames>            
+         </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>            
+			<jbpmToEsb_variables>theBody</jbpmToEsb_variables>
+            <jbpmToEsb_esbNames>BODY_CONTENT</jbpmToEsb_esbNames>            
+            <return_variables>theBody</return_variables>
+            <return_esbNames>BODY_CONTENT</return_esbNames>            
+         </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>            
+			<jbpmToEsb_variables>theBody</jbpmToEsb_variables>
+            <jbpmToEsb_esbNames>BODY_CONTENT</jbpmToEsb_esbNames>            
+            <return_variables>theBody</return_variables>
+            <return_esbNames>BODY_CONTENT</return_esbNames>            
+         </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>                 
+			<jbpmToEsb_variables>theBody</jbpmToEsb_variables>
+            <jbpmToEsb_esbNames>BODY_CONTENT</jbpmToEsb_esbNames>            
+            <return_variables>theBody</return_variables>
+            <return_esbNames>BODY_CONTENT</return_esbNames>            
+         </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>            
+			<jbpmToEsb_variables>theBody</jbpmToEsb_variables>
+            <jbpmToEsb_esbNames>BODY_CONTENT</jbpmToEsb_esbNames>            
+            <return_variables>theBody</return_variables>
+            <return_esbNames>BODY_CONTENT</return_esbNames>            
+         </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>            
+			<jbpmToEsb_variables>theBody</jbpmToEsb_variables>
+            <jbpmToEsb_esbNames>BODY_CONTENT</jbpmToEsb_esbNames>            
+            <return_variables>theBody</return_variables>
+            <return_esbNames>BODY_CONTENT</return_esbNames>            
+         </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/processDefinition1/processimage.jpg
===================================================================
(Binary files differ)

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

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/readme.txt
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/readme.txt	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/readme.txt	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,128 +0,0 @@
-Overview:
-=========
-	The purpose of the bpm_orchestration2 quickstart sample is to demonstrate the
-use of JMS-based endpoints/services where the flow of execution is controlled by
-the process definition.  The process definition also includes a fork & join and
-makes each service invocation in a synchronous fashion.
-
-
-To Run standalone mode:
-=======================
-1. Open two command windows in the directory called "bpm_orchestration2"
-2. In command window 1, execute "ant deploy-jms-dests"
-3. In command window 1, execute "ant run" - starts the ESB in standalone mode
-4. In command window 2, execute "ant deployProcess" - sends a message that fires 
-a service that loads the process definition from the file system and into the 
-repository.
-5. In command window 2, execute "ant startProcess" - this sends a messge that 
-causes a new process instance to be created and "signaled", since this process 
-definition contains no wait-states it will execute until completion.
-
-To Run '.esb' archive mode:
-===========================
-1. ant deploy - creates a folder called "Quickstart_bpm_orchestration2.esb" in
-your targeted deploy directory.
-
-2. ant deployProcess - sends a message that fires a service that loads the
-process definition from the file system and into the repository.  Alternatively,
-you could have deployed the process definition via the jBPM Graphical Process
-Designer or the jBPM web console.
-You will know when the process definition is successfully deployed when you see
-a lot of jBPM & Hibernate logging activity with something similiar to the
-following as the last 4 lines:
-11:16:08,859 INFO  [SchemaExport] Running hbm2ddl schema export
-11:16:08,875 INFO  [SchemaExport] exporting generated schema to database
-11:16:09,015 INFO  [SchemaExport] schema export complete
-11:16:11,656 INFO  [STDOUT] Process Definition Deployed:
-
-3. ant startProcess - this sends a messge that causes a new process instance to
-be created and "signaled", since this process definition contains no wait-states 
-it will execute until completion.  This step causes a lot of output to the
-server console as each node/service is visited in the process graph.  Look for
-"SUCCESS!" to indicate that the service called "ResultsService" was invoked.
-
-Extra Credit:
-=============
-1. Modify the process definition using your favorite editor or the Grahpical
-Process Desginer (from jBPM 3.2.x).  Remove the following transitions from the
-fork to Atlanta and Dallas:
-      <transition name="tr2" to="Dallas WHSE"></transition>
-      <transition name="tr3" to="Atlanta WHSE"></transition>
-This change means that the flow of execution will bypass Service6 and Service7.
-
-2. ant refreshProcess - This step copies the newly changed process definition to
-its appropriate location in the deployed .esb archive and then invokes the
-deployProcess command.
-
-3. ant startProcess - Service6 (Dallas) and 7 (Atlanta) are gone.
-
-Feel free to rewire the process definition in any order that you like to see the
-change in execution flow.
-
-
-Things to Consider:
-===========================
-- BPM related quickstarts deploy as an exploded archive.
-- The service "logic" is coded in Groovy
-- Carefully review the jboss-esb.xml and the processdefinition.xml.  One of the
-key things to understand is how the ESB action invokes or interacts with the
-process and how it moves ESB message data into process instance variables.
-  <property name="esb-to-jbpm">     
-      <variables>
-          <variable esb-name="esbMsgVar1" jbpm-name="processVar1" />
-          <variable esb-name="BODY_CONTENT" jbpm-name="theBody" />
-      </variables>
-  </property> 
-
- esb-name maps to Message.getBody().get("esbMsgVar1")
- "BODY_CONTENT" maps to Message.getBody()
-
-Sample Output from "ant startProcess":
-======================================
-11:18:50,656 INFO  [STDOUT] 11111111111 Begin Service 1 11111111111
-11:18:50,765 INFO  [STDOUT] In: Getting Started
-11:18:50,765 INFO  [STDOUT] Out: Getting Started 'Receive Order'
-11:18:50,765 INFO  [STDOUT] 111111111111 End Service 1 111111111111
-11:18:51,640 INFO  [STDOUT] 33333333333 Begin Service 3 33333333333
-11:18:51,640 INFO  [STDOUT] In: Getting Started 'Receive Order'
-11:18:51,640 INFO  [STDOUT] Out: Getting Started 'Receive Order'  'Credit Check'
-
-11:18:51,640 INFO  [STDOUT] 333333333333 End Service 3 333333333333
-11:18:52,312 INFO  [STDOUT] 22222222222 Begin Service 2 22222222222
-11:18:52,312 INFO  [STDOUT] In: Getting Started 'Receive Order'  'Credit Check'
-
-11:18:52,312 INFO  [STDOUT] Out: Getting Started 'Receive Order'  'Credit Check'
-  'Validate Order'
-11:18:52,312 INFO  [STDOUT] 222222222222 End Service 2 222222222222
-11:18:52,828 INFO  [STDOUT] 44444444444 Begin Service 4 44444444444
-11:18:52,828 INFO  [STDOUT] In: Getting Started 'Receive Order'  'Credit Check'
- 'Validate Order'
-11:18:52,828 INFO  [STDOUT] Out: Getting Started 'Receive Order'  'Credit Check'
-  'Validate Order'  'Inventory Check'
-11:18:52,828 INFO  [STDOUT] 444444444444 End Service 4 444444444444
-11:18:53,359 INFO  [STDOUT] 77777777777 Begin Service 7 77777777777
-11:18:53,359 INFO  [STDOUT] In: Getting Started 'Receive Order'  'Credit Check'
- 'Validate Order'  'Inventory Check'
-11:18:53,359 INFO  [STDOUT] Out: Getting Started 'Receive Order'  'Credit Check'
-  'Validate Order'  'Inventory Check'  'Atlanta'
-11:18:53,359 INFO  [STDOUT] 777777777777 End Service 7 777777777777
-11:18:53,734 INFO  [STDOUT] 66666666666 Begin Service 6 66666666666
-11:18:53,734 INFO  [STDOUT] In: Getting Started 'Receive Order'  'Credit Check'
- 'Validate Order'  'Inventory Check'  'Atlanta'
-11:18:53,734 INFO  [STDOUT] Out: Getting Started 'Receive Order'  'Credit Check'
-  'Validate Order'  'Inventory Check'  'Atlanta'  'Dallas'
-11:18:53,734 INFO  [STDOUT] 666666666666 End Service 6 666666666666
-11:18:54,078 INFO  [STDOUT] 55555555555 Begin Service 5 55555555555
-11:18:54,093 INFO  [STDOUT] In: Getting Started 'Receive Order'  'Credit Check'
- 'Validate Order'  'Inventory Check'  'Atlanta'  'Dallas'
-11:18:54,093 INFO  [STDOUT] Out: Getting Started 'Receive Order'  'Credit Check'
-  'Validate Order'  'Inventory Check'  'Atlanta'  'Dallas'  'Los Angeles'
-11:18:54,093 INFO  [STDOUT] 555555555555 End Service 5 555555555555
-11:18:54,234 INFO  [STDOUT] Very simple BPM Process ActionHandler
-11:18:54,453 INFO  [MessageSpy] Body: Getting Started 'Receive Order'  'Credit C
-heck'  'Validate Order'  'Inventory Check'  'Atlanta'  'Dallas'  'Los Angeles'
-11:18:54,640 INFO  [STDOUT] SUCCESS!:
-11:18:54,640 INFO  [STDOUT] [Getting Started 'Receive Order'  'Credit Check'  'V
-alidate Order'  'Inventory Check'  'Atlanta'  'Dallas'  'Los Angeles' ].
-11:18:54,937 INFO  [MessageSpy] Body: Getting Started 'Receive Order'  'Credit C
-heck'  'Validate Order'  'Inventory Check'  'Atlanta'  'Dallas'  'Los Angeles'
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/readme.txt (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/readme.txt)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/readme.txt	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/readme.txt	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,128 @@
+Overview:
+=========
+	The purpose of the bpm_orchestration2 quickstart sample is to demonstrate the
+use of JMS-based endpoints/services where the flow of execution is controlled by
+the process definition.  The process definition also includes a fork & join and
+makes each service invocation in a synchronous fashion.
+
+
+To Run standalone mode:
+=======================
+1. Open two command windows in the directory called "bpm_orchestration2"
+2. In command window 1, execute "ant deploy-jms-dests"
+3. In command window 1, execute "ant run" - starts the ESB in standalone mode
+4. In command window 2, execute "ant deployProcess" - sends a message that fires 
+a service that loads the process definition from the file system and into the 
+repository.
+5. In command window 2, execute "ant startProcess" - this sends a messge that 
+causes a new process instance to be created and "signaled", since this process 
+definition contains no wait-states it will execute until completion.
+
+To Run '.esb' archive mode:
+===========================
+1. ant deploy - creates a folder called "Quickstart_bpm_orchestration2.esb" in
+your targeted deploy directory.
+
+2. ant deployProcess - sends a message that fires a service that loads the
+process definition from the file system and into the repository.  Alternatively,
+you could have deployed the process definition via the jBPM Graphical Process
+Designer or the jBPM web console.
+You will know when the process definition is successfully deployed when you see
+a lot of jBPM & Hibernate logging activity with something similiar to the
+following as the last 4 lines:
+11:16:08,859 INFO  [SchemaExport] Running hbm2ddl schema export
+11:16:08,875 INFO  [SchemaExport] exporting generated schema to database
+11:16:09,015 INFO  [SchemaExport] schema export complete
+11:16:11,656 INFO  [STDOUT] Process Definition Deployed:
+
+3. ant startProcess - this sends a messge that causes a new process instance to
+be created and "signaled", since this process definition contains no wait-states 
+it will execute until completion.  This step causes a lot of output to the
+server console as each node/service is visited in the process graph.  Look for
+"SUCCESS!" to indicate that the service called "ResultsService" was invoked.
+
+Extra Credit:
+=============
+1. Modify the process definition using your favorite editor or the Grahpical
+Process Desginer (from jBPM 3.2.x).  Remove the following transitions from the
+fork to Atlanta and Dallas:
+      <transition name="tr2" to="Dallas WHSE"></transition>
+      <transition name="tr3" to="Atlanta WHSE"></transition>
+This change means that the flow of execution will bypass Service6 and Service7.
+
+2. ant refreshProcess - This step copies the newly changed process definition to
+its appropriate location in the deployed .esb archive and then invokes the
+deployProcess command.
+
+3. ant startProcess - Service6 (Dallas) and 7 (Atlanta) are gone.
+
+Feel free to rewire the process definition in any order that you like to see the
+change in execution flow.
+
+
+Things to Consider:
+===========================
+- BPM related quickstarts deploy as an exploded archive.
+- The service "logic" is coded in Groovy
+- Carefully review the jboss-esb.xml and the processdefinition.xml.  One of the
+key things to understand is how the ESB action invokes or interacts with the
+process and how it moves ESB message data into process instance variables.
+  <property name="esb-to-jbpm">     
+      <variables>
+          <variable esb-name="esbMsgVar1" jbpm-name="processVar1" />
+          <variable esb-name="BODY_CONTENT" jbpm-name="theBody" />
+      </variables>
+  </property> 
+
+ esb-name maps to Message.getBody().get("esbMsgVar1")
+ "BODY_CONTENT" maps to Message.getBody()
+
+Sample Output from "ant startProcess":
+======================================
+11:18:50,656 INFO  [STDOUT] 11111111111 Begin Service 1 11111111111
+11:18:50,765 INFO  [STDOUT] In: Getting Started
+11:18:50,765 INFO  [STDOUT] Out: Getting Started 'Receive Order'
+11:18:50,765 INFO  [STDOUT] 111111111111 End Service 1 111111111111
+11:18:51,640 INFO  [STDOUT] 33333333333 Begin Service 3 33333333333
+11:18:51,640 INFO  [STDOUT] In: Getting Started 'Receive Order'
+11:18:51,640 INFO  [STDOUT] Out: Getting Started 'Receive Order'  'Credit Check'
+
+11:18:51,640 INFO  [STDOUT] 333333333333 End Service 3 333333333333
+11:18:52,312 INFO  [STDOUT] 22222222222 Begin Service 2 22222222222
+11:18:52,312 INFO  [STDOUT] In: Getting Started 'Receive Order'  'Credit Check'
+
+11:18:52,312 INFO  [STDOUT] Out: Getting Started 'Receive Order'  'Credit Check'
+  'Validate Order'
+11:18:52,312 INFO  [STDOUT] 222222222222 End Service 2 222222222222
+11:18:52,828 INFO  [STDOUT] 44444444444 Begin Service 4 44444444444
+11:18:52,828 INFO  [STDOUT] In: Getting Started 'Receive Order'  'Credit Check'
+ 'Validate Order'
+11:18:52,828 INFO  [STDOUT] Out: Getting Started 'Receive Order'  'Credit Check'
+  'Validate Order'  'Inventory Check'
+11:18:52,828 INFO  [STDOUT] 444444444444 End Service 4 444444444444
+11:18:53,359 INFO  [STDOUT] 77777777777 Begin Service 7 77777777777
+11:18:53,359 INFO  [STDOUT] In: Getting Started 'Receive Order'  'Credit Check'
+ 'Validate Order'  'Inventory Check'
+11:18:53,359 INFO  [STDOUT] Out: Getting Started 'Receive Order'  'Credit Check'
+  'Validate Order'  'Inventory Check'  'Atlanta'
+11:18:53,359 INFO  [STDOUT] 777777777777 End Service 7 777777777777
+11:18:53,734 INFO  [STDOUT] 66666666666 Begin Service 6 66666666666
+11:18:53,734 INFO  [STDOUT] In: Getting Started 'Receive Order'  'Credit Check'
+ 'Validate Order'  'Inventory Check'  'Atlanta'
+11:18:53,734 INFO  [STDOUT] Out: Getting Started 'Receive Order'  'Credit Check'
+  'Validate Order'  'Inventory Check'  'Atlanta'  'Dallas'
+11:18:53,734 INFO  [STDOUT] 666666666666 End Service 6 666666666666
+11:18:54,078 INFO  [STDOUT] 55555555555 Begin Service 5 55555555555
+11:18:54,093 INFO  [STDOUT] In: Getting Started 'Receive Order'  'Credit Check'
+ 'Validate Order'  'Inventory Check'  'Atlanta'  'Dallas'
+11:18:54,093 INFO  [STDOUT] Out: Getting Started 'Receive Order'  'Credit Check'
+  'Validate Order'  'Inventory Check'  'Atlanta'  'Dallas'  'Los Angeles'
+11:18:54,093 INFO  [STDOUT] 555555555555 End Service 5 555555555555
+11:18:54,234 INFO  [STDOUT] Very simple BPM Process ActionHandler
+11:18:54,453 INFO  [MessageSpy] Body: Getting Started 'Receive Order'  'Credit C
+heck'  'Validate Order'  'Inventory Check'  'Atlanta'  'Dallas'  'Los Angeles'
+11:18:54,640 INFO  [STDOUT] SUCCESS!:
+11:18:54,640 INFO  [STDOUT] [Getting Started 'Receive Order'  'Credit Check'  'V
+alidate Order'  'Inventory Check'  'Atlanta'  'Dallas'  'Los Angeles' ].
+11:18:54,937 INFO  [MessageSpy] Body: Getting Started 'Receive Order'  'Credit C
+heck'  'Validate Order'  'Inventory Check'  'Atlanta'  'Dallas'  'Los Angeles'
\ No newline at end of file

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

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service1.groovy
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/scripts/service1.groovy	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service1.groovy	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,11 +0,0 @@
-import org.jboss.soa.esb.message.*
-
-println "11111111111 Begin Service 1 11111111111"
-
-println "In: " + new String(message.body.contents)
-
-message.body.contents = (new String(message.body.contents) + " 'Receive Order' ").getBytes()
-
-println "Out: " + new String(message.body.contents)
-
-println "111111111111 End Service 1 111111111111"
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service1.groovy (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/scripts/service1.groovy)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service1.groovy	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service1.groovy	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,11 @@
+import org.jboss.soa.esb.message.*
+
+println "11111111111 Begin Service 1 11111111111"
+
+println "In: " + new String(message.body.contents)
+
+message.body.contents = (new String(message.body.contents) + " 'Receive Order' ").getBytes()
+
+println "Out: " + new String(message.body.contents)
+
+println "111111111111 End Service 1 111111111111"
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service2.groovy
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/scripts/service2.groovy	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service2.groovy	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,13 +0,0 @@
-import org.jboss.soa.esb.message.*
-
-println "22222222222 Begin Service 2 22222222222"
-
-println "In: " + new String(message.body.contents)
-
-message.body.contents = (new String(message.body.contents) + " 'Validate Order' ").getBytes()
-
-println "Out: " + new String(message.body.contents)
-
-println "222222222222 End Service 2 222222222222"
-
-

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service2.groovy (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/scripts/service2.groovy)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service2.groovy	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service2.groovy	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,13 @@
+import org.jboss.soa.esb.message.*
+
+println "22222222222 Begin Service 2 22222222222"
+
+println "In: " + new String(message.body.contents)
+
+message.body.contents = (new String(message.body.contents) + " 'Validate Order' ").getBytes()
+
+println "Out: " + new String(message.body.contents)
+
+println "222222222222 End Service 2 222222222222"
+
+

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service3.groovy
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/scripts/service3.groovy	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service3.groovy	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,10 +0,0 @@
-import org.jboss.soa.esb.message.*
-
-println "33333333333 Begin Service 3 33333333333"
-
-println "In: " + new String(message.body.contents)
-
-message.body.contents = (new String(message.body.contents) + " 'Credit Check' ").getBytes()
-
-println "Out: " + new String(message.body.contents)
-println "333333333333 End Service 3 333333333333"
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service3.groovy (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/scripts/service3.groovy)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service3.groovy	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service3.groovy	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,10 @@
+import org.jboss.soa.esb.message.*
+
+println "33333333333 Begin Service 3 33333333333"
+
+println "In: " + new String(message.body.contents)
+
+message.body.contents = (new String(message.body.contents) + " 'Credit Check' ").getBytes()
+
+println "Out: " + new String(message.body.contents)
+println "333333333333 End Service 3 333333333333"
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service4.groovy
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/scripts/service4.groovy	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service4.groovy	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,11 +0,0 @@
-import org.jboss.soa.esb.message.*
-
-println "44444444444 Begin Service 4 44444444444"
-
-println "In: " + new String(message.body.contents)
-
-message.body.contents = (new String(message.body.contents) + " 'Inventory Check' ").getBytes()
-
-println "Out: " + new String(message.body.contents)
-
-println "444444444444 End Service 4 444444444444"
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service4.groovy (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/scripts/service4.groovy)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service4.groovy	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service4.groovy	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,11 @@
+import org.jboss.soa.esb.message.*
+
+println "44444444444 Begin Service 4 44444444444"
+
+println "In: " + new String(message.body.contents)
+
+message.body.contents = (new String(message.body.contents) + " 'Inventory Check' ").getBytes()
+
+println "Out: " + new String(message.body.contents)
+
+println "444444444444 End Service 4 444444444444"
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service5.groovy
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/scripts/service5.groovy	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service5.groovy	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,11 +0,0 @@
-import org.jboss.soa.esb.message.*
-
-println "55555555555 Begin Service 5 55555555555"
-
-println "In: " + new String(message.body.contents)
-
-message.body.contents = (new String(message.body.contents) + " 'Los Angeles' ").getBytes()
-
-println "Out: " + new String(message.body.contents)
-
-println "555555555555 End Service 5 555555555555"
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service5.groovy (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/scripts/service5.groovy)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service5.groovy	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service5.groovy	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,11 @@
+import org.jboss.soa.esb.message.*
+
+println "55555555555 Begin Service 5 55555555555"
+
+println "In: " + new String(message.body.contents)
+
+message.body.contents = (new String(message.body.contents) + " 'Los Angeles' ").getBytes()
+
+println "Out: " + new String(message.body.contents)
+
+println "555555555555 End Service 5 555555555555"
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service6.groovy
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/scripts/service6.groovy	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service6.groovy	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,11 +0,0 @@
-import org.jboss.soa.esb.message.*
-
-println "66666666666 Begin Service 6 66666666666"
-
-println "In: " + new String(message.body.contents)
-
-message.body.contents = (new String(message.body.contents) + " 'Dallas' ").getBytes()
-
-println "Out: " + new String(message.body.contents)
-
-println "666666666666 End Service 6 666666666666"
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service6.groovy (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/scripts/service6.groovy)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service6.groovy	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service6.groovy	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,11 @@
+import org.jboss.soa.esb.message.*
+
+println "66666666666 Begin Service 6 66666666666"
+
+println "In: " + new String(message.body.contents)
+
+message.body.contents = (new String(message.body.contents) + " 'Dallas' ").getBytes()
+
+println "Out: " + new String(message.body.contents)
+
+println "666666666666 End Service 6 666666666666"
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service7.groovy
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/scripts/service7.groovy	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service7.groovy	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,11 +0,0 @@
-import org.jboss.soa.esb.message.*
-
-println "77777777777 Begin Service 7 77777777777"
-
-println "In: " + new String(message.body.contents)
-
-message.body.contents = (new String(message.body.contents) + " 'Atlanta' ").getBytes()
-
-println "Out: " + new String(message.body.contents)
-
-println "777777777777 End Service 7 777777777777"
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service7.groovy (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/scripts/service7.groovy)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service7.groovy	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/scripts/service7.groovy	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,11 @@
+import org.jboss.soa.esb.message.*
+
+println "77777777777 Begin Service 7 77777777777"
+
+println "In: " + new String(message.body.contents)
+
+message.body.contents = (new String(message.body.contents) + " 'Atlanta' ").getBytes()
+
+println "Out: " + new String(message.body.contents)
+
+println "777777777777 End Service 7 777777777777"
\ No newline at end of file

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

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/src/org)

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/src/org/jboss)

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa)

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb)

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples)

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts)

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2 (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2)

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/esb_actions (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/esb_actions)

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/esb_actions/MessageSpy.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/esb_actions/MessageSpy.java	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/esb_actions/MessageSpy.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,47 +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 org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions;
-
-
-import org.jboss.soa.esb.actions.AbstractActionLifecycle;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Body;
-import org.jboss.soa.esb.message.Message;
-import org.apache.log4j.Logger;
-
-public class MessageSpy extends AbstractActionLifecycle {
-	
-	protected ConfigTree	_config;
-	private Logger logger = Logger.getLogger(MessageSpy.class);
-	
-	  // modify to use the logger
-	public Message process(Message message) throws Exception {		
-		if (message.getBody() != null && message.getBody().getContents() != null) {
-			logger.info("Body: " + new String(message.getBody().getContents()));
-		} else {
-			logger.info("Body Contents are NULL");
-		}
-		return message;         	
-	}
-	 	  
-    public MessageSpy(ConfigTree config) { _config = config; } 
-  
-}	
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/esb_actions/MessageSpy.java (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/esb_actions/MessageSpy.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/esb_actions/MessageSpy.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/esb_actions/MessageSpy.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,47 @@
+/*
+ * 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 org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions;
+
+
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Body;
+import org.jboss.soa.esb.message.Message;
+import org.apache.log4j.Logger;
+
+public class MessageSpy extends AbstractActionLifecycle {
+	
+	protected ConfigTree	_config;
+	private Logger logger = Logger.getLogger(MessageSpy.class);
+	
+	  // modify to use the logger
+	public Message process(Message message) throws Exception {		
+		if (message.getBody() != null && message.getBody().getContents() != null) {
+			logger.info("Body: " + new String(message.getBody().getContents()));
+		} else {
+			logger.info("Body Contents are NULL");
+		}
+		return message;         	
+	}
+	 	  
+    public MessageSpy(ConfigTree config) { _config = config; } 
+  
+}	
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/esb_actions/SimpleJMSNotifier.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/esb_actions/SimpleJMSNotifier.java	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/esb_actions/SimpleJMSNotifier.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,86 +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 org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions;
- 
-import org.jboss.soa.esb.actions.AbstractActionLifecycle;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Body;
-import org.jboss.soa.esb.message.Message;
-import org.apache.log4j.Logger;
-
-import java.util.Hashtable;
-
-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.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-public class SimpleJMSNotifier extends AbstractActionLifecycle {
-	protected ConfigTree	_config;
-	private Logger logger = Logger.getLogger(SimpleJMSNotifier.class);
-	String queueName = "quickstart_helloworld_Request_gw";
-	
-	public Message process(Message message) throws Exception {	
-		 QueueConnection conn;
-     QueueSession session;
-     Queue que;	
-     
-     Hashtable properties1 = new Hashtable();
-		 properties1.put(Context.INITIAL_CONTEXT_FACTORY,
-		 "org.jnp.interfaces.NamingContextFactory");
-		 properties1.put(Context.URL_PKG_PREFIXES,
-		 "org.jboss.naming:org.jnp.interfaces");
-		 properties1.put(Context.PROVIDER_URL, "jnp://127.0.0.1:1099");
-		 InitialContext iniCtx = new InitialContext(properties1);
-
-     Object tmp = iniCtx.lookup("ConnectionFactory");
-     QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
-     conn = qcf.createQueueConnection();
-     que = (Queue) iniCtx.lookup("queue/" + queueName);
-     session = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-     conn.start();
-     //logger.info("Connection Started");
-     
-     QueueSender send = session.createSender(que);        
-     TextMessage tm = session.createTextMessage(new String(message.getBody().getContents()));
-     send.send(tm);        
-     send.close();
-     
-     conn.stop();
-     session.close();
-     conn.close();
-     
-     return message;
-  }
-  
-	public SimpleJMSNotifier(ConfigTree config) { 
-		_config = config; 
-	  queueName = _config.getAttribute("ALERT_QUEUE_NAME");
-	  logger.info("Who to alert: " + queueName);	
-	} 
-}	
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/esb_actions/SimpleJMSNotifier.java (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/esb_actions/SimpleJMSNotifier.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/esb_actions/SimpleJMSNotifier.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/esb_actions/SimpleJMSNotifier.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,86 @@
+/*
+ * 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 org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions;
+ 
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Body;
+import org.jboss.soa.esb.message.Message;
+import org.apache.log4j.Logger;
+
+import java.util.Hashtable;
+
+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.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+public class SimpleJMSNotifier extends AbstractActionLifecycle {
+	protected ConfigTree	_config;
+	private Logger logger = Logger.getLogger(SimpleJMSNotifier.class);
+	String queueName = "quickstart_helloworld_Request_gw";
+	
+	public Message process(Message message) throws Exception {	
+		 QueueConnection conn;
+     QueueSession session;
+     Queue que;	
+     
+     Hashtable properties1 = new Hashtable();
+		 properties1.put(Context.INITIAL_CONTEXT_FACTORY,
+		 "org.jnp.interfaces.NamingContextFactory");
+		 properties1.put(Context.URL_PKG_PREFIXES,
+		 "org.jboss.naming:org.jnp.interfaces");
+		 properties1.put(Context.PROVIDER_URL, "jnp://127.0.0.1:1099");
+		 InitialContext iniCtx = new InitialContext(properties1);
+
+     Object tmp = iniCtx.lookup("ConnectionFactory");
+     QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
+     conn = qcf.createQueueConnection();
+     que = (Queue) iniCtx.lookup("queue/" + queueName);
+     session = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+     conn.start();
+     //logger.info("Connection Started");
+     
+     QueueSender send = session.createSender(que);        
+     TextMessage tm = session.createTextMessage(new String(message.getBody().getContents()));
+     send.send(tm);        
+     send.close();
+     
+     conn.stop();
+     session.close();
+     conn.close();
+     
+     return message;
+  }
+  
+	public SimpleJMSNotifier(ConfigTree config) { 
+		_config = config; 
+	  queueName = _config.getAttribute("ALERT_QUEUE_NAME");
+	  logger.info("Who to alert: " + queueName);	
+	} 
+}	
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/process_actions (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/process_actions)

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/process_actions/MyBPMActionHandler.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/process_actions/MyBPMActionHandler.java	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/process_actions/MyBPMActionHandler.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,45 +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 org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.process_actions;
-
-import org.jbpm.context.exe.ContextInstance;
-import org.jbpm.graph.def.ActionHandler;
-import org.jbpm.graph.exe.ExecutionContext;
-import org.jbpm.graph.exe.Token;
-
-public class MyBPMActionHandler implements ActionHandler 
-{
-	private static final long serialVersionUID = 1L;
-
-	Long startFrom;
-	
-	public void execute(ExecutionContext exCtx) throws Exception 
-	{
-		// Token token = exCtx.getToken();
-		// ContextInstance context = token.getProcessInstance().getContextInstance();
-		// Object obj	= context.getVariable("counter",token);
-		
-		System.out.println("Very simple BPM Process ActionHandler");
-    
-		//context.setVariable("counter", counter , token);
-	}
-
-}

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/process_actions/MyBPMActionHandler.java (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/process_actions/MyBPMActionHandler.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/process_actions/MyBPMActionHandler.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/process_actions/MyBPMActionHandler.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,45 @@
+/*
+ * 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 org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.process_actions;
+
+import org.jbpm.context.exe.ContextInstance;
+import org.jbpm.graph.def.ActionHandler;
+import org.jbpm.graph.exe.ExecutionContext;
+import org.jbpm.graph.exe.Token;
+
+public class MyBPMActionHandler implements ActionHandler 
+{
+	private static final long serialVersionUID = 1L;
+
+	Long startFrom;
+	
+	public void execute(ExecutionContext exCtx) throws Exception 
+	{
+		// Token token = exCtx.getToken();
+		// ContextInstance context = token.getProcessInstance().getContextInstance();
+		// Object obj	= context.getVariable("counter",token);
+		
+		System.out.println("Very simple BPM Process ActionHandler");
+    
+		//context.setVariable("counter", counter , token);
+	}
+
+}

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test)

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageDeploy.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageDeploy.java	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageDeploy.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,87 +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 org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.test;
-
-import java.util.Hashtable;
-
-import javax.jms.JMSException;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-public class SendJMSMessageDeploy {
-    QueueConnection conn;
-    QueueSession session;
-    Queue que;
-    
-    
-    
-    public void setupConnection() throws JMSException, NamingException
-    {
-        Hashtable properties1 = new Hashtable();
-        properties1.put(Context.INITIAL_CONTEXT_FACTORY,
-        "org.jnp.interfaces.NamingContextFactory");
-        properties1.put(Context.URL_PKG_PREFIXES,
-        "org.jboss.naming:org.jnp.interfaces");
-        properties1.put(Context.PROVIDER_URL, "jnp://127.0.0.1:1099");
-        InitialContext iniCtx = new InitialContext(properties1);
-
-        Object tmp = iniCtx.lookup("ConnectionFactory");
-        QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
-        conn = qcf.createQueueConnection();     
-        que = (Queue) iniCtx.lookup("queue/quickstart_bpm_orchestration2_deploy_Request_gw");
-        session = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-        conn.start();
-        // System.out.println("Connection Started: quickstart_bpm_orchestration2_deploy_Request_gw");
-    }
-    
-    public void stop() throws JMSException 
-    { 
-        conn.stop();
-        session.close();
-        conn.close();
-    }
-    
-    public void sendAMessage(String msg) throws JMSException {
-      
-        QueueSender send = session.createSender(que);        
-        ObjectMessage tm = session.createObjectMessage(msg);
-        send.send(tm);        
-        send.close();
-    }
-       
-    
-    public static void main(String args[]) throws Exception
-    {               
-      SendJMSMessageDeploy sm = new SendJMSMessageDeploy();
-      sm.setupConnection();
-      sm.sendAMessage(args[0]); 
-      sm.stop();
-      
-    }
-    
-}

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageDeploy.java (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageDeploy.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageDeploy.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageDeploy.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,87 @@
+/*
+ * 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 org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.test;
+
+import java.util.Hashtable;
+
+import javax.jms.JMSException;
+import javax.jms.ObjectMessage;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+public class SendJMSMessageDeploy {
+    QueueConnection conn;
+    QueueSession session;
+    Queue que;
+    
+    
+    
+    public void setupConnection() throws JMSException, NamingException
+    {
+        Hashtable properties1 = new Hashtable();
+        properties1.put(Context.INITIAL_CONTEXT_FACTORY,
+        "org.jnp.interfaces.NamingContextFactory");
+        properties1.put(Context.URL_PKG_PREFIXES,
+        "org.jboss.naming:org.jnp.interfaces");
+        properties1.put(Context.PROVIDER_URL, "jnp://127.0.0.1:1099");
+        InitialContext iniCtx = new InitialContext(properties1);
+
+        Object tmp = iniCtx.lookup("ConnectionFactory");
+        QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
+        conn = qcf.createQueueConnection();     
+        que = (Queue) iniCtx.lookup("queue/quickstart_bpm_orchestration2_deploy_Request_gw");
+        session = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+        conn.start();
+        // System.out.println("Connection Started: quickstart_bpm_orchestration2_deploy_Request_gw");
+    }
+    
+    public void stop() throws JMSException 
+    { 
+        conn.stop();
+        session.close();
+        conn.close();
+    }
+    
+    public void sendAMessage(String msg) throws JMSException {
+      
+        QueueSender send = session.createSender(que);        
+        ObjectMessage tm = session.createObjectMessage(msg);
+        send.send(tm);        
+        send.close();
+    }
+       
+    
+    public static void main(String args[]) throws Exception
+    {               
+      SendJMSMessageDeploy sm = new SendJMSMessageDeploy();
+      sm.setupConnection();
+      sm.sendAMessage(args[0]); 
+      sm.stop();
+      
+    }
+    
+}

Deleted: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageStart.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageStart.java	2007-07-08 13:57:32 UTC (rev 13241)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageStart.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -1,86 +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 org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.test;
-
-import java.util.Hashtable;
-
-import javax.jms.JMSException;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-public class SendJMSMessageStart {
-    QueueConnection conn;
-    QueueSession session;
-    Queue que;
-    
-    
-    public void setupConnection() throws JMSException, NamingException
-    {
-        Hashtable properties1 = new Hashtable();
-		properties1.put(Context.INITIAL_CONTEXT_FACTORY,
-				"org.jnp.interfaces.NamingContextFactory");
-		properties1.put(Context.URL_PKG_PREFIXES,
-				"org.jboss.naming:org.jnp.interfaces");
-		properties1.put(Context.PROVIDER_URL, "jnp://127.0.0.1:1099");
-		InitialContext iniCtx = new InitialContext(properties1);
-
-    	Object tmp = iniCtx.lookup("ConnectionFactory");
-    	QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
-    	conn = qcf.createQueueConnection();    	
-    	que = (Queue) iniCtx.lookup("queue/quickstart_bpm_orchestration2_start_Request_gw");
-    	session = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-    	conn.start();
-    	System.out.println("Connection Started: quickstart_bpm_orchestration2_start_Request_gw" );
-    }
-    
-    public void stop() throws JMSException 
-    { 
-        conn.stop();
-        session.close();
-        conn.close();
-    }
-    
-    public void sendAMessage(String msg) throws JMSException {
-    	
-        QueueSender send = session.createSender(que);        
-        ObjectMessage tm = session.createObjectMessage(msg);
-        send.send(tm);        
-        send.close();
-    }
-       
-    
-    public static void main(String args[]) throws Exception
-    {        	    	
-    	SendJMSMessageStart sm = new SendJMSMessageStart();
-    	sm.setupConnection();
-    	sm.sendAMessage(args[0]); 
-    	sm.stop();
-    	
-    }
-    
-}

Copied: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageStart.java (from rev 13241, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageStart.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageStart.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageStart.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -0,0 +1,86 @@
+/*
+ * 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 org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.test;
+
+import java.util.Hashtable;
+
+import javax.jms.JMSException;
+import javax.jms.ObjectMessage;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+public class SendJMSMessageStart {
+    QueueConnection conn;
+    QueueSession session;
+    Queue que;
+    
+    
+    public void setupConnection() throws JMSException, NamingException
+    {
+        Hashtable properties1 = new Hashtable();
+		properties1.put(Context.INITIAL_CONTEXT_FACTORY,
+				"org.jnp.interfaces.NamingContextFactory");
+		properties1.put(Context.URL_PKG_PREFIXES,
+				"org.jboss.naming:org.jnp.interfaces");
+		properties1.put(Context.PROVIDER_URL, "jnp://127.0.0.1:1099");
+		InitialContext iniCtx = new InitialContext(properties1);
+
+    	Object tmp = iniCtx.lookup("ConnectionFactory");
+    	QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
+    	conn = qcf.createQueueConnection();    	
+    	que = (Queue) iniCtx.lookup("queue/quickstart_bpm_orchestration2_start_Request_gw");
+    	session = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+    	conn.start();
+    	System.out.println("Connection Started: quickstart_bpm_orchestration2_start_Request_gw" );
+    }
+    
+    public void stop() throws JMSException 
+    { 
+        conn.stop();
+        session.close();
+        conn.close();
+    }
+    
+    public void sendAMessage(String msg) throws JMSException {
+    	
+        QueueSender send = session.createSender(que);        
+        ObjectMessage tm = session.createObjectMessage(msg);
+        send.send(tm);        
+        send.close();
+    }
+       
+    
+    public static void main(String args[]) throws Exception
+    {        	    	
+    	SendJMSMessageStart sm = new SendJMSMessageStart();
+    	sm.setupConnection();
+    	sm.sendAMessage(args[0]); 
+    	sm.stop();
+    	
+    }
+    
+}

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/helloworld_file_action/jboss-esb-unfiltered.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/helloworld_file_action/jboss-esb-unfiltered.xml	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/helloworld_file_action/jboss-esb-unfiltered.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -45,9 +45,13 @@
             		busidref="helloFileChannel"
             		maxThreads="1"
             		is-gateway="true">
+				<!--
 				<property name="cronExpression" value="0/30 * * * * ?" />
 				<property name="startDate" value="07-07-08 14:25:00" />
 				<property name="endDate" value="07-07-08 14:27:00" />
+				-->
+				<property name="pollLatencySeconds" value="10" />
+				<property name="repeatCount" value="6" />
 				</fs-listener>
                 <jms-listener name="helloWorldFileAction"
                               busidref="quickstartEsbChannel"
@@ -59,6 +63,9 @@
                    	class="org.jboss.soa.esb.samples.quickstart.helloworldfileaction.MyAction" 
                    	process="displayMessage,playWithMessage" 
                    	/>      
+                   	<action name="dump" class="org.jboss.soa.esb.actions.SystemPrintln">
+                   		<property name="printfull" value="true"/>
+                   	</action>
             </actions>
         </service>
       </services>

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_bpel/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_bpel/build.xml	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/samples/quickstarts/webservice_bpel/build.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -65,7 +65,7 @@
     <target name="quickstart-specific-undeploys"
         depends="assert-CATALINA_HOME-set, assert-ACTIVEBPEL_ENGINE-installed">
         <!-- Undeploy the quickstart apps. -->
-        <delete verbose="true" includemptydirs="true"
+        <delete verbose="true" includeemptydirs="true"
             dir="${org.jboss.esb.server.deploy.dir}"
             includes="order-manager-service.jar,order-manager.war shipping-service.jar" />
         <!-- Should undeploy ActiveBPEL -->

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/services/base-project-build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/services/base-project-build.xml	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/services/base-project-build.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -16,7 +16,7 @@
 		<delete dir="build" />
 	</target>
 	
-	<target name="prepare" depends="clean">
+	<target name="prepare">
 		<mkdir dir="build/${ant.project.name}.esb/META-INF" />
 		<mkdir dir="build/classes" />
 	</target>
@@ -118,7 +118,6 @@
             </classpath>
 			<!-- emma jvm args -->
 			<jvmarg value="-Demma.coverage.out.file=${coverage.dir}/coverage.emma" />
-			<jvmarg value="-Demma.coverage.out.merge=true" />
         	<sysproperty key="log4j.configuration" value="log4j.xml"/>
         </junit>
         <junitreport>
@@ -140,4 +139,4 @@
 	    </emma>
     </target>
 
-</project>
\ No newline at end of file
+</project>

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbossesb/src/test/resources/jbossesb-unittest-properties.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbossesb/src/test/resources/jbossesb-unittest-properties.xml	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/services/jbossesb/src/test/resources/jbossesb-unittest-properties.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -83,6 +83,7 @@
 		
     </properties>    
     <properties name="filters">
-    	<property name="org.jboss.soa.esb.courier.filter.1" value="org.jboss.internal.soa.esb.message.metadata.MetaDataFilter"/>
+    	<property name="org.jboss.soa.esb.filter.1" value="org.jboss.internal.soa.esb.message.filter.MetaDataFilter"/>
+    	<property name="org.jboss.soa.esb.filter.2" value="org.jboss.internal.soa.esb.message.filter.GatewayFilter"/>
     </properties>
 </esb>

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/base-project-build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/base-project-build.xml	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/base-project-build.xml	2007-07-08 17:12:53 UTC (rev 13243)
@@ -10,92 +10,102 @@
     from services to copy the new version down to the project directories.
     
      -->
-	<dirname property="services.dir" file="${ant.file.base-build}"/>
-	<property file="${services.dir}/build.properties"/>
-    
-	<target name="clean">
-		<delete dir="build" />
-	</target>
-	
-	<target name="prepare">
-		<mkdir dir="build/${ant.project.name}.esb/META-INF" />
-		<mkdir dir="build/classes" />
-	</target>
-	
-	<path id="classpath">
-		<pathelement location="build/${ant.project.name}.esb" />
-		<pathelement location="build/classes" />
-		<pathelement location="build/test/classes" />
-		<fileset dir="lib/ext" includes="*.jar" />
-		<fileset dir="lib/ext/build-time" includes="*.jar" />
-		<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="quartz-1.6.0.jar" />
-	</path>
-	
-	<target name="echoCP">
-		<property name="cp" refid="classpath" />
-		<echo message="Classpath is ${cp}" />
-	</target>
+    <dirname property="services.dir" file="${ant.file.base-build}"/>
+    <property file="${services.dir}/build.properties"/>
 
+    <target name="clean">
+        <delete dir="build"/>
+    </target>
+
+    <target name="prepare" depends="clean">
+        <mkdir dir="build/${ant.project.name}.esb/META-INF"/>
+        <mkdir dir="build/classes"/>
+    </target>
+
+    <path id="classpath">
+        <pathelement location="build/${ant.project.name}.esb"/>
+        <pathelement location="build/classes"/>
+        <pathelement location="build/test/classes"/>
+        <fileset dir="lib/ext" includes="*.jar"/>
+        <fileset dir="lib/ext/build-time" includes="*.jar"/>
+        <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="quartz-1.6.0.jar"/>
+    </path>
+
+    <target name="echoCP">
+        <property name="cp" refid="classpath"/>
+        <echo message="Classpath is ${cp}"/>
+    </target>
+
     <target name="check.for.files">
-	    <fileset id="fs" dir="build/classes"/>
-	    <condition property="dir_empty">
-	        <length length="0">
-	    		<fileset refid="fs"/>
-	  		</length>
-	  </condition>
+        <fileset id="fs" dir="build/classes"/>
+        <condition property="dir_empty">
+            <length length="0">
+                <fileset refid="fs"/>
+            </length>
+        </condition>
     </target>
-    
-	<target name="compile" depends="prepare">
-		<javac srcdir="src/main/java" destdir="build/classes" debug="on" >
-			<classpath refid="classpath" />
-		</javac>
-	</target>
-	
-	<target name="jar" depends="compile,check.for.files" unless="dir_empty">
-		<jar basedir="build/classes" destfile="build/jbossesb-${ant.project.name}.jar" includes="**/*.class"/>
-	</target>
 
+    <target name="compile" depends="prepare">
+        <javac srcdir="src/main/java" destdir="build/classes" debug="on">
+            <classpath refid="classpath"/>
+        </javac>
+    </target>
+
+    <target name="jar" depends="compile,check.for.files" unless="dir_empty">
+        <jar basedir="build/classes" destfile="build/jbossesb-${ant.project.name}.jar" includes="**/*.class"/>
+    </target>
+
+    <target name="javadoc">
+        <mkdir dir="build/javadoc"/>
+        <javadoc destdir="build/javadoc" windowtitle="JBossESB SOAP Service" classpathref="classpath">
+            <packageset dir="src/main/java">
+                <include name="**/*"/>
+            </packageset>
+        </javadoc>
+    </target>
+
     <target name="esb" depends="jar">
-        <copy todir="build/${ant.project.name}.esb/" >
-        	<fileset dir="lib/ext" includes="*.jar"/>
-        	<fileset dir="src/main/resources/"/>
-        	<fileset dir="build" includes="*.jar"/>
-         </copy>
+        <copy todir="build/${ant.project.name}.esb/">
+            <fileset dir="lib/ext" includes="*.jar"/>
+            <fileset dir="src/main/resources/"/>
+            <fileset dir="build" includes="*.jar"/>
+        </copy>
     </target>
-	
-	<target name="dist" depends="esb">
-		<!-- copying to jbossesb/lib -->
-    	<mkdir dir="${esb.product.lib.dir}/${ant.project.name}.esb"/>
-    	<copy todir="${esb.product.lib.dir}/${ant.project.name}.esb">
-    		<fileset dir="build/${ant.project.name}.esb" />
-    	</copy>
-	</target>
-    
+
+    <target name="dist" depends="esb">
+        <!-- copying to jbossesb/lib -->
+        <mkdir dir="${esb.product.lib.dir}/${ant.project.name}.esb"/>
+        <copy todir="${esb.product.lib.dir}/${ant.project.name}.esb">
+            <fileset dir="build/${ant.project.name}.esb"/>
+        </copy>
+    </target>
+
     <target name="base.test" depends="esb">
-    	<mkdir dir="build/test/classes"/>
-    	<mkdir dir="build/test/report"/>
-    	<javac srcdir="src/test/java" destdir="build/test/classes" debug="on" >
-			<classpath refid="classpath" />
-		</javac>
-    	<copy todir="build/test/classes" >
-    		<fileset dir="src/test/java" includes="**/*.xml" />
-    	</copy>
-		<junit fork="yes" haltonfailure="true" haltonerror="true" showoutput="off">
-			<formatter type="plain" usefile="false" />
-			<classpath>
+        <mkdir dir="build/test/classes"/>
+        <mkdir dir="build/test/report"/>
+        <javac srcdir="src/test/java" destdir="build/test/classes" debug="on">
+            <classpath refid="classpath"/>
+        </javac>
+        <copy todir="build/test/classes">
+            <fileset dir="src/test/java" includes="**/*.xml"/>
+        </copy>
+        <junit fork="yes" haltonfailure="true" haltonerror="true" showoutput="off">
+            <formatter type="plain" usefile="false"/>
+            <classpath>
                 <path refid="classpath"/>
-                <pathelement location="src/test/java" />
+                <pathelement location="src/test/java"/>
             </classpath>
-			<sysproperty key="log4j.configuration" value="log4j.xml" />
-			<test name="${testcase}" if="testcase" />
-			<batchtest unless="testcase" todir="build/test/report">
-				<fileset dir="build/test/classes" includes="**/*Test.class" />
-			</batchtest>
-		</junit>
+            <sysproperty key="log4j.configuration" value="log4j.xml"/>
+            <test name="${testcase}" if="testcase"/>
+            <batchtest unless="testcase" todir="build/test/report">
+                <fileset dir="build/test/classes" includes="**/*Test.class"/>
+            </batchtest>
+        </junit>
     </target>
-	
 
+
 </project>

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPProcessor.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPProcessor.java	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPProcessor.java	2007-07-08 17:12:53 UTC (rev 13243)
@@ -66,10 +66,10 @@
  *
  * <div style="margin-left: 20">
  * <h4>JAXB Introductions</h4>
- * The naitive JBossWS SOAP stack uses JAXB to bind to and from SOAP.  This typically means that an unannotated typeset
+ * The native JBossWS SOAP stack uses JAXB to bind to and from SOAP.  This typically means that an unannotated typeset
  * could not be used to build a JSR 181 endpoint on JBossWS.  To overcome this we use a JBossESB and JBossWS feature
  * called "JAXB Introductions" which basically means you can define an XML configuration to "Introduce" the JAXB Annotations.
- * For more on this, see the Webservices Guide.
+ * For more on this, see the section on this action in the Message Action Guide.
  * </div>
  *
  * <h3>Action Configuration</h3>

Modified: labs/jbossesb/workspace/dbevenius/wslistener/product/skip.properties-example
===================================================================
--- labs/jbossesb/workspace/dbevenius/wslistener/product/skip.properties-example	2007-07-08 15:59:38 UTC (rev 13242)
+++ labs/jbossesb/workspace/dbevenius/wslistener/product/skip.properties-example	2007-07-08 17:12:53 UTC (rev 13243)
@@ -12,6 +12,5 @@
 #skip.javadoc=true
 #skip.server.esb=true
 #skip.ftp.server=true
-#skip.services=true
 #skip.docs=true
 #skip.samples=true




More information about the jboss-svn-commits mailing list