[jboss-svn-commits] JBL Code SVN: r16649 - in labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2: product and 55 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Nov 16 13:24:45 EST 2007


Author: kevin.conner at jboss.com
Date: 2007-11-16 13:24:43 -0500 (Fri, 16 Nov 2007)
New Revision: 16649

Added:
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/lib/ext/commons-codec-1.3.jar
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/util/Encoding.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/CBRRules.drl
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/Discount_Rules.drl
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/MyRoutingRules.drl
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/Priority_Rules.drl
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/SampleOrder.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/SamplePetsOrder.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/altered_jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/deployment.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/docs/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/docs/Readme.odt
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/docs/Readme.pdf
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/images/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jbm-queue-service.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jbmq-queue-service.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jbossesb-properties.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jndi.properties
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/juddi.properties
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/lib/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/log4j.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/Review_Order.xhtml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/forms.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/gpd.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/processdefinition.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/processimage.jpg
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/readme.txt
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/check-origin.groovy
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/discount_service.groovy
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/display.groovy
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/fixer.groovy
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/intake_service.groovy
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/setup_discount.groovy
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/setup_key.groovy
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/setup_priority.groovy
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/shipping_service.groovy
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/smooks-config.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/SetupMessage.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/SimpleJMSNotifier.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/test/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/test/SendJMSMessage.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/test/SendJMSMessageStart.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/Customer.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/OrderHeader.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/OrderItem.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/StoreAction.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/transforms/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/transforms/from-dvdstore.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/transforms/from-petstore.xml
Removed:
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/jUDDI-registry/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/jaxb.xslt
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/lib/ext/Base64.html
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/CBRRules.drl
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/Discount_Rules.drl
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/MyRoutingRules.drl
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/Priority_Rules.drl
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/SampleOrder.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/SamplePetsOrder.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/altered_jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/deployment.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/docs/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/docs/Readme.odt
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/docs/Readme.pdf
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/images/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jbm-queue-service.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jbmq-queue-service.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jbossesb-properties.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jndi.properties
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/juddi.properties
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/lib/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/log4j.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/Review_Order.xhtml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/forms.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/gpd.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/processdefinition.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/processimage.jpg
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/readme.txt
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/check-origin.groovy
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/discount_service.groovy
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/display.groovy
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/fixer.groovy
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/intake_service.groovy
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/setup_discount.groovy
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/setup_key.groovy
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/setup_priority.groovy
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/shipping_service.groovy
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/smooks-config.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/SetupMessage.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/SimpleJMSNotifier.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/test/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/test/SendJMSMessage.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/test/SendJMSMessageStart.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/Customer.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/OrderHeader.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/OrderItem.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/StoreAction.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/transforms/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/transforms/from-dvdstore.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/transforms/from-petstore.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/main/java/org/jboss/soa/esb/jbossws/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/main/java/org/jboss/wsf/
Modified:
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/build-distr.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/AdministrationGuide.odt
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/ProgrammersGuide.odt
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/services/Registry.odt
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/services/Registry.pdf
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/conf/esb.juddi.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/jUDDI-registry/juddi.war
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultJmsReplyToEpr.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/AttachmentImpl.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/PropertiesImpl.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/marshal/SerializedMarshalUnmarshalPlugin.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/thirdparty/Base64.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/actions/StaticRouter.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/message/body/content/BytesBody.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/testutils/JMSUtil.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageDeploy.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration3/
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration3/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration3/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration3/test/SendJMSMessage.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/conf/base-build.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_file_notifier/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_file_notifier/jboss-esb-unfiltered.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_file_notifier/src/org/jboss/soa/esb/samples/quickstart/helloworldfilenotifier/MyJMSListenerAction.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_file_notifier/src/org/jboss/soa/esb/samples/quickstart/helloworldfilenotifier/test/SendEsbMessage.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/load_generator/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_producer/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_producer/src/org/jboss/soa/esb/samples/quickstart/webserviceproducer/test/SendMessage.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanBroker.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/actions/BankResponseActions.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/actions/CreditAgencyActions.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/Constants.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/NewProcessInstanceFacade.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/resources/META-INF/deployment.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbrules/src/main/resources/XPathLanguage.dsl
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/lib/ext/build-time/jbossws-core.jar
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/lib/ext/build-time/jbossws-jboss42.jar
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/lib/ext/build-time/jbossws-spi.jar
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPProcessor.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/WebserviceContractPublisher.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/configeditor/editor/docs/JBossESBConfigEditor.pdf
Log:
Merge of CP_IR1


Property changes on: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2
___________________________________________________________________
Name: svn:ignore
   - .settings
.classpath
.project
bin
.packaging
build
junit
ObjectToFileWriter.tst
null
classes

   + .settings
.classpath
.project
bin
.packaging
build
junit
ObjectToFileWriter.tst
null
classes
ESB.ipr
ESB.iws
runci.bat



Property changes on: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product
___________________________________________________________________
Name: svn:ignore
   - build
deployment.properties
javadocs
*.bat
ObjectToFileWriter.tst
*.log
test-outdir
foobar
res
skip.properties

   + build
deployment.properties
javadocs
*.bat
ObjectToFileWriter.tst
*.log
test-outdir
foobar
res
skip.properties
product.iml


Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/build-distr.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/build-distr.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/build-distr.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -60,47 +60,10 @@
     </target>
 
     <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="**/*"/>
-            </fileset>
-        </copy>
-<!--
-        <copy todir="${esbserver.dist.dir}/server/default/deploy">
-            <fileset dir="ftp/build">
-                <include name="ftp-server.sar/**/*"/>
-            </fileset>
-        </copy>
--->
-        <copy todir="${esbserver.dist.dir}/server/default/deploy">
-            <fileset dir="tools/configeditor/editor/dist">
-                <include name="jbossesb-config-editor.war"/>
-            </fileset>
-            <fileset dir="tools/console/contract-web/build">
-                <include name="contract.war"/>
-            </fileset>
-        </copy>
-        <copy todir="${esbserver.dist.dir}/server/default/conf">
-            <fileset dir="tools/configeditor/editor/resources">
-                <include name="action-templates.xml"/>
-            </fileset>
-        </copy>
-        <!-- copy services -->
-        <copy todir="${esbserver.dist.dir}/server/default/deploy">
-            <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="build/jbossesb/lib" includes="soapui-client.sar/**/*"/>
-        </copy>
-
-        <!-- initialise the ESB bindings -->
-        <ant dir="install" target="deploy.bindings" inheritAll="false">
-            <property name="org.jboss.esb.server.home" value="${esbserver.dist.dir}"/>
-            <property name="org.jboss.esb.server.config" value="default"/>
+        <ant antfile="build.xml" dir="${esb.install.location}" target="deploy"
+                inheritall="false">
+                <property name="org.jboss.esb.server.home" value="${esbserver.dist.dir}"/>
+                <property name="org.jboss.esb.server.config" value="default"/>
         </ant>
 
         <!-- initialise the WS modifications -->
@@ -108,10 +71,6 @@
             <property name="org.jboss.esb.server.home" value="${esbserver.dist.dir}"/>
             <property name="org.jboss.esb.server.config" value="default"/>
         </ant>
-	<ant dir="install/jbpm-patch" target="replace">
-	    <property name="org.jboss.esb.server.home" value="${esbserver.dist.dir}"/>
-	    <property name="org.jboss.esb.server.config" value="default"/>
-	</ant>
     </target>
 
     <target name="unpack.server.zip" unless="skip.server.esb">
@@ -170,6 +129,12 @@
             <!-- Quartz -->
             <fileset dir="${lib.ext.dir}" includes="quartz*.jar"/>
         </copy>
+    	<copy todir="${build.dir}/jbossesb.sar">
+    		<fileset dir="${installation.files.dir}/jUDDI-registry" includes="juddi.war"/>
+    	</copy>
+        <copy todir="${build.lib.dir}">
+            <fileset dir="build" includes="jbossesb.sar/**"/>
+        </copy>
 
     </target>
 

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/build.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/build.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -406,9 +406,6 @@
             <fileset dir="lib/ext" includes="jboss-jaxb-intros.jar"/>
 		</copy>
 		<ant antfile="build-distr.xml" target="dist" />
-		<copy todir="${org.jboss.esb.internal.jar.dest}">
-			<fileset dir="build" includes="jbossesb.sar/**"/>
-		</copy>
 	</target>
 	
 	<!-- Build the tools into the main dist -->
@@ -460,9 +457,14 @@
                 <zipfileset dir="${org.jboss.esb.internal.dest}/jbossesb"
                     prefix="jbossesb-${version}"/>
             </zip>
-            <zip zipfile="${org.jboss.esb.internal.dest}/${esb.server.name}.zip"
-                basedir="${org.jboss.esb.internal.dest}"
-                includes="${esb.server.name}/**"/>
+            <zip zipfile="${org.jboss.esb.internal.dest}/${esb.server.name}.zip">
+                <zipfileset dir="${org.jboss.esb.internal.dest}"
+                    includes="${esb.server.name}/bin/*.sh"
+                    filemode="755"/>
+                <zipfileset dir="${org.jboss.esb.internal.dest}"
+                    includes="${esb.server.name}/**"
+                    excludes="${esb.server.name}/bin/*.sh"/>
+            </zip>
 	</target>
 	
 	<target name="tools" description="builds the tools into the main dist">

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

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

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/services/Registry.odt
===================================================================
(Binary files differ)

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/services/Registry.pdf
===================================================================
(Binary files differ)

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/build.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/build.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -7,8 +7,10 @@
 	<!-- Load Build Properties File -->
 	<property file="${org.jboss.esb.deployment.properties}"/>
 	
-        <property name="deploy.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
-        <property name="hadeploy.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy-hasingleton"/>
+        <property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
+        <property name="conf.dir" value="${server.dir}/conf"/>
+        <property name="deploy.dir" value="${server.dir}/deploy"/>
+        <property name="hadeploy.dir" value="${server.dir}/deploy-hasingleton"/>
 
         <property name="product.dir" location=".."/>
 
@@ -146,6 +148,9 @@
 
           <!-- contracts app -->
           <copy file="${org.jboss.esb.dist}/tools/contract/contract.war" todir="${deploy.dir}" />
+          <!-- config-editor app -->
+          <copy file="${org.jboss.esb.dist}/tools/configeditor/dist/jbossesb-config-editor.war" todir="${deploy.dir}" />
+          <copy file="${org.jboss.esb.dist}/tools/configeditor/resources/action-templates.xml" todir="${conf.dir}" />
 
 	  <ant dir="jbpm-patch" target="replace">
 		<property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
@@ -164,6 +169,8 @@
         <delete dir="${deploy.dir}/soap.esb" />
         <delete dir="${deploy.dir}/soapui-client.sar" />
         <delete dir="${deploy.dir}/contract.war" />
+        <delete dir="${deploy.dir}/jbossesb-config-editor.war" />
+        <delete dir="${conf.dir}/action-templates.xml" />
     </target>
 
         <property name="org.jboss.esb.tomcat.55lib"
@@ -230,7 +237,9 @@
 	</target>
 	
 	<target name="patch-jbossws" depends="check.deploy.props, dependencies" description="Deploys JAXB Intros to the application server">
-		<property name="jbossws.location" location="${deploy.dir}/jbossws.sar"/>
+        <echo message="***** DEPRECATED: Patch no longer required!" />
+        <!--
+        <property name="jbossws.location" location="${deploy.dir}/jbossws.sar"/>
 		<property name="jbossws.beans.location" location="${jbossws.location}/jbossws.beans/META-INF/jboss-beans.xml"/>
 		<property name="jbossws.beans.tmp.location" location="${jbossws.location}/jbossws.beans/META-INF/jboss-beans.new.xml"/>
 
@@ -247,6 +256,7 @@
 		</copy>
 		
 		<antcall target="apply-jbossws-xslt" />
+		-->
 	</target>
 
 	<target name="apply-jbossws-xslt" unless="jaxb.intros.exist">

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/conf/esb.juddi.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/conf/esb.juddi.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/conf/esb.juddi.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -61,7 +61,8 @@
 
   <!-- jUDDI database creation -->
   <entry key="juddi.isCreateDatabase">true</entry>
-  <entry key="juddi.databaseExistsSql">select * from BUSINESS_ENTITY</entry>
+  <!--   <entry key="juddi.tablePrefix">JUDDI_</entry> -->
+  <entry key="juddi.databaseExistsSql">select * from ${prefix}BUSINESS_ENTITY</entry>
   <entry key="juddi.sqlFiles">juddi-sql/hsqldb/create_database.sql,juddi-sql/hsqldb/import.sql</entry>
 
   <!-- jUDDI UUIDGen implementation to use -->

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/jUDDI-registry/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/jUDDI-registry/build.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/jUDDI-registry/build.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,28 +0,0 @@
-<project name="JBESB_Config_jUDDI_Deployment" default="deploy.juddi" basedir=".">
-
-	<!-- Set deployment properties filename -->
-	<property name="org.jboss.esb.deployment.properties" location="../deployment.properties"/>
-
-	<!-- Load Build Properties File -->
-	<property file="${org.jboss.esb.deployment.properties}"/>
-	<property name="juddi.deploy.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy" />
- 	<echo>Using JBoss AS at ${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}</echo>	
-
-	<target name="deploy.juddi">
-		<!-- deploy -->
-		<copy  verbose="true" file="juddi.war" overwrite="true"
-			   todir="${juddi.deploy.dir}" />
-		<!-- is installed by default 
-		<copy  verbose="true" file="juddi-ds.xml" overwrite="true"
-               todir="${juddi.deploy.dir}" />  -->
-	</target>
-	
-
-	<target name="undeploy.juddi">
-        <!-- undeploy -->
-	    <delete verbose="true" file="${juddi.deploy.dir}/juddi.war" />
-        <!--
-		<delete verbose="true" file="${juddi.deploy.dir}/juddi-ds.xml" />
-		-->
-    </target>
-</project>

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/jUDDI-registry/juddi.war
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/jaxb.xslt
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/jaxb.xslt	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/jaxb.xslt	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,43 +0,0 @@
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:deployer="urn:jboss:bean-deployer">
-	<xsl:output method="xml" encoding="UTF-8"/>
-	
-	<xsl:template match="deployer:deployment/deployer:bean[1]">
-		<xsl:element name="bean" namespace="urn:jboss:bean-deployer">
-			<xsl:attribute name="name">WSEndpointJAXBIntrosCustomizationsDeployer</xsl:attribute>
-			<xsl:attribute name="class">org.jboss.wsf.spi.deployment.JAXBIntrosCustomizationsDeployer</xsl:attribute>
-		</xsl:element>
-		<xsl:comment>ESB Customization Deployer</xsl:comment>
-		<xsl:text>
-  </xsl:text>
-		<xsl:copy>
-			<xsl:apply-templates select="@*|node()"/>
-		</xsl:copy>
-	</xsl:template>
-	
-	<xsl:template match="deployer:bean[@name='WSMainDeployerManager']/deployer:property[@name='deployers']//deployer:inject[@bean='WSEndpointHandlerDeployer']">
-		<xsl:element name="inject" namespace="urn:jboss:bean-deployer">
-			<xsl:attribute name="bean">WSEndpointJAXBIntrosCustomizationsDeployer</xsl:attribute>
-		</xsl:element>
-		<xsl:comment>ESB Customization Deployer</xsl:comment>
-		<xsl:text>
-        </xsl:text>
-		<xsl:copy>
-			<xsl:apply-templates select="@*|node()"/>
-		</xsl:copy>
-	</xsl:template>
-	
-	<xsl:template match="deployer:bean[@name='WSWebMetaDataAdapter']">
-		<xsl:element name="bean" namespace="urn:jboss:bean-deployer">
-			<xsl:attribute name="name">WSWebMetaDataAdapter</xsl:attribute>
-			<xsl:attribute name="class">org.jboss.soa.esb.jbossws.ESBWebMetaDataAdapter</xsl:attribute>
-		</xsl:element>
-		<xsl:comment>ESB Customization Deployer</xsl:comment>
-	</xsl:template>
-	
-	<xsl:template match="@*|node()">
-		<xsl:copy>
-			<xsl:apply-templates select="@*|node()"/>
-		</xsl:copy>
-	</xsl:template>
-</xsl:stylesheet>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/lib/ext/Base64.html
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/lib/ext/Base64.html	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/lib/ext/Base64.html	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,397 +0,0 @@
-<html>
-  <head>
-<!-- Generated from XML source. Copyright 2001 Robert Harder. -->
-    <title>Base64 - A Public Domain Base64 Encoder/Decoder for Java</title>
-    <meta http-equiv="Content-Type" content="text/html;CHARSET=iso-8859-1"/>
-    <meta http-equiv="Content-Language" content="EN"/>
-    <meta name="keywords" content="base64, base, 64, java, public domain"/>
-    <meta name="description" content="Base64 - A Public Domain Base64 Encoder/Decoder for Java"/>
-    <meta name="abstract" content="Base64 - A Public Domain Base64 Encoder/Decoder for Java"/>
-    <meta name="author" content="Robert Harder"/>
-    <meta name="copyright" content="Robert Harder, 2004"/>
-    <meta name="distribution" content="Global"/>
-    <meta name="revisit-after" content="7 days"/>
-    <meta name="robots" content="FOLLOW,INDEX"/>
-    <link rel="ICON" href="./favicon.ico" type="image/x-icon"/>
-    <link rel="SHORTCUT ICON" href="./favicon.ico"/>
-    <base target="_parent"/>
-    <style type="text/css">
-<!--
-             
-
-body        { margin: 0; }
-.iHarderNet { font-family: arial, geneva, lucida sans unicode, helvetica; color: white; text-align: center; font-size: 14pt; }
-.i_iHarder  { font-family: times new roman, courier; font-style: italic; font-weight: bold; font-size: 12pt; }
-
-               .MainTitle
-                 {  color: white;
-                    font-family: arial, geneva, lucida sans unicode, helvetica;
-                    text-align: center;
-                    font-weight: bold;
-                    font-size: 24pt;
-                    font-style: italic;
-                    margin-bottom: 4pt;
-                 }
-
-               .OpenTS_Home
-                 {  color: white;
-                    font-family: arial, geneva, lucida sans unicode, helvetica;
-                    text-align: center;
-                    font-weight: bold;
-                    font-size: 14pt;
-                    font-style: italic;
-                 }
-
-
-               .Menu
-                 {  margin-top: 10pt;
-                    margin-left: 6pt;
-                    text-indent: -6pt;
-                    font-family: arial, geneva, lucida sans unicode, helvetica;
-                    font-weight: bold;
-                    font-size: 10pt;
-                 }
-
-               .SubMenu
-                 {  margin-top: -5pt;
-                    margin-left: 4pt;
-                 }
-
-
-               .MenuItem
-                 {  margin-top: 10pt;
-                    font-family: arial, geneva, lucida sans unicode, helvetica;
-                    font-weight: bold;
-                    font-size: 10pt;
-                 }
-
-               .Menu A
-                 {  color: #000033;
-                 }
-
-               .Logo
-                 {  text-align: center;
-                 }
-
-.SubTitle
-{  font-family: Arial, san serif;
-   font-size: 16pt;
-   font-style: italic;
-   font-weight: bold;
-}
-
-
-               .SectionTitle
-                 {  margin-top: 1em;
-                    margin-left: 1em;
-                    margin-right: 50%;
-                    font-family: arial, geneva, lucida sans unicode, helvetica;
-                    font-weight: bold;
-                    font-size: larger;
-                    /*border-top: 4px double black;*/
-                    border-bottom: 4px double black;
-                 }
-
-               .MainSectionTitle
-                 {  margin-top: 1em;
-                    font-family: arial, geneva, lucida sans unicode, helvetica;
-                    font-weight: bold;
-                    font-size: 22pt;
-                    font-style: italic;
-                    border-bottom: 4px double black;
-                 }
-
-               .SectionBody
-                 {  margin-top: 1em;
-                 }
-
-               .MainSectionBody
-                 {  margin-top: 10pt;
-                 }
-
-               .MainPage
-                 {  margin: 4pt; 
-                    margin-right: 24pt;
-                 }
-
-               .FAQList_Question
-                 {  
-                    font-family: arial, geneva, lucida sans unicode, helvetica;
-                    font-weight: bold;
-                 }
-
-               .FAQ_Question
-                 {  
-                    font-family: arial, geneva, lucida sans unicode, helvetica;
-                    font-weight: bold;
-                 }
-
-               .FAQ_Answer
-                 {  
-                 }
-
-
-               .TopMenu
-                 {  margin-top: 20pt;
-                    margin-bottom: 10pt;
-                    border-bottom: 4px black;
-                    text-align: center
-                 }
-
-               .BottomMenu
-                 {  margin-top: 0.1in;
-                    border-top: 4px double black;
-                    margin-bottom: 10pt;
-                    border-bottom: 4px black;
-                    text-align: center
-                 }
-
-               p
-                 {  
-                    margin-top: 0.1in;
-                    text-indent: 1em;
-                 }
-
-               li
-                 {  margin-top: 0.2in;  
-                 }
-
-               ul
-                 {  margin-left: 0.25in;
-                    margin-top: 0.1in;
-                 }
-
-               tt
-                 {  font-size: larger;
-                 }
-
-               a
-                 {  color: #000055;
-                 }
-               a:hover
-                 {  background: lavender;
-                    text-decoration: none;
-                    color: black;
-                 }
-
- p.alert { border-left:solid red 6px; margin-left:-12px; padding-left:6px; }
- pre { padding:1ex; border: solid gray 1px;}
- code { font-size: 95%; }
- dl dt { font-weight: bold }
- dl dd { margin-bottom: 1em }
- .newCode { background: #EEEEEE; }
-               
-             
-           -->
-    </style>
-  </head>
-  <body bgcolor="white">
-    <table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
-      <tr bgcolor="#000066" height="50">
-        <td width="128" height="50">
-          <div class="iHarderNet">
-            <a href="http://www.iHarder.net">
-              <span class="iHarderNet"><span class="i_iHarder">i</span>Harder.net</span>
-            </a>
-          </div>
-        </td>
-        <td width="*">
-          <div class="MainTitle">
-            <title-medium>Base64</title-medium>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td colspan="2">
-          <div style="margin:0 ; border-top: 1px double black"/>
-        </td>
-      </tr>
-      <tr height="*">
-        <td width="128" valign="top" bgcolor="#9090d0">
-          <table width="100%" height="100%" cellpadding="2" cellspacing="0" border="0">
-            <tr height="1">
-              <td height="1" width="120" bgcolor="white" valign="center" align="center">
-                <div class="SubTitle">
-      Base64
-    </div>
-              </td>
-            </tr>
-            <tr>
-              <td valign="top" height="*" style="border-top: solid black 1px; border-right: solid black 1px">
-                <div class="Menu">
-                  <a title="" href="./.">Home</a>
-                </div>
-                <div class="Menu">
-                  <a title="A Java framework for the Tabu Search meta-heuristic" href="http://OpenTS.iHarder.net">OpenTS</a>
-                </div>
-                <div class="Menu">
-                  <a title="Software and tutorials for programming Mac OS X" href="./macosx">Mac OS X</a>
-                </div>
-                <div class="Menu">
-                  <a title="Xmlize (like serialize) your Java objects into XML documents." href="./xmlizable">Xmlizable</a>
-                </div>
-                <div class="Menu">
-                  <a title="Public Domain Base64 Java utility." href="./base64">Base64</a>
-                </div>
-                <div class="Menu">
-                  <a title="Drag and drop files into your Java programs" href="./filedrop">FileDrop</a>
-                </div>
-                <div class="Menu">
-                  <a title="View Mr. Harder's online resume" href="http://resume.iharder.net">Mr. Harder's Resume</a>
-                </div>
-                <div class="Menu">
-                  <a title="Send email to Mr. Harder" href="mailto:robertharder[nospam]gmail.com">Contact Mr. Harder</a>
-                </div>
-                <p>
-                  <hr align="center"/>
-                </p>
-                <div align="center" style="text-align:center">
-                  <a href="http://sourceforge.net">
-                    <img src="http://sourceforge.net/sflogo.php?group_id=23200" width="88" height="31" border="0" alt="SourceForge Logo"/>
-                  </a>
-                </div>
-                <p/>
-                <div align="center" style="text-align:center">
-                  <a href="http://iharder.sourceforge.net/gotmoney.php">
-                    <img src="http://iharder.sourceforge.net/gotmoney.gif" width="88" height="32" border="0" alt="got money?"/>
-                  </a>
-                </div>
-              </td>
-            </tr>
-          </table>
-        </td>
-        <td width="*" height="*" bgcolor="white" valign="top">
-          <div class="MainPage">
-
-    <div class="MainSectionTitle">Summary</div><div class="MainSectionBody">      
-
-<P><em>Now supports GZip-(de)compressing data before/after encoding!</em></P>
-
-        <P>
-          This is a <strong>Public Domain</strong> Java class providing
-          <strong>very fast</strong> Base64 encoding and decoding in 
-          the form of convenience methods and input/output streams.
-        </P>
-
-        <P style="text-align:center; font-weight:bold; font-size:larger">
-          <a href="http://prdownloads.sourceforge.net/iharder/Base64-2.1.zip?download">Download v2.1 Now! base64.zip (40k)</a>
-        </P>
-
-        <p>
-         You can have SourceForge automatically notify you when this Base64 code
-         is updated (I highly recommend you do this). 
-         <a href="http://sourceforge.net/project/filemodule_monitor.php?filemodule_id=30229">Click here.</a>
-        </p>
-
-        <p>
-          There are other Base64 utilities on the Internet, some part
-          of proprietary packages, some with various open source licenses.
-          In any event, I hope with one or more of these Base64 tools, you won't 
-          have to write your own like I did.
-        </p>
-<p>
-Thanks to Brian Burton for providing this <a href="Base64Test.java">Base64Test.java</a> test class for use with <a href="http://www.junit.org">JUnit.org</a>.
-</p>
-
-        
-        <p>
-          <strong>Changes:</strong>
-          <ul>
-<li>v2.1 - Cleaned up javadoc comments and unused variables and methods. Added
-    some convenience methods for reading and writing to and from files.</li>
- <li>
-  v2.0.2 - Now specifies UTF-8 encoding in places where the code fails on systems
-   with other encodings (like EBCDIC).
- </li>
-   
-   <li>v2.0.1 - Fixed an error when decoding a single byte, that is, when the
-     encoded data was a single byte.</li>
-   <li>v2.0 - I got rid of methods that used booleans to set options. 
-    Now everything is more consolidated and cleaner. The code now detects
-    when data that's being decoded is gzip-compressed and will decompress it
-    automatically. Generally things are cleaner. You'll probably have to
-    change some method calls that you were making to support the new
-    options format (<tt>int</tt>s that you &quot;OR&quot; together).</li>
-
-           <li>v1.5.1 - Fixed bug when decompressing and decoding to a
-            byte[] using <tt>decode( String s, boolean gzipCompressed )</tt>.
-            Added the ability to &quot;suspend&quot; encoding in the Output Stream so
-            you can turn on and off the encoding if you need to embed base64
-            data in an otherwise &quot;normal&quot; stream (like an XML file).
-            <em>This has not been fully tested, so please alert me to bugs.</em></li>
-           <li>v1.5 - Output stream pases on flush() command but doesn't do anything itself. This helps when using GZIP streams. Added the ability to <strong>GZip-compress objects</strong> before encoding them.</li>
-           <li>v1.4 - Added some helper methods for reading and writing to/from files.</li>
-           <li>v1.3.6 - Fixed OutputStream.flush() so that 'position' is reset.</li>
-           <li>v1.3.5 - Added flag to turn on and off line breaks. Fixed bug in input stream
-               where last buffer being read, if not completely full, was not returned.</li>
-           <li>v1.3.4 - Fixed when <em>Improperly padded base64 stream</em> exception
-               was incorrectly thrown.</li>
-           <li>A bug has been fixed that kept I/O streams from working at all, really.</li>
-           <li>A bug has been fixed affecting you if you use the Base64.InputStream
-            to encode data.
-           </li>
-           <li>A bug has been fixed where if you specified an offset when encoding
-            an array of bytes, the offset was ignored. 
-           </li>
-          </ul>
-        </p>
-
-      </div>
-
-    <div class="MainSectionTitle">Example</div><div class="MainSectionBody">
-        <p>
-          The easiest way to convert some data is with the convenience methods:
-        </p>
-<code><pre>String result1 = <strong>Base64.encodeObject</strong>( mySerializableObject );
-String result2 = <strong>Base64.encodeBytes</strong>( new byte[]{ 3, 34, 116, 9 } );
-</pre></code>   
-     
-        <p>
-          Or you can use the very efficient streams:
-        </p>
-<code><pre>OutputStream out = <strong>new Base64.OutputStream</strong>( 
-                    new FileOutputStream( &quot;out.txt&quot; ) );
-// Go on about your outputting...
-// ...
-
-InputStream in = <strong>new Base64.InputStream</strong>( 
-                  new FileInputStream( &quot;in.txt&quot; ) );
-// Go on about your inputting...
-// ...
-</pre></code>        
-
-
-        <p>
-          There are defaults (OutputStream encodes, InputStream decodes),
-          but you can easily override that:
-        </p>
-<code><pre>OutputStream out = new Base64.OutputStream( 
-                    new FileOutputStream( &quot;out.txt&quot; ), <strong>Base64.DECODE</strong> );
-// Go on about your outputting...
-// ...
-</pre></code>    
-
-      </div>
-
-
-  </div>
-        </td>
-      </tr>
-      <tr>
-        <td bgcolor="#9090d0" style="height: 1em; border-right: solid black 1px"> </td>
-        <td>
-          <div class="BottomMenu">
-            <span class="Menu"><a title="" href="./.">Home</a> | </span>
-            <span class="Menu"><a title="A Java framework for the Tabu Search meta-heuristic" href="http://OpenTS.iHarder.net">OpenTS</a> | </span>
-            <span class="Menu"><a title="Software and tutorials for programming Mac OS X" href="./macosx">Mac OS X</a> | </span>
-            <span class="Menu"><a title="Xmlize (like serialize) your Java objects into XML documents." href="./xmlizable">Xmlizable</a> | </span>
-            <span class="Menu"><a title="Public Domain Base64 Java utility." href="./base64">Base64</a> | </span>
-            <span class="Menu"><a title="Drag and drop files into your Java programs" href="./filedrop">FileDrop</a> | </span>
-            <span class="Menu"><a title="View Mr. Harder's online resume" href="http://resume.iharder.net">Mr. Harder's Resume</a> | </span>
-            <span class="Menu"><a title="Send email to Mr. Harder" href="mailto:robertharder[nospam]gmail.com">Contact Mr. Harder</a> | </span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </body>
-</html>

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/lib/ext/commons-codec-1.3.jar (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/lib/ext/commons-codec-1.3.jar)
===================================================================
(Binary files differ)

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultJmsReplyToEpr.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultJmsReplyToEpr.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultJmsReplyToEpr.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -33,11 +33,13 @@
 	public DefaultJmsReplyToEpr(JMSEpr epr)
 		throws URISyntaxException
 	{
-		super(	epr.getDestinationType()
+		super(	epr.getVersion()
+				,epr.getDestinationType()
 				,replyDestinationName(epr)
 				,epr.getConnectionFactory()
 				,epr.getJndiEnvironment()
 				,replySelector(epr)
+				,epr.getPersistent()
 			 );
 	}
 	private static String replyDestinationName(JMSEpr toEpr)

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -153,7 +153,7 @@
 			return new FileCourier(new FileEpr(epr), pickUpOnly);
 
 		throw new MalformedEPRException("Courier for "
-				+ epr.getClass().getSimpleName() + " not supported!");
+				+ epr.getClass().getSimpleName() + " not supported: ESB-unaware EPR used!");
 	}
 
 	/**

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/AttachmentImpl.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/AttachmentImpl.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/AttachmentImpl.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -21,12 +21,13 @@
 
 package org.jboss.internal.soa.esb.message.format.xml;
 
+import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.Map;
 
-import org.jboss.internal.soa.esb.thirdparty.Base64;
+import org.jboss.internal.soa.esb.util.Encoding;
 import org.jboss.soa.esb.MarshalException;
 import org.jboss.soa.esb.UnmarshalException;
 import org.jboss.soa.esb.message.Attachment;
@@ -144,31 +145,38 @@
 		Document doc = elem.getOwnerDocument();
 		Element thisElement = doc.createElement(ATTACHMENT_TAG);
 
-		listToXml(doc, thisElement);
-		tableToXml(doc, thisElement);
+		try
+		{
+			listToXml(doc, thisElement);
+			tableToXml(doc, thisElement);
+		}
+		catch (IOException ex)
+		{
+			throw new MarshalException(ex);
+		}
 
 		elem.appendChild(thisElement);
 		return thisElement;
 	}
 
-	private void tableToXml(Document doc, Element elem)
+	private void tableToXml(Document doc, Element elem) throws IOException
 	{
 		for (Map.Entry<String, Serializable> oCurr : _table.entrySet())
 		{
 			Element named = doc.createElement(NAMED_TAG);
 			named.setAttribute(NAME_ATTR, oCurr.getKey());
-			named.appendChild(doc.createCDATASection(Base64.encodeObject(oCurr
+			named.appendChild(doc.createCDATASection(Encoding.encodeObject(oCurr
 					.getValue())));
 			elem.appendChild(named);
 		}
 	}
 
-	private void listToXml(Document doc, Element elem)
+	private void listToXml(Document doc, Element elem) throws IOException
 	{
 		for (Serializable oCurr : _list)
 		{
 			Element anonymous = doc.createElement(UNNAMED_TAG);
-			anonymous.appendChild(doc.createCDATASection(Base64
+			anonymous.appendChild(doc.createCDATASection(Encoding
 					.encodeObject(oCurr)));
 			elem.appendChild(anonymous);
 		}
@@ -192,39 +200,58 @@
 			Node oCurr = NL.item(i1);
 			if ((oCurr instanceof Element))
 			{
-				listFromXml((Element) oCurr);
-				tableFromXml((Element) oCurr);
+				try
+				{
+					listFromXml((Element) oCurr);
+					tableFromXml((Element) oCurr);
+				}
+				catch (IOException ex)
+				{
+					throw new UnmarshalException(ex);
+				}
+				catch (ClassNotFoundException ex)
+				{
+					throw new UnmarshalException(ex);
+				}
 			}
 		}
 	}
 
-	private void listFromXml(Element elem)
+	private void listFromXml(Element elem) throws IOException, ClassNotFoundException
 	{
 		NodeList anonymous = elem.getElementsByTagName(UNNAMED_TAG);
-		for (int i1 = 0; i1 < anonymous.getLength(); i1++)
+		
+		if (anonymous != null)
 		{
-			Node oCurr = anonymous.item(i1);
-			if (oCurr instanceof Element)
+			for (int i1 = 0; i1 < anonymous.getLength(); i1++)
 			{
-				CDATASection cdata = (CDATASection) oCurr.getFirstChild();
-				Object value = Base64.decodeToObject(cdata.getWholeText());
-				_list.add((Serializable) value);
+				Node oCurr = anonymous.item(i1);
+				if (oCurr instanceof Element)
+				{
+					CDATASection cdata = (CDATASection) oCurr.getFirstChild();
+					Object value = Encoding.decodeToObject(cdata.getWholeText());
+					_list.add((Serializable) value);
+				}
 			}
 		}
 	}
 
-	private void tableFromXml(Element elem)
+	private void tableFromXml(Element elem) throws IOException, ClassNotFoundException
 	{
 		NodeList named = elem.getElementsByTagName(NAMED_TAG);
-		for (int i1 = 0; i1 < named.getLength(); i1++)
+		
+		if (named != null)
 		{
-			Node oCurr = named.item(i1);
-			if (oCurr instanceof Element)
+			for (int i1 = 0; i1 < named.getLength(); i1++)
 			{
-				CDATASection cdata = (CDATASection) oCurr.getFirstChild();
-				String name = ((Element) oCurr).getAttribute(NAME_ATTR);
-				Object value = Base64.decodeToObject(cdata.getWholeText());
-				_table.put(name, (Serializable) value);
+				Node oCurr = named.item(i1);
+				if (oCurr instanceof Element)
+				{
+					CDATASection cdata = (CDATASection) oCurr.getFirstChild();
+					String name = ((Element) oCurr).getAttribute(NAME_ATTR);
+					Object value = Encoding.decodeToObject(cdata.getWholeText());
+					_table.put(name, (Serializable) value);
+				}
 			}
 		}
 	}

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -41,10 +41,10 @@
 /**
  * A Body implementation that serializes to XML.
  * 
- * What this really should do is go through the Body contents and
- * serialize the basic types as XML types, thus improving loose coupling
- * by reducing the dependency on Java. It can do this by registering
- * different Marshal/Unmarshal classes.
+ * What this really should do is go through the Body contents and serialize the
+ * basic types as XML types, thus improving loose coupling by reducing the
+ * dependency on Java. It can do this by registering different Marshal/Unmarshal
+ * classes.
  */
 
 public class BodyImpl implements Body
@@ -137,12 +137,12 @@
 		envelope.appendChild(bodyElement);
 
 		/*
-		 * Keep separate byte array section for now, in case anyone
-		 * is looking for it within the XML (e.g., roll-your-own CBR).
+		 * Keep separate byte array section for now, in case anyone is looking
+		 * for it within the XML (e.g., roll-your-own CBR).
 		 */
-		
+
 		byte[] content = getByteArray();
-		
+
 		if (content != null)
 		{
 			Element byteElement = doc.createElement(BYTES_TAG);
@@ -312,7 +312,7 @@
 		_objects.putAll(toMerge._objects);
 
 		byte[] toAdd = b.getByteArray();
-		
+
 		if ((toAdd != null) && (toAdd.length > 0))
 			setByteArray(toAdd);
 	}
@@ -321,7 +321,7 @@
 	{
 		String toReturn = "body: [ ";
 		byte[] content = getByteArray();
-		
+
 		if (content != null)
 			toReturn += "byte[]: " + Util.format(new String(content));
 

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/PropertiesImpl.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/PropertiesImpl.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/PropertiesImpl.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -20,12 +20,13 @@
  */
 package org.jboss.internal.soa.esb.message.format.xml;
 
+import java.io.IOException;
 import java.io.Serializable;
 import java.util.Hashtable;
 import java.util.Map;
 
 import org.jboss.internal.soa.esb.assertion.AssertArgument;
-import org.jboss.internal.soa.esb.thirdparty.Base64;
+import org.jboss.internal.soa.esb.util.Encoding;
 import org.jboss.soa.esb.MarshalException;
 import org.jboss.soa.esb.UnmarshalException;
 import org.jboss.soa.esb.message.Properties;
@@ -107,10 +108,18 @@
 			Element keyElement = doc.createElement(KEY_TAG);
 			Element valueElement = doc.createElement(VALUE_TAG);
 			
-			keyElement.appendChild(doc.createCDATASection(Base64.encodeBytes(oCurr.getKey().getBytes())));
+			keyElement.appendChild(doc.createCDATASection(Encoding.encodeBytes(oCurr.getKey().getBytes())));
 			oProp.appendChild(keyElement);
 		
-			valueElement.appendChild(doc.createCDATASection(Base64.encodeObject(oCurr.getValue())));
+			try
+			{
+				valueElement.appendChild(doc.createCDATASection(Encoding.encodeObject(oCurr.getValue())));
+			}
+			catch (IOException ex)
+			{
+				throw new MarshalException(ex);
+			}
+			
 			oProp.appendChild(valueElement);
 			
 			thisElement.appendChild(oProp);
@@ -170,14 +179,26 @@
 						if (oProp.getNodeName().equals(VALUE_TAG))
 						{
 							CDATASection cdata = (CDATASection) oProp.getFirstChild();
-							value = Base64.decodeToObject(cdata.getWholeText());
+							
+							try
+							{
+								value = Encoding.decodeToObject(cdata.getWholeText());
+							}
+							catch (ClassNotFoundException ex)
+							{
+								throw new UnmarshalException(ex);
+							}
+							catch (IOException ex)
+							{
+								throw new UnmarshalException(ex);
+							}
 						}
 						else
 						{
 							if (oProp.getNodeName().equals(KEY_TAG))
 							{
 								CDATASection cdata = (CDATASection) oProp.getFirstChild();
-								key = new String(Base64.decode(cdata.getWholeText()));
+								key = new String(Encoding.decodeToBytes(cdata.getWholeText()));
 							}
 						}
 					}

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/marshal/SerializedMarshalUnmarshalPlugin.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/marshal/SerializedMarshalUnmarshalPlugin.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/marshal/SerializedMarshalUnmarshalPlugin.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -4,7 +4,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import org.jboss.internal.soa.esb.thirdparty.Base64;
+import org.jboss.internal.soa.esb.util.Encoding;
 import org.jboss.soa.esb.MarshalException;
 import org.jboss.soa.esb.UnmarshalException;
 import org.w3c.dom.CDATASection;
@@ -92,7 +92,7 @@
 
 				nodeElement.appendChild(doc.getOwnerDocument()
 						.createCDATASection(
-								Base64.encodeObject((Serializable) param)));
+								Encoding.encodeObject((Serializable) param)));
 
 				doc.appendChild(nodeElement);
 			}
@@ -145,7 +145,7 @@
 								CDATASection cdata = (CDATASection) childList
 										.item(j + 1);
 
-								return Base64.decodeToObject(cdata
+								return Encoding.decodeToObject(cdata
 										.getWholeText());
 							}
 						}

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/thirdparty/Base64.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/thirdparty/Base64.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/thirdparty/Base64.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1450,4 +1450,4 @@
     }   // end inner class OutputStream
     
     
-}   // end class Base64
+}   // end class Base64
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/util/Encoding.java (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/rosetta/src/org/jboss/internal/soa/esb/util/Encoding.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/util/Encoding.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/util/Encoding.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,85 @@
+/**
+ * A Base64 Encoder/Decoder.
+ *
+ * <p>
+ * This class is used to encode and decode data in Base64 format as described in RFC 1521.
+ *
+ * <p>
+ * This is "Open Source" software and released under the <a href="http://www.gnu.org/licenses/lgpl.html">GNU/LGPL</a> license.<br>
+ * It is provided "as is" without warranty of any kind.<br>
+ * Copyright 2003: Christian d'Heureuse, Inventec Informatik AG, Switzerland.<br>
+ * Home page: <a href="http://www.source-code.biz">www.source-code.biz</a><br>
+ *
+ * <p>
+ * Version history:<br>
+ * 2003-07-22 Christian d'Heureuse (chdh): Module created.<br>
+ * 2005-08-11 chdh: Lincense changed from GPL to LGPL.<br>
+ * 2006-11-21 chdh:<br>
+ *  &nbsp; Method encode(String) renamed to encodeString(String).<br>
+ *  &nbsp; Method decode(String) renamed to decodeString(String).<br>
+ *  &nbsp; New method encode(byte[],int) added.<br>
+ *  &nbsp; New method decode(String) added.<br>
+ */
+
+package org.jboss.internal.soa.esb.util;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
+import org.apache.commons.codec.binary.Base64;
+import org.jboss.soa.esb.util.ContextObjectInputStream;
+
+public class Encoding
+{	
+	/*
+	 * The following are methods added by us to support Objects.
+	 */
+	
+	public static String encodeBytes (byte[] param)
+	{
+		return new String(Base64.encodeBase64(param));
+	}
+
+	public static byte[] decodeToBytes (String param)
+	{
+		return Base64.decodeBase64(param.getBytes());
+	}
+	
+	public static String encodeObject (Serializable object) throws IOException
+	{
+		if (object == null)
+			throw new IllegalArgumentException();
+		
+		ByteArrayOutputStream bs = new ByteArrayOutputStream();
+        ObjectOutputStream oos = new ObjectOutputStream(bs);
+        
+        oos.writeObject(object);
+        oos.close();
+        
+        return encodeBytes(bs.toByteArray());
+	}
+	
+	public static Serializable decodeToObject (String param) throws IOException, ClassNotFoundException
+	{
+		if (param == null)
+			throw new IllegalArgumentException();
+		
+		ContextObjectInputStream ois = null;
+		
+		try
+		{
+			ByteArrayInputStream bs = new ByteArrayInputStream(Base64.decodeBase64(param.getBytes()));
+			ois = new ContextObjectInputStream(bs);
+
+			return (Serializable) ois.readObject();
+		}
+		finally
+		{
+			ois.close();
+		}
+	}
+
+}

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -38,12 +38,15 @@
 
 import org.apache.log4j.Logger;
 import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.Service;
 import org.jboss.soa.esb.addressing.EPR;
+import org.jboss.soa.esb.client.ServiceInvoker;
 import org.jboss.soa.esb.couriers.Courier;
 import org.jboss.soa.esb.couriers.CourierFactory;
 import org.jboss.soa.esb.couriers.CourierUtil;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.listeners.ListenerTagNames;
+import org.jboss.soa.esb.listeners.message.MessageDeliverException;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.message.format.MessageFactory;
 import org.jboss.soa.esb.services.registry.Registry;
@@ -285,6 +288,9 @@
         public void run() {
             boolean running = true ;
             while(running) {
+            	Service theService = new Service(serviceCategoryName, serviceName);
+            	ServiceInvoker theServiceInvoker = null;
+            	
                 //no need to check if no timeout is set
                 if (timeoutInMillies!=null) {
                     for (ConcurrentHashMap< String, Message > messageMap : _aggregatedMessageMap.values()) {
@@ -299,16 +305,10 @@
                                 _notified.add(uuId);
                                 logger.debug("Found timeout message.");
                                 try {
-                                    EPR epr = registry.findEPR(serviceCategoryName, serviceName);
-                                    Courier courier = CourierFactory.getCourier(epr);
-                                    try
-                                    {
-                                        courier.deliver(message);
-                                    }
-                                    finally
-                                    {
-                                        CourierUtil.cleanCourier(courier) ;
-                                    }
+                                	if (theServiceInvoker == null)
+                                    	theServiceInvoker = new ServiceInvoker(theService);
+                                	
+                                	theServiceInvoker.deliverAsync(message);
                                 } catch (Exception e) {
                                     logger.error(e.getMessage(), e);
                                     //If we can't notify then drop this data

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/actions/StaticRouter.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/actions/StaticRouter.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/actions/StaticRouter.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -41,7 +41,7 @@
     }
     
     /**
-     * Routes the message to one or more destonations.
+     * Routes the message to one or more destinations.
      */
     public Message process(Message message) throws ActionProcessingException
     {

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -268,7 +268,7 @@
             	}
             	catch (MalformedEPRException ex)  // so we can differentiate failure modes, since returning null is limiting
             	{
-            		logger.info("Invalid EPR for service: ignoring for message: "+message.getHeader());
+            		logger.info("Invalid EPR for service (probably ESB-unaware): ignoring for message: "+message.getHeader());
             		
             		serviceClusterInfo.removeDeadEPR(epr);
             	}
@@ -405,7 +405,9 @@
             } catch (CourierException e) {
                 logger.debug("Courier lookup failed for EPR [" + epr + "] for Service [" + service + "] and Message ["+message.getHeader()+"].", e);
             } catch (MalformedEPRException e) {
-                logger.warn("Badly formed EPR [" + epr + "] for Service [" + service + "] and Message ["+message.getHeader()+"]." + e.getMessage());
+            	// probably an ESB-unaware EPR in the registry!!
+            	
+                logger.info("Badly formed EPR [" + epr + "] for Service [" + service + "] and Message ["+message.getHeader()+"]." + e.getMessage());
                 
                 throw e;
             } catch (Throwable t) {

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/message/body/content/BytesBody.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/message/body/content/BytesBody.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/message/body/content/BytesBody.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -40,7 +40,7 @@
 
 public interface BytesBody extends Body
 {
-    @Deprecated
+
     public static final String BYTES_LOCATION = "org.jboss.soa.esb.message.content.bytes";
 	
 	public boolean readBoolean() throws IncompatibleModeException, IOException,

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/testutils/JMSUtil.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/testutils/JMSUtil.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/testutils/JMSUtil.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,3 +1,23 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated 
+ * by the @authors tag. All rights reserved. 
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors. 
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA  02110-1301, USA.
+ * 
+ * (C) 2005-2006,
+ */
+
 package org.jboss.soa.esb.testutils;
 
 import org.apache.log4j.Logger;

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageDeploy.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageDeploy.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageDeploy.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -61,9 +61,21 @@
     
     public void stop() throws JMSException 
     { 
-        conn.stop();
-        session.close();
-        conn.close();
+        try {
+            if(conn != null) {
+                conn.stop();
+            }
+        } finally {
+            try {
+                if(session != null) {
+                    session.close();
+                }
+            } finally {
+                if(conn != null) {
+                    conn.close();
+                }
+            }
+        }
     }
     
     public void sendAMessage(String msg) throws JMSException {
@@ -78,10 +90,16 @@
     public static void main(String args[]) throws Exception
     {               
       SendJMSMessageDeploy sm = new SendJMSMessageDeploy();
-      sm.setupConnection();
-      sm.sendAMessage(args[0]); 
-      sm.stop();
-      
+        try {
+            sm.setupConnection();
+            sm.sendAMessage(args[0]);
+        } catch (Exception e) {
+            System.out.println("\n**** Failed to send message to JMS Destination '" + args[0] + "'.  " +
+                               "\n**** Your JMS Provider (e.g. your JBoss ESB/App Server) may not be running, or the JMS Destination may not be deployed." +
+                               "\n**** Exception: " + e.getMessage());
+        } finally {
+            sm.stop();
+        }      
     }
     
 }


Property changes on: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration3
___________________________________________________________________
Name: svn:ignore
   + build


Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration3/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration3/build.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration3/build.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -37,7 +37,7 @@
 	
   <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.quickstart.bpm_orchestration3.test.SendJMSMessage" failonerror="true">
+     <java fork="yes" classname="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration3.test.SendJMSMessage" failonerror="true">
        <arg value="queue/quickstart_bpm_orchestration3_deploy_Request_gw"/>       
      	 <arg value="Hello Deploy"/>
 		   <classpath refid="exec-classpath"/>
@@ -46,7 +46,7 @@
   
   <target name="startProcess" depends="compile" description="Sends a message to start a new process instance">
     <echo>Sends a message to start a new process instance</echo>
-     <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.bpm_orchestration3.test.SendJMSMessage" failonerror="true">
+     <java fork="yes" classname="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration3.test.SendJMSMessage" failonerror="true">
        <arg value="queue/quickstart_bpm_orchestration3_start_Request_gw"/>       
      	 <arg value="Hello start"/>
      	 <arg value="${token}"/>
@@ -60,7 +60,7 @@
   
   <target name="signalProcess" depends="compile" description="Sends a message to signal a process instance">
     <echo>Sends a message to signal a process instance</echo>
-     <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.bpm_orchestration3.test.SendJMSMessage" failonerror="true">
+     <java fork="yes" classname="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration3.test.SendJMSMessage" failonerror="true">
        <arg value="queue/quickstart_bpm_orchestration3_signal_Request_gw"/>      
      	 <arg value="Hello Signal"/>
      	 <arg value="${token}"/>

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration3/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration3/test/SendJMSMessage.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration3/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration3/test/SendJMSMessage.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration3/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration3/test/SendJMSMessage.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -18,7 +18,7 @@
  * (C) 2005-2006,
  * @author JBoss Inc.
  */
-package org.jboss.soa.esb.samples.quickstart.bpm_orchestration3.test;
+package org.jboss.soa.esb.samples.quickstarts.bpm_orchestration3.test;
 
 import javax.jms.JMSException;
 import javax.jms.ObjectMessage;
@@ -49,9 +49,21 @@
     
     public void stop() throws JMSException 
     { 
-        conn.stop();
-        session.close();
-        conn.close();
+        try {
+            if(conn != null) {
+                conn.stop();
+            }
+        } finally {
+            try {
+                if(session != null) {
+                    session.close();
+                }
+            } finally {
+                if(conn != null) {
+                    conn.close();
+                }
+            }
+        }
     }
     
     public void sendAMessage(String msg, String tokenID) throws JMSException {
@@ -66,20 +78,22 @@
        
     
     public static void main(String args[]) throws Exception
-    {        	    	
-    	SendJMSMessage sm = new SendJMSMessage();
-    	try {
-    		sm.setupConnection(args[0]);
-    		if (args.length < 3)
-    			sm.sendAMessage(args[1],null); 
-    		else
-    			sm.sendAMessage(args[1],args[2]); 
-    	} catch (Exception e) {
-    		System.out.println(e);
-      } finally {
-    	  sm.stop();
-    	}  
-    	
+    {
+        SendJMSMessage sm = new SendJMSMessage();
+        try {
+            sm.setupConnection(args[0]);
+            if (args.length < 3)
+                sm.sendAMessage(args[1], null);
+            else
+                sm.sendAMessage(args[1], args[2]);
+        } catch (Exception e) {
+            System.out.println("\n**** Failed to send message to JMS Destination '" + args[0] + "'.  " +
+                               "\n**** Your JMS Provider (e.g. your JBoss ESB/App Server) may not be running, or the JMS Destination may not be deployed." +
+                               "\n**** Exception: " + e.getMessage());
+        } finally {
+            sm.stop();
+        }
+
     }
     
 }
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4 (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/CBRRules.drl
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/CBRRules.drl	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/CBRRules.drl	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,40 +0,0 @@
-#created on: Oct 30, 2006
-package com.jboss.soa.esb.routing.cbr
-
-#list any import classes here.
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageType;
-import org.jboss.soa.esb.store.OrderHeader;
-
-#declare any global variables here
-global java.util.List destinations;
-
-
-rule "Highest Priority Orders"
-	
-	when
-		OrderHeader( orderPriority == 3 )
-	then
-		System.out.println("HIGHEST PRIORITY");
-		destinations.add("SuperSpecialCustomerService");
-		
-end
-
-rule "Medium Priority Orders"
-	
-	when
-		OrderHeader( orderPriority == 2 )
-	then 
-		System.out.println("Medium Priority");
-		destinations.add("SpecialCustomerService");
-end
-
-rule "Low Priority Orders"
-	
-	when
-		OrderHeader( orderPriority == 1 )
-	then 
-		System.out.println("Low Priority");
-		destinations.add("RegularCustomerService");
-end
-

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/CBRRules.drl (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/CBRRules.drl)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/CBRRules.drl	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/CBRRules.drl	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,40 @@
+#created on: Oct 30, 2006
+package com.jboss.soa.esb.routing.cbr
+
+#list any import classes here.
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.store.OrderHeader;
+
+#declare any global variables here
+global java.util.List destinations;
+
+
+rule "Highest Priority Orders"
+	
+	when
+		OrderHeader( orderPriority == 3 )
+	then
+		System.out.println("HIGHEST PRIORITY");
+		destinations.add("SuperSpecialCustomerService");
+		
+end
+
+rule "Medium Priority Orders"
+	
+	when
+		OrderHeader( orderPriority == 2 )
+	then 
+		System.out.println("Medium Priority");
+		destinations.add("SpecialCustomerService");
+end
+
+rule "Low Priority Orders"
+	
+	when
+		OrderHeader( orderPriority == 1 )
+	then 
+		System.out.println("Low Priority");
+		destinations.add("RegularCustomerService");
+end
+

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/Discount_Rules.drl
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/Discount_Rules.drl	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/Discount_Rules.drl	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,46 +0,0 @@
-#created on: Oct 30, 2006
-package com.jboss.soa.esb.routing.cbr
-
-#list any import classes here.
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageType;
-import org.jboss.soa.esb.store.OrderHeader;
-import org.jboss.soa.esb.store.Customer;
-
-global java.util.List destinations;
-
-
-
-rule "Logging"
-salience 10
-when 
-   order: OrderHeader()
-   customer: Customer()
-then
-   System.out.println("Customer Status: " + customer.getStatus());
-   System.out.println("Order Total: " + order.getTotalAmount());
-end
-
-rule "Customer Platinum Status"
-salience 20
- when
-   customer: Customer(status > 50)
-   order: OrderHeader(orderPriority == 3)
- then
-   System.out.println("Platinum Customer - High Priority - Higher discount");
-   order.setOrderDiscount(8.5);
-end 
-
-rule "Customer Gold Status"
-salience 20
- when
-   customer: Customer(status > 10, status <= 50)
-   order: OrderHeader(orderPriority == 2)
- then
-   System.out.println("Gold Customer - Medium Priority - discount ");
-   order.setOrderDiscount(3.4);
-end 
-
-
-
-   
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/Discount_Rules.drl (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/Discount_Rules.drl)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/Discount_Rules.drl	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/Discount_Rules.drl	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,46 @@
+#created on: Oct 30, 2006
+package com.jboss.soa.esb.routing.cbr
+
+#list any import classes here.
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.store.OrderHeader;
+import org.jboss.soa.esb.store.Customer;
+
+global java.util.List destinations;
+
+
+
+rule "Logging"
+salience 10
+when 
+   order: OrderHeader()
+   customer: Customer()
+then
+   System.out.println("Customer Status: " + customer.getStatus());
+   System.out.println("Order Total: " + order.getTotalAmount());
+end
+
+rule "Customer Platinum Status"
+salience 20
+ when
+   customer: Customer(status > 50)
+   order: OrderHeader(orderPriority == 3)
+ then
+   System.out.println("Platinum Customer - High Priority - Higher discount");
+   order.setOrderDiscount(8.5);
+end 
+
+rule "Customer Gold Status"
+salience 20
+ when
+   customer: Customer(status > 10, status <= 50)
+   order: OrderHeader(orderPriority == 2)
+ then
+   System.out.println("Gold Customer - Medium Priority - discount ");
+   order.setOrderDiscount(3.4);
+end 
+
+
+
+   
\ No newline at end of file

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/MyRoutingRules.drl
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/MyRoutingRules.drl	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/MyRoutingRules.drl	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,40 +0,0 @@
-#created on: Oct 30, 2006
-package com.jboss.soa.esb.routing.cbr
-
-#list any import classes here.
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageType;
-import org.jboss.soa.esb.dvdstore.OrderHeader;
-
-#declare any global variables here
-global java.util.List destinations;
-
-
-rule "Highest Priority Orders"
-	
-	when
-		OrderHeader( orderPriority == 3 )
-	then
-		System.out.println("HIGHEST PRIORITY");
-		destinations.add("SuperSpecialCustomerService");
-		
-end
-
-rule "Medium Priority Orders"
-	
-	when
-		OrderHeader( orderPriority == 2 )
-	then 
-		System.out.println("Medium Priority");
-		destinations.add("SpecialCustomerService");
-end
-
-rule "Low Priority Orders"
-	
-	when
-		OrderHeader( orderPriority == 1 )
-	then 
-		System.out.println("Low Priority");
-		destinations.add("RegularCustomerService");
-end
-

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/MyRoutingRules.drl (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/MyRoutingRules.drl)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/MyRoutingRules.drl	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/MyRoutingRules.drl	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,40 @@
+#created on: Oct 30, 2006
+package com.jboss.soa.esb.routing.cbr
+
+#list any import classes here.
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.dvdstore.OrderHeader;
+
+#declare any global variables here
+global java.util.List destinations;
+
+
+rule "Highest Priority Orders"
+	
+	when
+		OrderHeader( orderPriority == 3 )
+	then
+		System.out.println("HIGHEST PRIORITY");
+		destinations.add("SuperSpecialCustomerService");
+		
+end
+
+rule "Medium Priority Orders"
+	
+	when
+		OrderHeader( orderPriority == 2 )
+	then 
+		System.out.println("Medium Priority");
+		destinations.add("SpecialCustomerService");
+end
+
+rule "Low Priority Orders"
+	
+	when
+		OrderHeader( orderPriority == 1 )
+	then 
+		System.out.println("Low Priority");
+		destinations.add("RegularCustomerService");
+end
+

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/Priority_Rules.drl
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/Priority_Rules.drl	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/Priority_Rules.drl	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,43 +0,0 @@
-#created on: Oct 30, 2006
-package com.jboss.soa.esb.routing.cbr
-
-#list any import classes here.
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageType;
-import org.jboss.soa.esb.store.OrderHeader;
-import org.jboss.soa.esb.store.Customer;
-
-global java.util.List destinations;
-
-
-
-rule "Logging"
-when 
-   order: OrderHeader()
-   customer: Customer()
-then
-   System.out.println("Customer Status: " + customer.getStatus());
-   System.out.println("Order Total: " + order.getTotalAmount());
-end
-
-rule "Customer Platinum Status"
- when
-   customer: Customer(status > 50)
-   order: OrderHeader(totalAmount > 50)
- then
-   System.out.println("Platinum Customer - High Priority");
-   order.setOrderPriority(3);
-end 
-
-rule "Customer Gold Status"
- when
-   customer: Customer(status > 10, status <= 50)
-   order: OrderHeader(totalAmount > 25)
- then
-   System.out.println("Gold Customer - Medium Priority ");
-   order.setOrderPriority(2);
-end 
-
-
-
-   
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/Priority_Rules.drl (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/Priority_Rules.drl)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/Priority_Rules.drl	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/Priority_Rules.drl	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,43 @@
+#created on: Oct 30, 2006
+package com.jboss.soa.esb.routing.cbr
+
+#list any import classes here.
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.store.OrderHeader;
+import org.jboss.soa.esb.store.Customer;
+
+global java.util.List destinations;
+
+
+
+rule "Logging"
+when 
+   order: OrderHeader()
+   customer: Customer()
+then
+   System.out.println("Customer Status: " + customer.getStatus());
+   System.out.println("Order Total: " + order.getTotalAmount());
+end
+
+rule "Customer Platinum Status"
+ when
+   customer: Customer(status > 50)
+   order: OrderHeader(totalAmount > 50)
+ then
+   System.out.println("Platinum Customer - High Priority");
+   order.setOrderPriority(3);
+end 
+
+rule "Customer Gold Status"
+ when
+   customer: Customer(status > 10, status <= 50)
+   order: OrderHeader(totalAmount > 25)
+ then
+   System.out.println("Gold Customer - Medium Priority ");
+   order.setOrderPriority(2);
+end 
+
+
+
+   
\ No newline at end of file

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/SampleOrder.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/SampleOrder.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/SampleOrder.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,12 +0,0 @@
-<Order orderId="2" orderDate="Wed Nov 15 13:45:28 EST 2006" statusCode="0" 
-netAmount="59.97" totalAmount="64.92" tax="4.95">
-	<Customer userName="user1" firstName="Rex" lastName="Myers" state="SD"/>
-	<OrderLines>
-		<OrderLine position="1" quantity="1">
-			<Product productId="364" title="Superman Returns" price="29.98"/>
-		</OrderLine>
-		<OrderLine position="2" quantity="1">
-			<Product productId="299" title="Pulp Fiction" price="29.99"/>
-		</OrderLine>
-	</OrderLines>
-</Order>

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/SampleOrder.xml (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/SampleOrder.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/SampleOrder.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/SampleOrder.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,12 @@
+<Order orderId="2" orderDate="Wed Nov 15 13:45:28 EST 2006" statusCode="0" 
+netAmount="59.97" totalAmount="64.92" tax="4.95">
+	<Customer userName="user1" firstName="Rex" lastName="Myers" state="SD"/>
+	<OrderLines>
+		<OrderLine position="1" quantity="1">
+			<Product productId="364" title="Superman Returns" price="29.98"/>
+		</OrderLine>
+		<OrderLine position="2" quantity="1">
+			<Product productId="299" title="Pulp Fiction" price="29.99"/>
+		</OrderLine>
+	</OrderLines>
+</Order>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/SamplePetsOrder.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/SamplePetsOrder.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/SamplePetsOrder.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<Order orderId="1182" orderDate="Sat Oct 06 13:41:16 EDT 2007" status="P" totalPrice="188.29" username="j2ee" shipToFirstName="Sally" shipToLastName="Smith" shipState="CA">
-  <LineItems>
-    <LineItem lineNumber="1" quantity="2">
-      <Item itemId="EST-1" listPrice="16.5" />
-    </LineItem>
-    <LineItem lineNumber="2" quantity="1">
-      <Item itemId="EST-27" listPrice="155.29" />
-    </LineItem>
-  </LineItems>
-</Order>
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/SamplePetsOrder.xml (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/SamplePetsOrder.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/SamplePetsOrder.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/SamplePetsOrder.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Order orderId="1182" orderDate="Sat Oct 06 13:41:16 EDT 2007" status="P" totalPrice="188.29" username="j2ee" shipToFirstName="Sally" shipToLastName="Smith" shipState="CA">
+  <LineItems>
+    <LineItem lineNumber="1" quantity="2">
+      <Item itemId="EST-1" listPrice="16.5" />
+    </LineItem>
+    <LineItem lineNumber="2" quantity="1">
+      <Item itemId="EST-27" listPrice="155.29" />
+    </LineItem>
+  </LineItems>
+</Order>
\ No newline at end of file

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/altered_jboss-esb.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/altered_jboss-esb.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/altered_jboss-esb.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,209 +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="startGwChannel">
-                  <jms-message-filter dest-type="QUEUE"
-                      dest-name="queue/quickstart_bpm_orchestration4_start_gw" />
-              </jms-bus>
-              <jms-bus busid="startEsbChannel">
-                  <jms-message-filter dest-type="QUEUE"
-                      dest-name="queue/quickstart_bpm_orchestration4_start_esb" />
-              </jms-bus>
-              <jms-bus busid="intakeServiceEsbChannel">
-                  <jms-message-filter dest-type="QUEUE"
-                      dest-name="queue/quickstart_bpm_orchestration4_intake_service_esb" />
-              </jms-bus>
-              <jms-bus busid="discountServiceEsbChannel">
-                  <jms-message-filter dest-type="QUEUE"
-                      dest-name="queue/quickstart_bpm_orchestration4_discount_service_esb" />
-              </jms-bus>
-              <jms-bus busid="shippingServiceEsbChannel">
-                  <jms-message-filter dest-type="QUEUE"
-                      dest-name="queue/quickstart_bpm_orchestration4_shipping_service_esb" />
-              </jms-bus>             
-              <jms-bus busid="conciergeServiceEsbChannel">
-                  <jms-message-filter dest-type="QUEUE"
-                      dest-name="queue/quickstart_bpm_orchestration4_ConciergeManager" />
-              </jms-bus>  
-              <jms-bus busid="distributionServiceEsbChannel">
-                  <jms-message-filter dest-type="QUEUE"
-                      dest-name="queue/quickstart_bpm_orchestration4_DistributionManager" />
-              </jms-bus>
-              <jms-bus busid="basicShippingServiceEsbChannel">
-                  <jms-message-filter dest-type="QUEUE"
-                      dest-name="queue/quickstart_bpm_orchestration4_BasicShipping" />
-              </jms-bus>                                                 
-
-          </jms-provider>
-      </providers>
-
-      <services>
-				<!-- removed the deploy service, this process definition needs to be deployed by a .par and/or from
-				     the graphical process designer -->        
-        <service category="BPM_orchestration4_Starter_Service" name="Starter_Service"
-                 description="BPM Orchestration Sample 4: 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="transformXML2POJO"
-									class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
-									<property name="resource-config"
-										value="/smooks-res.xml" />
-								 </action>                
-								 <!--
-                 <action name="dump2" class="org.jboss.soa.esb.actions.SystemPrintln">
-                   		<property name="message" value="After" />
-                   		<property name="printfull" value="true"/>
-                 </action>                  
-                 -->
-                 <action name="SetupMessage"
-										class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration4.esb_actions.SetupMessage">
-										<property name="status" value="60" /><!--  status was not in order XML -->
-								 </action>
-								 
-                 <action  name="start_a_new_order_process" 
-                   class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
-                    <property name="command" value="StartProcessInstanceCommand" />
-                    <property name="process-definition-name" value="bpm4_ESBOrderProcess"/>   
-                    <property name="key" value="businessKey"/>
-                    <property name="object-paths">                                                                                             
-                        <object-path esb="body.entireOrder"     	bpm="entireOrder" />                        
-                        <object-path esb="body.order.orderId"      bpm="order_orderid" />
-                        
-                        
-                        <object-path esb="body.customer.firstName"  bpm="customer_firstName" />
-                        <object-path esb="body.customer.lastName"   bpm="customer_lastName" />
-                        <object-path esb="body.customer.status"   bpm="customer_status" />
-                    </property>
-
-                 </action>
-                 <!--
-                 <action name="dump3" class="org.jboss.soa.esb.actions.SystemPrintln">
-                   		<property name="message" value="After" />
-                   		<property name="printfull" value="true"/>
-                 </action>
-                 -->           
-            </actions>
-        </service>
-        <!--  no external signal is necessary
-        <service category="BPM_orchestration4_Signal_Service" name="Signal_Service"
-                 description="BPM Orchestration Sample 3: Use this service to signal a process instance">
-            <listeners>
-                <jms-listener name="JMS-Gateway" busidref="signalGwChannel"
-                    maxThreads="1"
-                    is-gateway="true" />
-                <jms-listener name="ESB-Listener" busidref="signalEsbChannel"
-                maxThreads="1"/>
-            </listeners>
-            <actions>
-                 
-                 <action name="dump1" class="org.jboss.soa.esb.actions.SystemPrintln">
-                      <property name="message" value="SIGNAL" />
-                   		<property name="printfull" value="true"/>
-                 </action>                    
-                 
-                 <action name="SetupSignal" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration4.esb_actions.SetupSignal"/>
-                 
-                 <action  name="signal_a_process_instance" 
-                   class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
-                    <property name="command" value="SignalCommand" />
-                    <property name="object-paths">                        
-                        <object-path esb="BODY_CONTENT" bpm="theBody" /> 
-                        <object-path esb="body" bpm="theData" /> 
-                    </property>
-                 </action>
-                 
-                 
-                 <action name="dump2" class="org.jboss.soa.esb.actions.SystemPrintln">
-                   		<property name="message" value="After" />
-                   		<property name="printfull" value="true"/>
-                 </action>
-                            
-            </actions>
-        </service>
-			  -->
-
-        <service category="BPM_Orchestration4" name="IntakeService"
-                 description="IntakeService">
-            <listeners>
-                <jms-listener name="ESB-Listener" busidref="intakeServiceEsbChannel"
-                maxThreads="1"/>
-            </listeners>
-            <actions>
-								 <!--
-                 <action name="dump" class="org.jboss.soa.esb.actions.SystemPrintln">
-                   	<property name="printfull" value="true"/>
-                 </action>
-                 -->
-								
-                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-                  <property name="script" value="/scripts/intake_service.groovy" />
-                </action>
-                
-                <!--
-                <action name="alert" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration4.esb_actions.SimpleJMSNotifier">
-									<property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration4_service1_Alert" />     
-                </action>
-                -->                
-            </actions>
-        </service>
-        <service category="BPM_Orchestration4" name="DiscountService"
-                 description="DiscountService">
-            <listeners>
-                <jms-listener name="ESB-Listener" busidref="discountServiceEsbChannel"
-                maxThreads="1"/>
-            </listeners>
-            <actions>
-                <!--
-                <action name="dump" class="org.jboss.soa.esb.actions.SystemPrintln">
-                   	<property name="printfull" value="true"/>
-                </action>
-             		-->
-                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-                  <property name="script" value="/scripts/discount_service.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_Orchestration4" name="ShippingService"
-                 description="ShippingService">
-            <listeners>
-                <jms-listener name="ESB-Listener" busidref="shippingServiceEsbChannel"
-                maxThreads="1"/>
-            </listeners>
-            <actions>
-                <!--
-                <action name="dump" class="org.jboss.soa.esb.actions.SystemPrintln">
-                   	<property name="printfull" value="true"/>
-                </action>
-								-->            
-                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-                  <property name="script" value="/scripts/shipping_service.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>
-        
-      </services>
-
-</jbossesb>

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/altered_jboss-esb.xml (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/altered_jboss-esb.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/altered_jboss-esb.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/altered_jboss-esb.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,209 @@
+<?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="startGwChannel">
+                  <jms-message-filter dest-type="QUEUE"
+                      dest-name="queue/quickstart_bpm_orchestration4_start_gw" />
+              </jms-bus>
+              <jms-bus busid="startEsbChannel">
+                  <jms-message-filter dest-type="QUEUE"
+                      dest-name="queue/quickstart_bpm_orchestration4_start_esb" />
+              </jms-bus>
+              <jms-bus busid="intakeServiceEsbChannel">
+                  <jms-message-filter dest-type="QUEUE"
+                      dest-name="queue/quickstart_bpm_orchestration4_intake_service_esb" />
+              </jms-bus>
+              <jms-bus busid="discountServiceEsbChannel">
+                  <jms-message-filter dest-type="QUEUE"
+                      dest-name="queue/quickstart_bpm_orchestration4_discount_service_esb" />
+              </jms-bus>
+              <jms-bus busid="shippingServiceEsbChannel">
+                  <jms-message-filter dest-type="QUEUE"
+                      dest-name="queue/quickstart_bpm_orchestration4_shipping_service_esb" />
+              </jms-bus>             
+              <jms-bus busid="conciergeServiceEsbChannel">
+                  <jms-message-filter dest-type="QUEUE"
+                      dest-name="queue/quickstart_bpm_orchestration4_ConciergeManager" />
+              </jms-bus>  
+              <jms-bus busid="distributionServiceEsbChannel">
+                  <jms-message-filter dest-type="QUEUE"
+                      dest-name="queue/quickstart_bpm_orchestration4_DistributionManager" />
+              </jms-bus>
+              <jms-bus busid="basicShippingServiceEsbChannel">
+                  <jms-message-filter dest-type="QUEUE"
+                      dest-name="queue/quickstart_bpm_orchestration4_BasicShipping" />
+              </jms-bus>                                                 
+
+          </jms-provider>
+      </providers>
+
+      <services>
+				<!-- removed the deploy service, this process definition needs to be deployed by a .par and/or from
+				     the graphical process designer -->        
+        <service category="BPM_orchestration4_Starter_Service" name="Starter_Service"
+                 description="BPM Orchestration Sample 4: 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="transformXML2POJO"
+									class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
+									<property name="resource-config"
+										value="/smooks-res.xml" />
+								 </action>                
+								 <!--
+                 <action name="dump2" class="org.jboss.soa.esb.actions.SystemPrintln">
+                   		<property name="message" value="After" />
+                   		<property name="printfull" value="true"/>
+                 </action>                  
+                 -->
+                 <action name="SetupMessage"
+										class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration4.esb_actions.SetupMessage">
+										<property name="status" value="60" /><!--  status was not in order XML -->
+								 </action>
+								 
+                 <action  name="start_a_new_order_process" 
+                   class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
+                    <property name="command" value="StartProcessInstanceCommand" />
+                    <property name="process-definition-name" value="bpm4_ESBOrderProcess"/>   
+                    <property name="key" value="businessKey"/>
+                    <property name="object-paths">                                                                                             
+                        <object-path esb="body.entireOrder"     	bpm="entireOrder" />                        
+                        <object-path esb="body.order.orderId"      bpm="order_orderid" />
+                        
+                        
+                        <object-path esb="body.customer.firstName"  bpm="customer_firstName" />
+                        <object-path esb="body.customer.lastName"   bpm="customer_lastName" />
+                        <object-path esb="body.customer.status"   bpm="customer_status" />
+                    </property>
+
+                 </action>
+                 <!--
+                 <action name="dump3" class="org.jboss.soa.esb.actions.SystemPrintln">
+                   		<property name="message" value="After" />
+                   		<property name="printfull" value="true"/>
+                 </action>
+                 -->           
+            </actions>
+        </service>
+        <!--  no external signal is necessary
+        <service category="BPM_orchestration4_Signal_Service" name="Signal_Service"
+                 description="BPM Orchestration Sample 3: Use this service to signal a process instance">
+            <listeners>
+                <jms-listener name="JMS-Gateway" busidref="signalGwChannel"
+                    maxThreads="1"
+                    is-gateway="true" />
+                <jms-listener name="ESB-Listener" busidref="signalEsbChannel"
+                maxThreads="1"/>
+            </listeners>
+            <actions>
+                 
+                 <action name="dump1" class="org.jboss.soa.esb.actions.SystemPrintln">
+                      <property name="message" value="SIGNAL" />
+                   		<property name="printfull" value="true"/>
+                 </action>                    
+                 
+                 <action name="SetupSignal" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration4.esb_actions.SetupSignal"/>
+                 
+                 <action  name="signal_a_process_instance" 
+                   class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
+                    <property name="command" value="SignalCommand" />
+                    <property name="object-paths">                        
+                        <object-path esb="BODY_CONTENT" bpm="theBody" /> 
+                        <object-path esb="body" bpm="theData" /> 
+                    </property>
+                 </action>
+                 
+                 
+                 <action name="dump2" class="org.jboss.soa.esb.actions.SystemPrintln">
+                   		<property name="message" value="After" />
+                   		<property name="printfull" value="true"/>
+                 </action>
+                            
+            </actions>
+        </service>
+			  -->
+
+        <service category="BPM_Orchestration4" name="IntakeService"
+                 description="IntakeService">
+            <listeners>
+                <jms-listener name="ESB-Listener" busidref="intakeServiceEsbChannel"
+                maxThreads="1"/>
+            </listeners>
+            <actions>
+								 <!--
+                 <action name="dump" class="org.jboss.soa.esb.actions.SystemPrintln">
+                   	<property name="printfull" value="true"/>
+                 </action>
+                 -->
+								
+                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+                  <property name="script" value="/scripts/intake_service.groovy" />
+                </action>
+                
+                <!--
+                <action name="alert" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration4.esb_actions.SimpleJMSNotifier">
+									<property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration4_service1_Alert" />     
+                </action>
+                -->                
+            </actions>
+        </service>
+        <service category="BPM_Orchestration4" name="DiscountService"
+                 description="DiscountService">
+            <listeners>
+                <jms-listener name="ESB-Listener" busidref="discountServiceEsbChannel"
+                maxThreads="1"/>
+            </listeners>
+            <actions>
+                <!--
+                <action name="dump" class="org.jboss.soa.esb.actions.SystemPrintln">
+                   	<property name="printfull" value="true"/>
+                </action>
+             		-->
+                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+                  <property name="script" value="/scripts/discount_service.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_Orchestration4" name="ShippingService"
+                 description="ShippingService">
+            <listeners>
+                <jms-listener name="ESB-Listener" busidref="shippingServiceEsbChannel"
+                maxThreads="1"/>
+            </listeners>
+            <actions>
+                <!--
+                <action name="dump" class="org.jboss.soa.esb.actions.SystemPrintln">
+                   	<property name="printfull" value="true"/>
+                </action>
+								-->            
+                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+                  <property name="script" value="/scripts/shipping_service.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>
+        
+      </services>
+
+</jbossesb>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/build.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/build.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/build.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,65 +0,0 @@
-<project name="Quickstart_bpm_orchestration4" default="run" basedir=".">
-
-	<description>
-		${ant.project.name}
-		${line.separator}
-	</description>
-
-  <property name="deploy.exploded" value="true"/>
-  
-	<property name="additional.deploys" value="Priority_Rules.drl,Discount_Rules.drl,CBRRules.drl,smooks-config.xml,scripts/**,transforms/**"/>
-	
-  <!-- Import the base Ant build script... -->
-  <import file="../conf/base-build.xml"/>
-  
-  <property name="project.process.dir" value="processDefinition"/>
-	
-  <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="run">
-	<echo>Follow the instructions in the readme.</echo>
-  </target>
-	
-  <target name="runtest">
-	<echo>Follow the instructions in the readme.</echo>
-  </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_orchestration4.test.SendJMSMessageStart" failonerror="true">
-      <arg value="SampleOrder.xml"/>
-      <classpath refid="exec-classpath"/>
-    </java>  
-  </target>	 
-
-  <target name="startProcessPets" 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_orchestration4.test.SendJMSMessageStart" failonerror="true">
-      <arg value="SamplePetsOrder.xml"/>
-      <classpath refid="exec-classpath"/>
-    </java>  
-  </target>	 
-
-  <target name="startMonitor" depends="compile" description="Sends a message to start the process instance">
-  	<echo>Starting the Swing-based Service Monitor</echo>
-    <java fork="yes" classname="ServiceAlertMonitor" failonerror="true">
-      <arg value="Monitor"/>
-      <arg value="quickstart_bpm_orchestration4_monitor"/>
-      <arg value="images/gear1.gif"/>
-      <classpath refid="exec-classpath"/>
-    </java>  
-  </target>	 
-  	
-  <target name="display-instructions">
-    <echo message='${line.separator}******************' />
-    <echo>Quickstart deployed to target JBoss ESB/App Server at '${org.jboss.esb.server.deploy.dir}'.</echo>
-    <echo>1.  Carefully review the Readme.</echo>
-    <echo message='******************' />
-  </target>
-</project>

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/build.xml (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/build.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/build.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/build.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,65 @@
+<project name="Quickstart_bpm_orchestration4" default="run" basedir=".">
+
+	<description>
+		${ant.project.name}
+		${line.separator}
+	</description>
+
+  <property name="deploy.exploded" value="true"/>
+  
+	<property name="additional.deploys" value="Priority_Rules.drl,Discount_Rules.drl,CBRRules.drl,smooks-config.xml,scripts/**,transforms/**"/>
+	
+  <!-- Import the base Ant build script... -->
+  <import file="../conf/base-build.xml"/>
+  
+  <property name="project.process.dir" value="processDefinition"/>
+	
+  <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="run">
+	<echo>Follow the instructions in the readme.</echo>
+  </target>
+	
+  <target name="runtest">
+	<echo>Follow the instructions in the readme.</echo>
+  </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_orchestration4.test.SendJMSMessageStart" failonerror="true">
+      <arg value="SampleOrder.xml"/>
+      <classpath refid="exec-classpath"/>
+    </java>  
+  </target>	 
+
+  <target name="startProcessPets" 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_orchestration4.test.SendJMSMessageStart" failonerror="true">
+      <arg value="SamplePetsOrder.xml"/>
+      <classpath refid="exec-classpath"/>
+    </java>  
+  </target>	 
+
+  <target name="startMonitor" depends="compile" description="Sends a message to start the process instance">
+  	<echo>Starting the Swing-based Service Monitor</echo>
+    <java fork="yes" classname="ServiceAlertMonitor" failonerror="true">
+      <arg value="Monitor"/>
+      <arg value="quickstart_bpm_orchestration4_monitor"/>
+      <arg value="images/gear1.gif"/>
+      <classpath refid="exec-classpath"/>
+    </java>  
+  </target>	 
+  	
+  <target name="display-instructions">
+    <echo message='${line.separator}******************' />
+    <echo>Quickstart deployed to target JBoss ESB/App Server at '${org.jboss.esb.server.deploy.dir}'.</echo>
+    <echo>1.  Carefully review the Readme.</echo>
+    <echo message='******************' />
+  </target>
+</project>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/deployment.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/deployment.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/deployment.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,6 +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>
-  <depends>jboss.esb:deployment=smooks.esb</depends>
-</jbossesb-deployment>
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/deployment.xml (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/deployment.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbossesb-deployment>
+  <depends>jboss.esb:deployment=jbrules.esb</depends>
+  <depends>jboss.esb:deployment=jbpm.esb</depends>
+  <depends>jboss.esb:deployment=smooks.esb</depends>
+</jbossesb-deployment>
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/docs (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/docs)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/docs/Readme.odt
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/docs/Readme.odt (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/docs/Readme.odt)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/docs/Readme.pdf
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/docs/Readme.pdf (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/docs/Readme.pdf)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/images (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/images)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/jbm-queue-service.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jbm-queue-service.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,73 +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_orchestration4_start_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_orchestration4_start_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_orchestration4_intake_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_orchestration4_intake_service_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_orchestration4_discount_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_orchestration4_discount_service_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_orchestration4_shipping_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_orchestration4_shipping_service_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_orchestration4_monitor"
-    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_orchestration4_ConciergeManager"
-    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_orchestration4_DistributionManager"
-    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_orchestration4_BasicShipping"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-  </mbean>
-   
-</server>

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jbm-queue-service.xml (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/jbm-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jbm-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jbm-queue-service.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,73 @@
+<?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_orchestration4_start_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_orchestration4_start_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_orchestration4_intake_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_orchestration4_intake_service_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_orchestration4_discount_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_orchestration4_discount_service_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_orchestration4_shipping_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_orchestration4_shipping_service_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_orchestration4_monitor"
+    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_orchestration4_ConciergeManager"
+    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_orchestration4_DistributionManager"
+    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_orchestration4_BasicShipping"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+  </mbean>
+   
+</server>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/jbmq-queue-service.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jbmq-queue-service.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,80 +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_orchestration4_start_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_orchestration4_start_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_orchestration4_intake_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_orchestration4_intake_service_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_orchestration4_discount_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_orchestration4_discount_service_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_orchestration4_shipping_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_orchestration4_shipping_service_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_orchestration4_monitor">
-	  <depends optional-attribute-name="DestinationManager">
-		jboss.mq:service=DestinationManager
-	  </depends>
-	</mbean>
-  	
-   <mbean code="org.jboss.mq.server.jmx.Queue"
-        name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_bpm_orchestration4_ConciergeManager">
-     <depends optional-attribute-name="DestinationManager">
-       jboss.mq:service=DestinationManager
-     </depends>
-   </mbean>
-  
-   <mbean code="org.jboss.mq.server.jmx.Queue"
-        name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_bpm_orchestration4_DistributionManager">
-     <depends optional-attribute-name="DestinationManager">
-       jboss.mq:service=DestinationManager
-     </depends>
-   </mbean>
-   
-   <mbean code="org.jboss.mq.server.jmx.Queue"
-        name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_bpm_orchestration4_BasicShipping">
-     <depends optional-attribute-name="DestinationManager">
-       jboss.mq:service=DestinationManager
-     </depends>	
-   </mbean>
-</server>	
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jbmq-queue-service.xml (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jbmq-queue-service.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,80 @@
+<?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_orchestration4_start_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_orchestration4_start_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_orchestration4_intake_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_orchestration4_intake_service_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_orchestration4_discount_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_orchestration4_discount_service_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_orchestration4_shipping_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_orchestration4_shipping_service_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_orchestration4_monitor">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>
+  	
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+        name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_bpm_orchestration4_ConciergeManager">
+     <depends optional-attribute-name="DestinationManager">
+       jboss.mq:service=DestinationManager
+     </depends>
+   </mbean>
+  
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+        name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_bpm_orchestration4_DistributionManager">
+     <depends optional-attribute-name="DestinationManager">
+       jboss.mq:service=DestinationManager
+     </depends>
+   </mbean>
+   
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+        name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_bpm_orchestration4_BasicShipping">
+     <depends optional-attribute-name="DestinationManager">
+       jboss.mq:service=DestinationManager
+     </depends>	
+   </mbean>
+</server>	
\ No newline at end of file

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jboss-esb.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/jboss-esb.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jboss-esb.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,334 +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="startGwChannel">
-				<jms-message-filter dest-type="QUEUE"
-					dest-name="queue/quickstart_bpm_orchestration4_start_gw" />
-			</jms-bus>
-			<jms-bus busid="startEsbChannel">
-				<jms-message-filter dest-type="QUEUE"
-					dest-name="queue/quickstart_bpm_orchestration4_start_esb" />
-			</jms-bus>
-			<jms-bus busid="intakeServiceEsbChannel">
-				<jms-message-filter dest-type="QUEUE"
-					dest-name="queue/quickstart_bpm_orchestration4_intake_service_esb" />
-			</jms-bus>
-			<jms-bus busid="discountServiceEsbChannel">
-				<jms-message-filter dest-type="QUEUE"
-					dest-name="queue/quickstart_bpm_orchestration4_discount_service_esb" />
-			</jms-bus>
-			<jms-bus busid="shippingServiceEsbChannel">
-				<jms-message-filter dest-type="QUEUE"
-					dest-name="queue/quickstart_bpm_orchestration4_shipping_service_esb" />
-			</jms-bus>
-			<jms-bus busid="conciergeServiceEsbChannel">
-				<jms-message-filter dest-type="QUEUE"
-					dest-name="queue/quickstart_bpm_orchestration4_ConciergeManager" />
-			</jms-bus>
-			<jms-bus busid="distributionServiceEsbChannel">
-				<jms-message-filter dest-type="QUEUE"
-					dest-name="queue/quickstart_bpm_orchestration4_DistributionManager" />
-			</jms-bus>
-			<jms-bus busid="basicShippingServiceEsbChannel">
-				<jms-message-filter dest-type="QUEUE"
-					dest-name="queue/quickstart_bpm_orchestration4_BasicShipping" />
-			</jms-bus>
-
-		</jms-provider>
-	</providers>
-
-	<services>
-		<!-- removed the deploy service, the process definition needs to be deployed by a .par and/or from
-			the graphical process designer -->
-		<service category="BPM_orchestration4_Starter_Service"
-			name="Starter_Service"
-			description="BPM Orchestration Sample 4: 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="setup_key"
-					class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-					<property name="script"
-						value="/scripts/setup_key.groovy" />
-				</action>
-
-				                 
-				<!-- TODO: need an action that discovers and sets up key -->
-				<action name="start_a_new_order_process"
-					class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
-					<property name="command"
-						value="StartProcessInstanceCommand" />
-					<property name="process-definition-name"
-						value="bpm4_ESBOrderProcess" />
-					<property name="key" value="body.businessKey" />
-					<property name="object-paths">
-						<object-path esb="BODY_CONTENT"	bpm="entireOrderAsXML" />
-					</property>
-
-				</action>
-				
-					<action name="dump2" class="org.jboss.soa.esb.actions.SystemPrintln">
-					<property name="message" value="After" />
-					<property name="printfull" value="true"/>
-					</action>
-			
-			</actions>
-		</service>
-		<service category="BPM_Orchestration4" name="IntakeService"
-			description="IntakeService: transforms, massages, calculates priority">
-			<listeners>
-				<jms-listener name="ESB-Listener"
-					busidref="intakeServiceEsbChannel" maxThreads="1" />
-			</listeners>
-			<actions mep="OneWay">
-				
-				<action name="dump1" class="org.jboss.soa.esb.actions.SystemPrintln">
-					<property name="message" value="INTAKE START" />
-					<property name="printfull" value="true"/>
-				</action>
-				
-				<action name="groovy"
-					class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-					<property name="script"
-						value="/scripts/intake_service.groovy" />
-				</action>
-				
-				<action name="dump" class="org.jboss.soa.esb.actions.SystemPrintln">
-					<property name="printfull" value="true"/>
-				</action>
-				
-				<!--  transform -->
-				<action name="discover-message-origin" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-                     <property name="script" value="/scripts/check-origin.groovy" />
-                </action>
-
-                <action name="transform" class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
-                    <property name="resource-config" value="/smooks-config.xml" />
-                </action>
-
-				<action name="SetupMessage"
-					class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration4.esb_actions.SetupMessage">
-					<property name="status" value="60" />
-					<!--  status was not in order XML, this is just for demo purposes -->
-				</action>
-				
-				<action name="display" 
-					class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-					<property name="script"
-						value="/scripts/display.groovy" />
-				</action>
-				     
-				<!--  Use the BRP to calculate the order priority -->
-				
-				<action
-					class="org.jboss.soa.esb.actions.BusinessRulesProcessor"
-					name="BRP">
-					<property name="ruleSet"
-						value="Priority_Rules.drl" />
-					<property name="ruleReload" value="true" />
-					<property name="object-paths">
-						<object-path esb="body.orderHeader" />
-						<object-path esb="body.customer" />
-					</property>
-				</action>
-
-				<action name="setupPriority"
-					class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-					<property name="script"
-						value="/scripts/setup_priority.groovy" />
-				</action>
-
-        <action name="monitor" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration4.esb_actions.SimpleJMSNotifier">
-					  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration4_monitor" />     
-					  <property name="PREPENDED_TEXT" value="Priority" />     
-					  <property name="BODY_KEY" value="order_orderPriority" />
-        </action>
- 				
- 				<!-- signal the process to indicate that intake is complete -->
- 				<action  name="signal_a_process_instance" 
-                   class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
-                    <property name="command" value="SignalCommand" />
-                    <property name="object-paths">                        
-						<object-path esb="body.entireOrderAsXML"
-							bpm="entireOrderAsXML" />
-						<object-path esb="body.orderHeader"
-							bpm="entireOrderAsObject" />
-						<object-path esb="body.customer"
-							bpm="entireCustomerAsObject" />							
-						<object-path esb="body.order_orderId"
-							bpm="order_orderid" />
-						<object-path esb="body.order_totalAmount"
-							bpm="order_totalamount" />
-							
-						<!-- is it set on the message? -->
-						<object-path esb="body.order_orderPriority"
-							bpm="order_priority" />
-
-						<object-path esb="body.customer_firstName"
-							bpm="customer_firstName" />
-						<object-path esb="body.customer_lastName"
-							bpm="customer_lastName" />
-						<object-path esb="body.customer_status"
-							bpm="customer_status" />
-                    </property>
-                 </action>
-			</actions>
-		</service>
-		<service category="BPM_Orchestration4" name="DiscountService"
-			description="DiscountService">
-			<listeners>
-				<jms-listener name="ESB-Listener"
-					busidref="discountServiceEsbChannel" maxThreads="1" />
-			</listeners>
-			<actions>
-				<action name="groovy"
-					class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-					<property name="script"
-						value="/scripts/discount_service.groovy" />
-				</action>
-				<action name="display"
-					class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-					<property name="script"
-						value="/scripts/display.groovy" />
-				</action>
-								
-				<action
-					class="org.jboss.soa.esb.actions.BusinessRulesProcessor"
-					name="discount_calc">
-					<property name="ruleSet"
-						value="Discount_Rules.drl" />
-					<property name="ruleReload" value="true" />
-					<property name="object-paths">
-						<object-path esb="body.orderHeader" />
-						<object-path esb="body.customer" />
-					</property>
-				</action>
-				
-				<action name="setupDiscount"
-					class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-					<property name="script"
-						value="/scripts/setup_discount.groovy" />
-				</action>				
-
-        <action name="monitor" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration4.esb_actions.SimpleJMSNotifier">
-				  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration4_monitor" />     
-				  <property name="PREPENDED_TEXT" value="Discount Service" />
-				  <property name="BODY_KEY" value="order_orderDiscount" />
-        </action>
-        
- 				<!-- signal the process to indicate that discount is complete -->
- 				<action  name="signal_a_process_instance" 
-                   class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
-                    <property name="command" value="SignalCommand" />
-                    <property name="object-paths">                                          
-						<object-path esb="body.order_orderDiscount"
-							bpm="order_discount" />
-                    </property>
-                 </action>
-				
-        
-			</actions>
-		</service>
-		
-		<service category="BPM_Orchestration4" name="ShippingService"
-			description="ShippingService">
-			<listeners>
-				<jms-listener name="ESB-Listener"
-					busidref="shippingServiceEsbChannel" maxThreads="1" />
-			</listeners>
-			<actions>
-				<action name="groovy"
-					class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-					<property name="script"
-						value="/scripts/shipping_service.groovy" />
-				</action>
-				
-				<action
-					class="org.jboss.soa.esb.actions.ContentBasedRouter"
-					name="ContentBasedRouter">
-					<property name="ruleSet" value="CBRRules.drl" />
-					<property name="ruleReload" value="true" />
-					<property name="destinations">
-						<route-to
-							destination-name="SuperSpecialCustomerService"
-							service-category="ConciergeManager" service-name="ConciergeService" />
-						<route-to
-							destination-name="SpecialCustomerService"
-							service-category="DistributionManager" service-name="DistributionService" />
-						<route-to
-							destination-name="RegularCustomerService"
-							service-category="BasicShipping" service-name="ShipperService" />
-					</property>
-					<property name="object-paths">
-						<object-path esb="body.orderHeader" />
-						<object-path esb="body.customer" />
-					</property>
-				</action>
-				
-			</actions>
-		</service>
-
-		<service category="ConciergeManager"
-			name="ConciergeService" description="For highest priority customers">
-			<listeners>
-				<jms-listener name="conciergeServiceEsbChannel"
-					busidref="conciergeServiceEsbChannel" maxThreads="1">
-				</jms-listener>
-			</listeners>
-			<actions>                
-                <action name="monitor" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration4.esb_actions.SimpleJMSNotifier">
-								  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration4_monitor" />     
-								  <property name="PREPENDED_TEXT" value="Concierge:Highest Priority Customers/Orders" />     
-								  <property name="BODY_KEY" value="orderHeader" />
-                </action>
-			</actions>
-		</service>
-
-		<service category="DistributionManager"
-			name="DistributionService" description="For medium priority customers">
-			<listeners>
-				<jms-listener name="distributionServiceEsbChannel"
-					busidref="distributionServiceEsbChannel" maxThreads="1">
-				</jms-listener>
-			</listeners>
-			<actions>
-               <action name="monitor" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration4.esb_actions.SimpleJMSNotifier">
-								  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration4_monitor" />     
-								  <property name="PREPENDED_TEXT" value="Distribution Manager:Medium Priority Customers/Orders" />     
-								  <property name="BODY_KEY" value="orderHeader" />
-                </action>
-			</actions>
-		</service>
-		<service category="BasicShipping"
-			name="ShipperService" description="For low priority customers">
-			<listeners>
-				<jms-listener name="basicShippingServiceEsbChannel"
-					busidref="basicShippingServiceEsbChannel" maxThreads="1">
-				</jms-listener>
-			</listeners>
-			<actions>
-                <action name="monitor" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration4.esb_actions.SimpleJMSNotifier">
-								  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration4_monitor" />     
-								  <property name="PREPENDED_TEXT" value="Basic:Lowest Priority Customers/Orders" />     
-								  <property name="BODY_KEY" value="orderHeader" />
-                </action>
-			</actions>
-		</service>				
-
-	</services>
-
-</jbossesb>

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jboss-esb.xml (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/jboss-esb.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jboss-esb.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jboss-esb.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,334 @@
+<?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="startGwChannel">
+				<jms-message-filter dest-type="QUEUE"
+					dest-name="queue/quickstart_bpm_orchestration4_start_gw" />
+			</jms-bus>
+			<jms-bus busid="startEsbChannel">
+				<jms-message-filter dest-type="QUEUE"
+					dest-name="queue/quickstart_bpm_orchestration4_start_esb" />
+			</jms-bus>
+			<jms-bus busid="intakeServiceEsbChannel">
+				<jms-message-filter dest-type="QUEUE"
+					dest-name="queue/quickstart_bpm_orchestration4_intake_service_esb" />
+			</jms-bus>
+			<jms-bus busid="discountServiceEsbChannel">
+				<jms-message-filter dest-type="QUEUE"
+					dest-name="queue/quickstart_bpm_orchestration4_discount_service_esb" />
+			</jms-bus>
+			<jms-bus busid="shippingServiceEsbChannel">
+				<jms-message-filter dest-type="QUEUE"
+					dest-name="queue/quickstart_bpm_orchestration4_shipping_service_esb" />
+			</jms-bus>
+			<jms-bus busid="conciergeServiceEsbChannel">
+				<jms-message-filter dest-type="QUEUE"
+					dest-name="queue/quickstart_bpm_orchestration4_ConciergeManager" />
+			</jms-bus>
+			<jms-bus busid="distributionServiceEsbChannel">
+				<jms-message-filter dest-type="QUEUE"
+					dest-name="queue/quickstart_bpm_orchestration4_DistributionManager" />
+			</jms-bus>
+			<jms-bus busid="basicShippingServiceEsbChannel">
+				<jms-message-filter dest-type="QUEUE"
+					dest-name="queue/quickstart_bpm_orchestration4_BasicShipping" />
+			</jms-bus>
+
+		</jms-provider>
+	</providers>
+
+	<services>
+		<!-- removed the deploy service, the process definition needs to be deployed by a .par and/or from
+			the graphical process designer -->
+		<service category="BPM_orchestration4_Starter_Service"
+			name="Starter_Service"
+			description="BPM Orchestration Sample 4: 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="setup_key"
+					class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+					<property name="script"
+						value="/scripts/setup_key.groovy" />
+				</action>
+
+				                 
+				<!-- TODO: need an action that discovers and sets up key -->
+				<action name="start_a_new_order_process"
+					class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
+					<property name="command"
+						value="StartProcessInstanceCommand" />
+					<property name="process-definition-name"
+						value="bpm4_ESBOrderProcess" />
+					<property name="key" value="body.businessKey" />
+					<property name="object-paths">
+						<object-path esb="BODY_CONTENT"	bpm="entireOrderAsXML" />
+					</property>
+
+				</action>
+				
+					<action name="dump2" class="org.jboss.soa.esb.actions.SystemPrintln">
+					<property name="message" value="After" />
+					<property name="printfull" value="true"/>
+					</action>
+			
+			</actions>
+		</service>
+		<service category="BPM_Orchestration4" name="IntakeService"
+			description="IntakeService: transforms, massages, calculates priority">
+			<listeners>
+				<jms-listener name="ESB-Listener"
+					busidref="intakeServiceEsbChannel" maxThreads="1" />
+			</listeners>
+			<actions mep="OneWay">
+				
+				<action name="dump1" class="org.jboss.soa.esb.actions.SystemPrintln">
+					<property name="message" value="INTAKE START" />
+					<property name="printfull" value="true"/>
+				</action>
+				
+				<action name="groovy"
+					class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+					<property name="script"
+						value="/scripts/intake_service.groovy" />
+				</action>
+				
+				<action name="dump" class="org.jboss.soa.esb.actions.SystemPrintln">
+					<property name="printfull" value="true"/>
+				</action>
+				
+				<!--  transform -->
+				<action name="discover-message-origin" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+                     <property name="script" value="/scripts/check-origin.groovy" />
+                </action>
+
+                <action name="transform" class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
+                    <property name="resource-config" value="/smooks-config.xml" />
+                </action>
+
+				<action name="SetupMessage"
+					class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration4.esb_actions.SetupMessage">
+					<property name="status" value="60" />
+					<!--  status was not in order XML, this is just for demo purposes -->
+				</action>
+				
+				<action name="display" 
+					class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+					<property name="script"
+						value="/scripts/display.groovy" />
+				</action>
+				     
+				<!--  Use the BRP to calculate the order priority -->
+				
+				<action
+					class="org.jboss.soa.esb.actions.BusinessRulesProcessor"
+					name="BRP">
+					<property name="ruleSet"
+						value="Priority_Rules.drl" />
+					<property name="ruleReload" value="true" />
+					<property name="object-paths">
+						<object-path esb="body.orderHeader" />
+						<object-path esb="body.customer" />
+					</property>
+				</action>
+
+				<action name="setupPriority"
+					class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+					<property name="script"
+						value="/scripts/setup_priority.groovy" />
+				</action>
+
+        <action name="monitor" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration4.esb_actions.SimpleJMSNotifier">
+					  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration4_monitor" />     
+					  <property name="PREPENDED_TEXT" value="Priority" />     
+					  <property name="BODY_KEY" value="order_orderPriority" />
+        </action>
+ 				
+ 				<!-- signal the process to indicate that intake is complete -->
+ 				<action  name="signal_a_process_instance" 
+                   class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
+                    <property name="command" value="SignalCommand" />
+                    <property name="object-paths">                        
+						<object-path esb="body.entireOrderAsXML"
+							bpm="entireOrderAsXML" />
+						<object-path esb="body.orderHeader"
+							bpm="entireOrderAsObject" />
+						<object-path esb="body.customer"
+							bpm="entireCustomerAsObject" />							
+						<object-path esb="body.order_orderId"
+							bpm="order_orderid" />
+						<object-path esb="body.order_totalAmount"
+							bpm="order_totalamount" />
+							
+						<!-- is it set on the message? -->
+						<object-path esb="body.order_orderPriority"
+							bpm="order_priority" />
+
+						<object-path esb="body.customer_firstName"
+							bpm="customer_firstName" />
+						<object-path esb="body.customer_lastName"
+							bpm="customer_lastName" />
+						<object-path esb="body.customer_status"
+							bpm="customer_status" />
+                    </property>
+                 </action>
+			</actions>
+		</service>
+		<service category="BPM_Orchestration4" name="DiscountService"
+			description="DiscountService">
+			<listeners>
+				<jms-listener name="ESB-Listener"
+					busidref="discountServiceEsbChannel" maxThreads="1" />
+			</listeners>
+			<actions>
+				<action name="groovy"
+					class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+					<property name="script"
+						value="/scripts/discount_service.groovy" />
+				</action>
+				<action name="display"
+					class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+					<property name="script"
+						value="/scripts/display.groovy" />
+				</action>
+								
+				<action
+					class="org.jboss.soa.esb.actions.BusinessRulesProcessor"
+					name="discount_calc">
+					<property name="ruleSet"
+						value="Discount_Rules.drl" />
+					<property name="ruleReload" value="true" />
+					<property name="object-paths">
+						<object-path esb="body.orderHeader" />
+						<object-path esb="body.customer" />
+					</property>
+				</action>
+				
+				<action name="setupDiscount"
+					class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+					<property name="script"
+						value="/scripts/setup_discount.groovy" />
+				</action>				
+
+        <action name="monitor" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration4.esb_actions.SimpleJMSNotifier">
+				  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration4_monitor" />     
+				  <property name="PREPENDED_TEXT" value="Discount Service" />
+				  <property name="BODY_KEY" value="order_orderDiscount" />
+        </action>
+        
+ 				<!-- signal the process to indicate that discount is complete -->
+ 				<action  name="signal_a_process_instance" 
+                   class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
+                    <property name="command" value="SignalCommand" />
+                    <property name="object-paths">                                          
+						<object-path esb="body.order_orderDiscount"
+							bpm="order_discount" />
+                    </property>
+                 </action>
+				
+        
+			</actions>
+		</service>
+		
+		<service category="BPM_Orchestration4" name="ShippingService"
+			description="ShippingService">
+			<listeners>
+				<jms-listener name="ESB-Listener"
+					busidref="shippingServiceEsbChannel" maxThreads="1" />
+			</listeners>
+			<actions>
+				<action name="groovy"
+					class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+					<property name="script"
+						value="/scripts/shipping_service.groovy" />
+				</action>
+				
+				<action
+					class="org.jboss.soa.esb.actions.ContentBasedRouter"
+					name="ContentBasedRouter">
+					<property name="ruleSet" value="CBRRules.drl" />
+					<property name="ruleReload" value="true" />
+					<property name="destinations">
+						<route-to
+							destination-name="SuperSpecialCustomerService"
+							service-category="ConciergeManager" service-name="ConciergeService" />
+						<route-to
+							destination-name="SpecialCustomerService"
+							service-category="DistributionManager" service-name="DistributionService" />
+						<route-to
+							destination-name="RegularCustomerService"
+							service-category="BasicShipping" service-name="ShipperService" />
+					</property>
+					<property name="object-paths">
+						<object-path esb="body.orderHeader" />
+						<object-path esb="body.customer" />
+					</property>
+				</action>
+				
+			</actions>
+		</service>
+
+		<service category="ConciergeManager"
+			name="ConciergeService" description="For highest priority customers">
+			<listeners>
+				<jms-listener name="conciergeServiceEsbChannel"
+					busidref="conciergeServiceEsbChannel" maxThreads="1">
+				</jms-listener>
+			</listeners>
+			<actions>                
+                <action name="monitor" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration4.esb_actions.SimpleJMSNotifier">
+								  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration4_monitor" />     
+								  <property name="PREPENDED_TEXT" value="Concierge:Highest Priority Customers/Orders" />     
+								  <property name="BODY_KEY" value="orderHeader" />
+                </action>
+			</actions>
+		</service>
+
+		<service category="DistributionManager"
+			name="DistributionService" description="For medium priority customers">
+			<listeners>
+				<jms-listener name="distributionServiceEsbChannel"
+					busidref="distributionServiceEsbChannel" maxThreads="1">
+				</jms-listener>
+			</listeners>
+			<actions>
+               <action name="monitor" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration4.esb_actions.SimpleJMSNotifier">
+								  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration4_monitor" />     
+								  <property name="PREPENDED_TEXT" value="Distribution Manager:Medium Priority Customers/Orders" />     
+								  <property name="BODY_KEY" value="orderHeader" />
+                </action>
+			</actions>
+		</service>
+		<service category="BasicShipping"
+			name="ShipperService" description="For low priority customers">
+			<listeners>
+				<jms-listener name="basicShippingServiceEsbChannel"
+					busidref="basicShippingServiceEsbChannel" maxThreads="1">
+				</jms-listener>
+			</listeners>
+			<actions>
+                <action name="monitor" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration4.esb_actions.SimpleJMSNotifier">
+								  <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration4_monitor" />     
+								  <property name="PREPENDED_TEXT" value="Basic:Lowest Priority Customers/Orders" />     
+								  <property name="BODY_KEY" value="orderHeader" />
+                </action>
+			</actions>
+		</service>				
+
+	</services>
+
+</jbossesb>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/jbossesb-properties.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jbossesb-properties.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,85 +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/"/>
-		<property name="org.jboss.soa.esb.persistence.db.jdbc.driver" 		value="org.hsqldb.jdbcDriver"/>
-		<property name="org.jboss.soa.esb.persistence.db.user" 			value="sa"/>
-		<property name="org.jboss.soa.esb.persistence.db.pwd" 			value=""/>		
-		<property name="org.jboss.soa.esb.persistence.db.pool.initial.size"	value="2"/>
-		<property name="org.jboss.soa.esb.persistence.db.pool.min.size"	value="2"/>
-		<property name="org.jboss.soa.esb.persistence.db.pool.max.size"	value="5"/>
-		<!--table managed by pool to test for valid connections - created by pool automatically -->
-		<property name="org.jboss.soa.esb.persistence.db.pool.test.table"	value="pooltest"/>
-		<!-- # of milliseconds to timeout waiting for a connection from pool -->
-		<property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis"	value="5000"/> 
-                <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/>
-    </properties>
-    <properties name="messagerouting">
-    	<property name="org.jboss.soa.esb.routing.cbrClass" value="org.jboss.internal.soa.esb.services.routing.cbr.JBossRulesRouter"/>
-    </properties>
-</esb>

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

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jndi.properties
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/jndi.properties	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jndi.properties	2007-11-16 18:24:43 UTC (rev 16649)
@@ -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/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jndi.properties (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/jndi.properties)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jndi.properties	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/jndi.properties	2007-11-16 18:24:43 UTC (rev 16649)
@@ -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/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/juddi.properties
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/juddi.properties	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/juddi.properties	2007-11-16 18:24:43 UTC (rev 16649)
@@ -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/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/juddi.properties (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/juddi.properties)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/juddi.properties	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/juddi.properties	2007-11-16 18:24:43 UTC (rev 16649)
@@ -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/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/lib (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/lib)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/log4j.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/log4j.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/log4j.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -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/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/log4j.xml (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/log4j.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/log4j.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/log4j.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -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/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/processDefinition)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/Review_Order.xhtml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/processDefinition/Review_Order.xhtml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/Review_Order.xhtml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,84 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" >
-
-<!-- the DOCTYPE means we are required to use html for a root element -->
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:c="http://java.sun.com/jstl/core"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:tf="http://jbpm.org/jsf/tf"
-      xmlns:jbpm="http://jbpm.org/jsf">
-
-  <ui:component>
-
-    <jbpm:dataform>
-  	
-      <f:facet name="header">
-        <h:outputText value="#{taskName}"/>
-      </f:facet>
-        
-      <!-- TASKFORM ROWS -->
-      <jbpm:datacell>
-        <f:facet name="header">
-            <h:outputText value="customer_firstName"/>
-        </f:facet>
-      <h:inputText value="#{var['customer_firstName']}" />
-      </jbpm:datacell>
-      <jbpm:datacell>
-        <f:facet name="header">
-            <h:outputText value="customer_lastName"/>
-        </f:facet>
-      <h:inputText value="#{var['customer_lastName']}" />
-      </jbpm:datacell>
-      <jbpm:datacell>
-        <f:facet name="header">
-            <h:outputText value="customer_status"/>
-        </f:facet>
-      <h:inputText value="#{var['customer_status']}" />
-      </jbpm:datacell>
-      <jbpm:datacell>
-        <f:facet name="header">
-            <h:outputText value="order_totalamount"/>
-        </f:facet>
-      <h:inputText value="#{var['order_totalamount']}" />
-      </jbpm:datacell>
-      <jbpm:datacell>
-        <f:facet name="header">
-            <h:outputText value="order_priority"/>
-        </f:facet>
-      <h:inputText value="#{var['order_priority']}" />
-      </jbpm:datacell>
-      <jbpm:datacell>
-        <f:facet name="header">
-            <h:outputText value="order_orderid"/>
-        </f:facet>
-      <h:inputText value="#{var['order_orderid']}" />
-      </jbpm:datacell>
-      <jbpm:datacell>
-        <f:facet name="header">
-            <h:outputText value="order_discount"/>
-        </f:facet>
-      <h:inputText value="#{var['order_discount']}" />
-      </jbpm:datacell>
-      <jbpm:datacell>
-        <f:facet name="header">
-            <h:outputText value="entireOrder"/>
-        </f:facet>
-      <h:inputText value="#{var['entireOrderAsXML']}" />
-      </jbpm:datacell>
-    	    	    
-      <jbpm:datacell>
-        <f:facet name="header">
-          <h:outputText value="Actions"/>
-        </f:facet>
-        <!-- TASKFORM BUTTONS -->
-        <tf:saveButton value="Save"/>
-        <tf:cancelButton value="Cancel"/>
-        <tf:transitionButton value="Save and Close"/>
-      </jbpm:datacell>
-	    
-    </jbpm:dataform>	
-    
-  </ui:component>
-
-</html>

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/Review_Order.xhtml (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/processDefinition/Review_Order.xhtml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/Review_Order.xhtml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/Review_Order.xhtml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,84 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" >
+
+<!-- the DOCTYPE means we are required to use html for a root element -->
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:c="http://java.sun.com/jstl/core"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:tf="http://jbpm.org/jsf/tf"
+      xmlns:jbpm="http://jbpm.org/jsf">
+
+  <ui:component>
+
+    <jbpm:dataform>
+  	
+      <f:facet name="header">
+        <h:outputText value="#{taskName}"/>
+      </f:facet>
+        
+      <!-- TASKFORM ROWS -->
+      <jbpm:datacell>
+        <f:facet name="header">
+            <h:outputText value="customer_firstName"/>
+        </f:facet>
+      <h:inputText value="#{var['customer_firstName']}" />
+      </jbpm:datacell>
+      <jbpm:datacell>
+        <f:facet name="header">
+            <h:outputText value="customer_lastName"/>
+        </f:facet>
+      <h:inputText value="#{var['customer_lastName']}" />
+      </jbpm:datacell>
+      <jbpm:datacell>
+        <f:facet name="header">
+            <h:outputText value="customer_status"/>
+        </f:facet>
+      <h:inputText value="#{var['customer_status']}" />
+      </jbpm:datacell>
+      <jbpm:datacell>
+        <f:facet name="header">
+            <h:outputText value="order_totalamount"/>
+        </f:facet>
+      <h:inputText value="#{var['order_totalamount']}" />
+      </jbpm:datacell>
+      <jbpm:datacell>
+        <f:facet name="header">
+            <h:outputText value="order_priority"/>
+        </f:facet>
+      <h:inputText value="#{var['order_priority']}" />
+      </jbpm:datacell>
+      <jbpm:datacell>
+        <f:facet name="header">
+            <h:outputText value="order_orderid"/>
+        </f:facet>
+      <h:inputText value="#{var['order_orderid']}" />
+      </jbpm:datacell>
+      <jbpm:datacell>
+        <f:facet name="header">
+            <h:outputText value="order_discount"/>
+        </f:facet>
+      <h:inputText value="#{var['order_discount']}" />
+      </jbpm:datacell>
+      <jbpm:datacell>
+        <f:facet name="header">
+            <h:outputText value="entireOrder"/>
+        </f:facet>
+      <h:inputText value="#{var['entireOrderAsXML']}" />
+      </jbpm:datacell>
+    	    	    
+      <jbpm:datacell>
+        <f:facet name="header">
+          <h:outputText value="Actions"/>
+        </f:facet>
+        <!-- TASKFORM BUTTONS -->
+        <tf:saveButton value="Save"/>
+        <tf:cancelButton value="Cancel"/>
+        <tf:transitionButton value="Save and Close"/>
+      </jbpm:datacell>
+	    
+    </jbpm:dataform>	
+    
+  </ui:component>
+
+</html>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/forms.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/processDefinition/forms.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/forms.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<forms>
-  <form task="Order Review" form="Review_Order.xhtml"/>
-  <form task="Discount Review" form="Review_Order.xhtml"/>
-</forms>

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/forms.xml (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/processDefinition/forms.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/forms.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/forms.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<forms>
+  <form task="Order Review" form="Review_Order.xhtml"/>
+  <form task="Discount Review" form="Review_Order.xhtml"/>
+</forms>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/gpd.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/processDefinition/gpd.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/gpd.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<root-container name="bpm4_ESBOrderProcess" width="1097" height="813">
-  <node name="start" x="225" y="10" width="140" height="40">
-    <edge>
-      <label x="5" y="-10"/>
-    </edge>
-  </node>
-  <node name="Intake Order" x="114" y="81" width="140" height="40">
-    <edge>
-      <label x="5" y="-10"/>
-    </edge>
-  </node>
-  <node name="Review Order" x="311" y="80" width="140" height="40">
-    <edge>
-      <label x="5" y="-10"/>
-    </edge>
-  </node>
-  <node name="Calculate Discount" x="116" y="155" width="140" height="40">
-    <edge>
-      <label x="5" y="-10"/>
-    </edge>
-  </node>
-  <node name="Review Discount" x="309" y="156" width="140" height="40">
-    <edge>
-      <label x="5" y="-10"/>
-    </edge>
-  </node>
-  <node name="Ship It" x="216" y="228" width="140" height="40">
-    <edge>
-      <label x="5" y="-10"/>
-    </edge>
-  </node>
-  <node name="end" x="219" y="296" width="140" height="40"/>
-</root-container>

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/gpd.xml (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/processDefinition/gpd.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/gpd.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/gpd.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<root-container name="bpm4_ESBOrderProcess" width="1097" height="813">
+  <node name="start" x="225" y="10" width="140" height="40">
+    <edge>
+      <label x="5" y="-10"/>
+    </edge>
+  </node>
+  <node name="Intake Order" x="114" y="81" width="140" height="40">
+    <edge>
+      <label x="5" y="-10"/>
+    </edge>
+  </node>
+  <node name="Review Order" x="311" y="80" width="140" height="40">
+    <edge>
+      <label x="5" y="-10"/>
+    </edge>
+  </node>
+  <node name="Calculate Discount" x="116" y="155" width="140" height="40">
+    <edge>
+      <label x="5" y="-10"/>
+    </edge>
+  </node>
+  <node name="Review Discount" x="309" y="156" width="140" height="40">
+    <edge>
+      <label x="5" y="-10"/>
+    </edge>
+  </node>
+  <node name="Ship It" x="216" y="228" width="140" height="40">
+    <edge>
+      <label x="5" y="-10"/>
+    </edge>
+  </node>
+  <node name="end" x="219" y="296" width="140" height="40"/>
+</root-container>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/processdefinition.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/processDefinition/processdefinition.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/processdefinition.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<process-definition
-  xmlns="urn:jbpm.org:jpdl-3.1"  name="bpm4_ESBOrderProcess">
-   <start-state name="start">
-      <transition name="" to="Intake Order"></transition>
-   </start-state>
-
-   <node name="Intake Order">
-         
-         <action name="esbAction" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
-            <esbCategoryName>BPM_Orchestration4</esbCategoryName>
-            <esbServiceName>IntakeService</esbServiceName>
-            <!-- async call of IntakeService -->            
-		    <jbpmToEsbVars>
-            	<mapping jbpm="entireOrderAsXML" esb="BODY_CONTENT" />            	
-            </jbpmToEsbVars>
-            <!--  since this async, should skip returnVars -->
-            <returnVars>
-            	<mapping jbpm="entireOrderAsXML" esb="BODY_CONTENT" />            	
-            </returnVars>
-         </action>
-         
-      <transition name="" to="Review Order"></transition>
-   </node>
-   
-   <task-node name="Review Order">
-      <task name="Order Review">
-         <assignment actor-id="user"></assignment>
-			<controller>
-            <variable name="customer_firstName" access="read,write,required"></variable>
-            <variable name="customer_lastName" access="read,write,required"></variable>
-            <variable name="customer_status" access="read"></variable>
-            <variable name="order_totalamount" access="read"></variable>
-            <variable name="order_priority" access="read"></variable>
-            <variable name="order_orderid" access="read"></variable>
-            <variable name="order_discount" access="read"></variable>
-            <variable name="entireOrderAsXML" access="read"></variable>
-         </controller>
-      </task>     
-      <transition name="" to="Calculate Discount"></transition>
-   </task-node>
-   
-   <node name="Calculate Discount">         
-          
-         <action name="esbAction" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
-            <esbCategoryName>BPM_Orchestration4</esbCategoryName>
-            <esbServiceName>DiscountService</esbServiceName>         
-			<jbpmToEsbVars>
-			<mapping jbpm="entireCustomerAsObject" esb="customer" />
-			<mapping jbpm="entireOrderAsObject" esb="orderHeader" />
-			<mapping jbpm="entireOrderAsXML" esb="BODY_CONTENT" />
-			</jbpmToEsbVars>
-            <returnVars>
-            	<mapping jbpm="entireOrderAsObject" esb="order" />            	
-            </returnVars>         
-         </action>
-          
-      <transition name="" to="Review Discount"></transition>
-   </node>
-
-   <task-node name="Review Discount">
-      <task name="Discount Review">
-			<assignment actor-id="manager"></assignment>
-		</task>
-      <transition name="" to="Ship It"></transition>
-   </task-node>
-
-   <node name="Ship It">
-        <event type="node-enter">   
-         <action name="esbAction" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
-            <esbCategoryName>BPM_Orchestration4</esbCategoryName>
-            <esbServiceName>ShippingService</esbServiceName>                 
-            <millisToWaitForResponse>10000</millisToWaitForResponse>            
-			<jbpmToEsbVars><mapping jbpm="entireCustomerAsObject" esb="customer" />	<mapping jbpm="entireOrderAsObject" esb="orderHeader" /><mapping jbpm="entireOrderAsXML" esb="entireOrderAsXML" />
-					
-			
-			
-				</jbpmToEsbVars>   
-         </action>
-         </event>
-      <transition name="" to="end"></transition>
-   </node>
-   
-   <end-state name="end"></end-state>
- 
-</process-definition>
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/processdefinition.xml (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/processDefinition/processdefinition.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/processdefinition.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/processdefinition.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition
+  xmlns="urn:jbpm.org:jpdl-3.1"  name="bpm4_ESBOrderProcess">
+   <start-state name="start">
+      <transition name="" to="Intake Order"></transition>
+   </start-state>
+
+   <node name="Intake Order">
+         
+         <action name="esbAction" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
+            <esbCategoryName>BPM_Orchestration4</esbCategoryName>
+            <esbServiceName>IntakeService</esbServiceName>
+            <!-- async call of IntakeService -->            
+		    <jbpmToEsbVars>
+            	<mapping jbpm="entireOrderAsXML" esb="BODY_CONTENT" />            	
+            </jbpmToEsbVars>
+            <!--  since this async, should skip returnVars -->
+            <returnVars>
+            	<mapping jbpm="entireOrderAsXML" esb="BODY_CONTENT" />            	
+            </returnVars>
+         </action>
+         
+      <transition name="" to="Review Order"></transition>
+   </node>
+   
+   <task-node name="Review Order">
+      <task name="Order Review">
+         <assignment actor-id="user"></assignment>
+			<controller>
+            <variable name="customer_firstName" access="read,write,required"></variable>
+            <variable name="customer_lastName" access="read,write,required"></variable>
+            <variable name="customer_status" access="read"></variable>
+            <variable name="order_totalamount" access="read"></variable>
+            <variable name="order_priority" access="read"></variable>
+            <variable name="order_orderid" access="read"></variable>
+            <variable name="order_discount" access="read"></variable>
+            <variable name="entireOrderAsXML" access="read"></variable>
+         </controller>
+      </task>     
+      <transition name="" to="Calculate Discount"></transition>
+   </task-node>
+   
+   <node name="Calculate Discount">         
+          
+         <action name="esbAction" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
+            <esbCategoryName>BPM_Orchestration4</esbCategoryName>
+            <esbServiceName>DiscountService</esbServiceName>         
+			<jbpmToEsbVars>
+			<mapping jbpm="entireCustomerAsObject" esb="customer" />
+			<mapping jbpm="entireOrderAsObject" esb="orderHeader" />
+			<mapping jbpm="entireOrderAsXML" esb="BODY_CONTENT" />
+			</jbpmToEsbVars>
+            <returnVars>
+            	<mapping jbpm="entireOrderAsObject" esb="order" />            	
+            </returnVars>         
+         </action>
+          
+      <transition name="" to="Review Discount"></transition>
+   </node>
+
+   <task-node name="Review Discount">
+      <task name="Discount Review">
+			<assignment actor-id="manager"></assignment>
+		</task>
+      <transition name="" to="Ship It"></transition>
+   </task-node>
+
+   <node name="Ship It">
+        <event type="node-enter">   
+         <action name="esbAction" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
+            <esbCategoryName>BPM_Orchestration4</esbCategoryName>
+            <esbServiceName>ShippingService</esbServiceName>                 
+            <millisToWaitForResponse>10000</millisToWaitForResponse>            
+			<jbpmToEsbVars><mapping jbpm="entireCustomerAsObject" esb="customer" />	<mapping jbpm="entireOrderAsObject" esb="orderHeader" /><mapping jbpm="entireOrderAsXML" esb="entireOrderAsXML" />
+					
+			
+			
+				</jbpmToEsbVars>   
+         </action>
+         </event>
+      <transition name="" to="end"></transition>
+   </node>
+   
+   <end-state name="end"></end-state>
+ 
+</process-definition>
\ No newline at end of file

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/processimage.jpg
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/processDefinition/processimage.jpg (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/processDefinition/processimage.jpg)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/readme.txt
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/readme.txt	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/readme.txt	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,11 +0,0 @@
-Overview:
-=========
- 	Review the docs/Readme.pdf
-
-To Run standalone mode:
-=======================
-  Do not run standalone.
-
-To Run '.esb' archive mode:
-===========================
-  Review the docs/Readme.pdf
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/readme.txt (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/readme.txt)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/readme.txt	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/readme.txt	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,11 @@
+Overview:
+=========
+ 	Review the docs/Readme.pdf
+
+To Run standalone mode:
+=======================
+  Do not run standalone.
+
+To Run '.esb' archive mode:
+===========================
+  Review the docs/Readme.pdf
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/scripts)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/check-origin.groovy
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/scripts/check-origin.groovy	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/check-origin.groovy	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,11 +0,0 @@
-
-def messageText = message.getBody().get();
-def order = new XmlParser().parseText(messageText);
-
-if(order.OrderLines.size() == 1) {
-    message.getProperties().setProperty("from", "dvdstore");
-} else if(order.LineItems.size() == 1) {
-    message.getProperties().setProperty("from", "petstore");
-}
-
-println "Message from: " + message.getProperties().getProperty("from");

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/check-origin.groovy (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/scripts/check-origin.groovy)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/check-origin.groovy	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/check-origin.groovy	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,11 @@
+
+def messageText = message.getBody().get();
+def order = new XmlParser().parseText(messageText);
+
+if(order.OrderLines.size() == 1) {
+    message.getProperties().setProperty("from", "dvdstore");
+} else if(order.LineItems.size() == 1) {
+    message.getProperties().setProperty("from", "petstore");
+}
+
+println "Message from: " + message.getProperties().getProperty("from");

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/discount_service.groovy
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/scripts/discount_service.groovy	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/discount_service.groovy	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,9 +0,0 @@
-import org.jboss.soa.esb.message.*
-
-println " Begin Discount Service "
-
-println "default location: " + message.body.get()
-println "Order Header: " + message.body.get("orderHeader")
-println "Customer: " + message.body.get("customer")
-
-println " End Discount Service "
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/discount_service.groovy (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/scripts/discount_service.groovy)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/discount_service.groovy	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/discount_service.groovy	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,9 @@
+import org.jboss.soa.esb.message.*
+
+println " Begin Discount Service "
+
+println "default location: " + message.body.get()
+println "Order Header: " + message.body.get("orderHeader")
+println "Customer: " + message.body.get("customer")
+
+println " End Discount Service "
\ No newline at end of file

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/display.groovy
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/scripts/display.groovy	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/display.groovy	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,6 +0,0 @@
-import org.jboss.soa.esb.message.*
-
-println " == BEGIN =="
-println "orderHeader: " + message.body.get("orderHeader")
-println "customer: " + message.body.get("customer")
-println " ==  END  =="
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/display.groovy (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/scripts/display.groovy)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/display.groovy	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/display.groovy	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,6 @@
+import org.jboss.soa.esb.message.*
+
+println " == BEGIN =="
+println "orderHeader: " + message.body.get("orderHeader")
+println "customer: " + message.body.get("customer")
+println " ==  END  =="
\ No newline at end of file

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/fixer.groovy
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/scripts/fixer.groovy	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/fixer.groovy	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,11 +0,0 @@
-import org.jboss.soa.esb.message.*
-
-println "*********** BEGIN FIXER ***********"
-
-println "In: " + new String(message.body.contents)
-
-message.body.add(new String(message.body.contents))
-
-println "Out: " + new String(message.body.get())
-
-println "************ END FIXER ************"
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/fixer.groovy (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/scripts/fixer.groovy)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/fixer.groovy	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/fixer.groovy	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,11 @@
+import org.jboss.soa.esb.message.*
+
+println "*********** BEGIN FIXER ***********"
+
+println "In: " + new String(message.body.contents)
+
+message.body.add(new String(message.body.contents))
+
+println "Out: " + new String(message.body.get())
+
+println "************ END FIXER ************"
\ No newline at end of file

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/intake_service.groovy
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/scripts/intake_service.groovy	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/intake_service.groovy	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,5 +0,0 @@
-import org.jboss.soa.esb.message.*
-
-println " == Begin Intake Service =="
-println "DEFAULT: " + message.body.get()
-println " == End Intake Service =="
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/intake_service.groovy (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/scripts/intake_service.groovy)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/intake_service.groovy	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/intake_service.groovy	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,5 @@
+import org.jboss.soa.esb.message.*
+
+println " == Begin Intake Service =="
+println "DEFAULT: " + message.body.get()
+println " == End Intake Service =="
\ No newline at end of file

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/setup_discount.groovy
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/scripts/setup_discount.groovy	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/setup_discount.groovy	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,12 +0,0 @@
-import org.jboss.soa.esb.message.*
-import org.jboss.soa.esb.store.OrderHeader
-
-println "*********** BEGIN ORDER DISCOUNT FIXER ***********"
-
-println "Order: " + message.body.get("orderHeader")
-order = (OrderHeader) message.body.get("orderHeader")
-
-message.body.add("order_orderDiscount",order.getOrderDiscount())
-
-
-println "************ END ORDER DISCOUNT FIXER ************"
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/setup_discount.groovy (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/scripts/setup_discount.groovy)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/setup_discount.groovy	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/setup_discount.groovy	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,12 @@
+import org.jboss.soa.esb.message.*
+import org.jboss.soa.esb.store.OrderHeader
+
+println "*********** BEGIN ORDER DISCOUNT FIXER ***********"
+
+println "Order: " + message.body.get("orderHeader")
+order = (OrderHeader) message.body.get("orderHeader")
+
+message.body.add("order_orderDiscount",order.getOrderDiscount())
+
+
+println "************ END ORDER DISCOUNT FIXER ************"
\ No newline at end of file

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/setup_key.groovy
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/scripts/setup_key.groovy	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/setup_key.groovy	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,11 +0,0 @@
-import org.jboss.soa.esb.message.*
-
-println "*********** BEGIN ORDER KEY SETUP ***********"
-
-def messageText = message.getBody().get();
-def order = new XmlParser().parseText(messageText);
-def key = order['@orderId']
-println "Key: " + key
-message.getBody().add("businessKey",key);
-
-println "************ END ORDER KEY SETUP ************"
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/setup_key.groovy (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/scripts/setup_key.groovy)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/setup_key.groovy	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/setup_key.groovy	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,11 @@
+import org.jboss.soa.esb.message.*
+
+println "*********** BEGIN ORDER KEY SETUP ***********"
+
+def messageText = message.getBody().get();
+def order = new XmlParser().parseText(messageText);
+def key = order['@orderId']
+println "Key: " + key
+message.getBody().add("businessKey",key);
+
+println "************ END ORDER KEY SETUP ************"
\ No newline at end of file

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/setup_priority.groovy
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/scripts/setup_priority.groovy	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/setup_priority.groovy	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,12 +0,0 @@
-import org.jboss.soa.esb.message.*
-import org.jboss.soa.esb.store.OrderHeader
-
-println "*********** BEGIN ORDER PRIORITY FIXER ***********"
-
-println "Order: " + message.body.get("orderHeader")
-order = (OrderHeader) message.body.get("orderHeader")
-
-message.body.add("order_orderPriority",order.getOrderPriority())
-
-
-println "************ END ORDER PRIORITY FIXER ************"
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/setup_priority.groovy (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/scripts/setup_priority.groovy)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/setup_priority.groovy	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/setup_priority.groovy	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,12 @@
+import org.jboss.soa.esb.message.*
+import org.jboss.soa.esb.store.OrderHeader
+
+println "*********** BEGIN ORDER PRIORITY FIXER ***********"
+
+println "Order: " + message.body.get("orderHeader")
+order = (OrderHeader) message.body.get("orderHeader")
+
+message.body.add("order_orderPriority",order.getOrderPriority())
+
+
+println "************ END ORDER PRIORITY FIXER ************"
\ No newline at end of file

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/shipping_service.groovy
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/scripts/shipping_service.groovy	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/shipping_service.groovy	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,9 +0,0 @@
-import org.jboss.soa.esb.message.*
-
-println " Begin Shipping Service "
-
-println "Original XML: " + message.body.get("entireOrderAsXML")
-println "Customer: " + message.body.get("customer")
-println "Order: " + message.body.get("orderHeader")
-
-println " End Shipping Service "
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/shipping_service.groovy (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/scripts/shipping_service.groovy)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/shipping_service.groovy	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/scripts/shipping_service.groovy	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,9 @@
+import org.jboss.soa.esb.message.*
+
+println " Begin Shipping Service "
+
+println "Original XML: " + message.body.get("entireOrderAsXML")
+println "Customer: " + message.body.get("customer")
+println "Order: " + message.body.get("orderHeader")
+
+println " End Shipping Service "
\ No newline at end of file

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/smooks-config.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/smooks-config.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/smooks-config.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
-
-    <import file="classpath:/transforms/from-dvdstore.xml" />
-    <import file="classpath:/transforms/from-petstore.xml" />
-
-</smooks-resource-list>
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/smooks-config.xml (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/smooks-config.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/smooks-config.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/smooks-config.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
+
+    <import file="classpath:/transforms/from-dvdstore.xml" />
+    <import file="classpath:/transforms/from-petstore.xml" />
+
+</smooks-resource-list>
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src)

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org)

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss)

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa)

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb)

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples)

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts)

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4 (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4)

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/SetupMessage.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/SetupMessage.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/SetupMessage.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,70 +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_orchestration4.esb_actions;
-
-import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
-import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.store.Customer;
-import org.jboss.soa.esb.store.OrderHeader;
-import org.apache.log4j.Logger;
-
-public class SetupMessage extends AbstractActionPipelineProcessor {
-	private Logger logger = Logger.getLogger(SetupMessage.class);
-	private int status = 0;
-
-	public Message process(Message message) throws ActionProcessingException {
-
-		OrderHeader order = (OrderHeader) message.getBody().get("orderHeader");
-		Customer customer = (Customer) message.getBody().get("customer");
-		//List orderItems = (List) message.getBody().get("orderItemList");
-
-		customer.setStatus(status);
-
-		logger.info("--------------------------------");
-		logger.info("Customer: " + customer);
-		logger.info("Order: " + order);
-		logger.info("businessKey: " + order.getOrderId());
-		logger.info("--------------------------------");
-
-		message.getBody().add("entireOrderAsXML", message.getBody().get());
-		message.getBody().add("order_orderId", order.getOrderId());
-		message.getBody().add("order_orderPriority", order.getOrderPriority());
-		message.getBody().add("order_totalAmount", order.getTotalAmount());
-		message.getBody().add("order_discount", order.getOrderDiscount());
-		message.getBody().add("businessKey", order.getOrderId());
-
-		message.getBody().add("customer_firstName", customer.getFirstName());
-		message.getBody().add("customer_lastName", customer.getLastName());
-		message.getBody().add("customer_status", customer.getStatus());
-
-		logger.info("Moved the transformed Order Header and Customer");
-
-		return message;
-	}
-
-	public SetupMessage(ConfigTree configTree) { // demo purposes, passed in
-													// from the jboss-esb.xml
-		status = Integer.parseInt(configTree.getAttribute("status"));
-	}
-
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/SetupMessage.java (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/SetupMessage.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/SetupMessage.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/SetupMessage.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,70 @@
+/*
+ * 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_orchestration4.esb_actions;
+
+import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
+import org.jboss.soa.esb.actions.ActionProcessingException;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.store.Customer;
+import org.jboss.soa.esb.store.OrderHeader;
+import org.apache.log4j.Logger;
+
+public class SetupMessage extends AbstractActionPipelineProcessor {
+	private Logger logger = Logger.getLogger(SetupMessage.class);
+	private int status = 0;
+
+	public Message process(Message message) throws ActionProcessingException {
+
+		OrderHeader order = (OrderHeader) message.getBody().get("orderHeader");
+		Customer customer = (Customer) message.getBody().get("customer");
+		//List orderItems = (List) message.getBody().get("orderItemList");
+
+		customer.setStatus(status);
+
+		logger.info("--------------------------------");
+		logger.info("Customer: " + customer);
+		logger.info("Order: " + order);
+		logger.info("businessKey: " + order.getOrderId());
+		logger.info("--------------------------------");
+
+		message.getBody().add("entireOrderAsXML", message.getBody().get());
+		message.getBody().add("order_orderId", order.getOrderId());
+		message.getBody().add("order_orderPriority", order.getOrderPriority());
+		message.getBody().add("order_totalAmount", order.getTotalAmount());
+		message.getBody().add("order_discount", order.getOrderDiscount());
+		message.getBody().add("businessKey", order.getOrderId());
+
+		message.getBody().add("customer_firstName", customer.getFirstName());
+		message.getBody().add("customer_lastName", customer.getLastName());
+		message.getBody().add("customer_status", customer.getStatus());
+
+		logger.info("Moved the transformed Order Header and Customer");
+
+		return message;
+	}
+
+	public SetupMessage(ConfigTree configTree) { // demo purposes, passed in
+													// from the jboss-esb.xml
+		status = Integer.parseInt(configTree.getAttribute("status"));
+	}
+
+}
\ No newline at end of file

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/SimpleJMSNotifier.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/SimpleJMSNotifier.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/SimpleJMSNotifier.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,94 +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_orchestration4.esb_actions;
- 
-import org.jboss.soa.esb.actions.AbstractActionLifecycle;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Message;
-import org.apache.log4j.Logger;
-
-import java.util.Properties;
-
-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;
-
-public class SimpleJMSNotifier extends AbstractActionLifecycle {
-	protected ConfigTree	_config;
-	private Logger logger = Logger.getLogger(SimpleJMSNotifier.class);
-	String queueName = "quickstart_bpm_orchestration4_monitor";
-	String prependedText = "";
-	String bodyKey ="";
-	public Message process(Message message) throws Exception {	
-		 QueueConnection conn;
-     QueueSession session;
-     Queue que;	
-     
-     Properties properties1 = new Properties();
-		 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); 
-     String msg = "";
-     
-     if (bodyKey == null || bodyKey.equals("")) {
-     		msg = prependedText + "\n" + message.getBody().get();
-     } else {
-     	  msg = prependedText+ "\n" + message.getBody().get(bodyKey);
-     }
-     
-     TextMessage tm = session.createTextMessage(msg);
-     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");
-	  prependedText = _config.getAttribute("PREPENDED_TEXT");
-	  bodyKey = _config.getAttribute("BODY_KEY");
-	  logger.info("Who to alert: " + queueName);	
-	} 
-}	
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/SimpleJMSNotifier.java (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/SimpleJMSNotifier.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/SimpleJMSNotifier.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/SimpleJMSNotifier.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,94 @@
+/*
+ * 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_orchestration4.esb_actions;
+ 
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.apache.log4j.Logger;
+
+import java.util.Properties;
+
+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;
+
+public class SimpleJMSNotifier extends AbstractActionLifecycle {
+	protected ConfigTree	_config;
+	private Logger logger = Logger.getLogger(SimpleJMSNotifier.class);
+	String queueName = "quickstart_bpm_orchestration4_monitor";
+	String prependedText = "";
+	String bodyKey ="";
+	public Message process(Message message) throws Exception {	
+		 QueueConnection conn;
+     QueueSession session;
+     Queue que;	
+     
+     Properties properties1 = new Properties();
+		 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); 
+     String msg = "";
+     
+     if (bodyKey == null || bodyKey.equals("")) {
+     		msg = prependedText + "\n" + message.getBody().get();
+     } else {
+     	  msg = prependedText+ "\n" + message.getBody().get(bodyKey);
+     }
+     
+     TextMessage tm = session.createTextMessage(msg);
+     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");
+	  prependedText = _config.getAttribute("PREPENDED_TEXT");
+	  bodyKey = _config.getAttribute("BODY_KEY");
+	  logger.info("Who to alert: " + queueName);	
+	} 
+}	
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/test (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/test)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/test/SendJMSMessage.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/test/SendJMSMessage.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/test/SendJMSMessage.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,85 +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_orchestration4.test;
-
-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.InitialContext;
-import javax.naming.NamingException;
-
-public class SendJMSMessage {
-    QueueConnection conn;
-    QueueSession session;
-    Queue que;
-        
-    public void setupConnection(String queueName) throws JMSException, NamingException
-    {
-    	InitialContext iniCtx = new InitialContext();
-    	Object tmp = iniCtx.lookup("ConnectionFactory");
-    	QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
-    	conn = qcf.createQueueConnection();
-    	que = (Queue) iniCtx.lookup(queueName);
-    	session = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-    	conn.start();
-    	System.out.println("Connection Started");
-    }
-    
-    public void stop() throws JMSException 
-    { 
-        conn.stop();
-        session.close();
-        conn.close();
-    }
-    
-    public void sendAMessage(String msg, String tokenID) throws JMSException {
-    	
-        QueueSender send = session.createSender(que);        
-        ObjectMessage tm = session.createObjectMessage(msg);
-        if (tokenID != null && !tokenID.equals(""))
-        	tm.setStringProperty("token",tokenID);
-        send.send(tm);        
-        send.close();
-    }
-       
-    
-    public static void main(String args[]) throws Exception
-    {        	    	
-    	SendJMSMessage sm = new SendJMSMessage();
-    	try {
-    		sm.setupConnection(args[0]);
-    		if (args.length < 3)
-    			sm.sendAMessage(args[1],null); 
-    		else
-    			sm.sendAMessage(args[1],args[2]); 
-    	} catch (Exception e) {
-    		System.out.println(e);
-      } finally {
-    	  sm.stop();
-    	}  
-    	
-    }
-    
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/test/SendJMSMessage.java (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/test/SendJMSMessage.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/test/SendJMSMessage.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/test/SendJMSMessage.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,85 @@
+/*
+ * 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_orchestration4.test;
+
+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.InitialContext;
+import javax.naming.NamingException;
+
+public class SendJMSMessage {
+    QueueConnection conn;
+    QueueSession session;
+    Queue que;
+        
+    public void setupConnection(String queueName) throws JMSException, NamingException
+    {
+    	InitialContext iniCtx = new InitialContext();
+    	Object tmp = iniCtx.lookup("ConnectionFactory");
+    	QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
+    	conn = qcf.createQueueConnection();
+    	que = (Queue) iniCtx.lookup(queueName);
+    	session = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+    	conn.start();
+    	System.out.println("Connection Started");
+    }
+    
+    public void stop() throws JMSException 
+    { 
+        conn.stop();
+        session.close();
+        conn.close();
+    }
+    
+    public void sendAMessage(String msg, String tokenID) throws JMSException {
+    	
+        QueueSender send = session.createSender(que);        
+        ObjectMessage tm = session.createObjectMessage(msg);
+        if (tokenID != null && !tokenID.equals(""))
+        	tm.setStringProperty("token",tokenID);
+        send.send(tm);        
+        send.close();
+    }
+       
+    
+    public static void main(String args[]) throws Exception
+    {        	    	
+    	SendJMSMessage sm = new SendJMSMessage();
+    	try {
+    		sm.setupConnection(args[0]);
+    		if (args.length < 3)
+    			sm.sendAMessage(args[1],null); 
+    		else
+    			sm.sendAMessage(args[1],args[2]); 
+    	} catch (Exception e) {
+    		System.out.println(e);
+      } finally {
+    	  sm.stop();
+    	}  
+    	
+    }
+    
+}
\ No newline at end of file

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/test/SendJMSMessageStart.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/test/SendJMSMessageStart.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/test/SendJMSMessageStart.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,110 +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_orchestration4.test;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.jms.JMSException;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueSession;
-import javax.jms.QueueSender;
-import javax.jms.ObjectMessage;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-
-public class SendJMSMessageStart {
-    QueueConnection conn;
-    QueueSession session;
-    Queue que;
-    
-    
-    public void setupConnection() throws JMSException, NamingException
-    {
-    	InitialContext iniCtx = new InitialContext();
-    	Object tmp = iniCtx.lookup("ConnectionFactory");
-    	QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
-    	conn = qcf.createQueueConnection();
-    	que = (Queue) iniCtx.lookup("queue/quickstart_bpm_orchestration4_start_gw");
-    	session = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-    	conn.start();
-    	System.out.println("Connection Started");
-    }
-    
-    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 String readAsciiFile(String fileName) throws IOException {
-		  FileReader fr = null;
-		  char[] thechars = null;
-
-		  try {
-			  File thefile = new File( fileName );
-			  fr = new FileReader( thefile );
-			  int size = (int) thefile.length();
-			  thechars = new char[size];
-		
-			  int count, index = 0;
-		
-			  // 	read in the bytes from the input stream
-			  while( ( count = fr.read( thechars, index, size ) ) > 0 ) {
-				  size -= count;
-				  index += count;
-			  }
-			} catch(Exception e) {	
-				System.out.println(e);
-			}
-			finally {
-				if( fr != null )
-		        fr.close();
-			}
-			return new String(thechars);
-
-    } // readAsciiFile
-    
-    public static void main(String args[]) throws Exception
-    {        	    	
-    	SendJMSMessageStart sm = new SendJMSMessageStart();
-    	sm.setupConnection();
-    	String fileContent = sm.readAsciiFile(args[0]);
-    	System.out.println("---------------------------------------------");
-    	System.out.println(fileContent);
-    	System.out.println("---------------------------------------------");
-    	sm.sendAMessage(fileContent); 
-    	sm.stop();
-    	
-    }
-    
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/test/SendJMSMessageStart.java (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/test/SendJMSMessageStart.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/test/SendJMSMessageStart.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/test/SendJMSMessageStart.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,110 @@
+/*
+ * 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_orchestration4.test;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.jms.JMSException;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueSession;
+import javax.jms.QueueSender;
+import javax.jms.ObjectMessage;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+
+public class SendJMSMessageStart {
+    QueueConnection conn;
+    QueueSession session;
+    Queue que;
+    
+    
+    public void setupConnection() throws JMSException, NamingException
+    {
+    	InitialContext iniCtx = new InitialContext();
+    	Object tmp = iniCtx.lookup("ConnectionFactory");
+    	QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
+    	conn = qcf.createQueueConnection();
+    	que = (Queue) iniCtx.lookup("queue/quickstart_bpm_orchestration4_start_gw");
+    	session = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+    	conn.start();
+    	System.out.println("Connection Started");
+    }
+    
+    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 String readAsciiFile(String fileName) throws IOException {
+		  FileReader fr = null;
+		  char[] thechars = null;
+
+		  try {
+			  File thefile = new File( fileName );
+			  fr = new FileReader( thefile );
+			  int size = (int) thefile.length();
+			  thechars = new char[size];
+		
+			  int count, index = 0;
+		
+			  // 	read in the bytes from the input stream
+			  while( ( count = fr.read( thechars, index, size ) ) > 0 ) {
+				  size -= count;
+				  index += count;
+			  }
+			} catch(Exception e) {	
+				System.out.println(e);
+			}
+			finally {
+				if( fr != null )
+		        fr.close();
+			}
+			return new String(thechars);
+
+    } // readAsciiFile
+    
+    public static void main(String args[]) throws Exception
+    {        	    	
+    	SendJMSMessageStart sm = new SendJMSMessageStart();
+    	sm.setupConnection();
+    	String fileContent = sm.readAsciiFile(args[0]);
+    	System.out.println("---------------------------------------------");
+    	System.out.println(fileContent);
+    	System.out.println("---------------------------------------------");
+    	sm.sendAMessage(fileContent); 
+    	sm.stop();
+    	
+    }
+    
+}
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/Customer.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/Customer.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/Customer.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,107 +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.store;
-
-import java.io.Serializable;
-
-/**
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class Customer implements Serializable{
-
-	/**
-     * 
-     */
-    private static final long serialVersionUID = 1L;
-    // <Customer userName="user1" firstName="Harry" lastName="Potter" state="SD"/>
-	private String userName;
-	private String firstName;
-	private String lastName;
-	private String state;
-	private int status;
-	
-	public void setStatus(int status) {
-		this.status = status;
-	}
-	public int getStatus() {
-		return this.status;
-	}
-	/**
-	 * @return Returns the firstName.
-	 */
-	public String getFirstName() {
-		return firstName;
-	}
-	/**
-	 * @param firstName The firstName to set.
-	 */
-	public void setFirstName(String firstName) {
-		//System.out.println("**** firstName: " + firstName);
-		this.firstName = firstName;
-	}
-	/**
-	 * @return Returns the lastName.
-	 */
-	public String getLastName() {
-		return lastName;
-	}
-	/**
-	 * @param lastName The lastName to set.
-	 */
-	public void setLastName(String lastName) {
-		this.lastName = lastName;
-	}
-	/**
-	 * @return Returns the state.
-	 */
-	public String getState() {
-		return state;
-	}
-	/**
-	 * @param state The state to set.
-	 */
-	public void setState(String state) {
-		this.state = state;
-	}
-	/**
-	 * @return Returns the userName.
-	 */
-	public String getUserName() {
-		return userName;
-	}
-	/**
-	 * @param userName The userName to set.
-	 */
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return userName + "," + firstName + "," + lastName + "," + state;
-	}
-	
-
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/Customer.java (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/Customer.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/Customer.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/Customer.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,107 @@
+/*
+ * 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.store;
+
+import java.io.Serializable;
+
+/**
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class Customer implements Serializable{
+
+	/**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
+    // <Customer userName="user1" firstName="Harry" lastName="Potter" state="SD"/>
+	private String userName;
+	private String firstName;
+	private String lastName;
+	private String state;
+	private int status;
+	
+	public void setStatus(int status) {
+		this.status = status;
+	}
+	public int getStatus() {
+		return this.status;
+	}
+	/**
+	 * @return Returns the firstName.
+	 */
+	public String getFirstName() {
+		return firstName;
+	}
+	/**
+	 * @param firstName The firstName to set.
+	 */
+	public void setFirstName(String firstName) {
+		//System.out.println("**** firstName: " + firstName);
+		this.firstName = firstName;
+	}
+	/**
+	 * @return Returns the lastName.
+	 */
+	public String getLastName() {
+		return lastName;
+	}
+	/**
+	 * @param lastName The lastName to set.
+	 */
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+	/**
+	 * @return Returns the state.
+	 */
+	public String getState() {
+		return state;
+	}
+	/**
+	 * @param state The state to set.
+	 */
+	public void setState(String state) {
+		this.state = state;
+	}
+	/**
+	 * @return Returns the userName.
+	 */
+	public String getUserName() {
+		return userName;
+	}
+	/**
+	 * @param userName The userName to set.
+	 */
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return userName + "," + firstName + "," + lastName + "," + state;
+	}
+	
+
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/OrderHeader.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/OrderHeader.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/OrderHeader.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,139 +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.store;
-
-import java.util.Calendar;
-import java.io.Serializable;
-
-/**
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class OrderHeader implements Serializable {
-	
-	/**
-     * 
-     */
-    private static final long serialVersionUID = 1L;
-    // <Order orderId="1" orderDate="Wed Nov 15 13:45:28 EST 2006" statusCode="0" netAmount="59.97" totalAmount="64.92" tax="4.95">
-	private String orderId;
-	private Calendar orderDate;
-	private String statusCode;
-	private double netAmount;
-	private double totalAmount;
-	private double tax;
-	private double orderDiscount;
-	private int orderPriority;
-	
-	public void setOrderPriority(int orderPriority) {
-		this.orderPriority = orderPriority;
-	}
-	public int getOrderPriority() {
-		return this.orderPriority;
-	}
-	
-	public void setOrderDiscount(double orderDiscount) {
-		this.orderDiscount = orderDiscount;
-	}
-	public double getOrderDiscount() {
-		return orderDiscount;
-	}
-	/**
-	 * @return Returns the netAmount.
-	 */
-	public double getNetAmount() {
-		return netAmount;
-	}
-	/**
-	 * @param netAmount The netAmount to set.
-	 */
-	public void setNetAmount(double netAmount) {
-		this.netAmount = netAmount;
-	}
-	/**
-	 * @return Returns the orderDate.
-	 */
-	public Calendar getOrderDate() {
-		return orderDate;
-	}
-	/**
-	 * @param orderDate The orderDate to set.
-	 */
-	public void setOrderDate(Calendar orderDate) {
-		this.orderDate = orderDate;
-	}
-	/**
-	 * @return Returns the orderId.
-	 */
-	public String getOrderId() {
-		return orderId;
-	}
-	/**
-	 * @param orderId The orderId to set.
-	 */
-	public void setOrderId(String orderId) {
-		this.orderId = orderId;
-	}
-	/**
-	 * @return Returns the statusCode.
-	 */
-	public String getStatusCode() {
-		return statusCode;
-	}
-	/**
-	 * @param statusCode The statusCode to set.
-	 */
-	public void setStatusCode(String statusCode) {
-		this.statusCode = statusCode;
-	}
-	/**
-	 * @return Returns the tax.
-	 */
-	public double getTax() {
-		return tax;
-	}
-	/**
-	 * @param tax The tax to set.
-	 */
-	public void setTax(double tax) {
-		this.tax = tax;
-	}
-	/**
-	 * @return Returns the totalAmount.
-	 */
-	public double getTotalAmount() {
-		return totalAmount;
-	}
-	/**
-	 * @param totalAmount The totalAmount to set.
-	 */
-	public void setTotalAmount(double totalAmount) {
-		this.totalAmount = totalAmount;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return orderId + ", " + (orderDate == null?null:orderDate.getTime()) + ", " + statusCode + ", " + netAmount + ", " + totalAmount + ", " + tax + ", ";
-	}
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/OrderHeader.java (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/OrderHeader.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/OrderHeader.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/OrderHeader.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,139 @@
+/*
+ * 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.store;
+
+import java.util.Calendar;
+import java.io.Serializable;
+
+/**
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class OrderHeader implements Serializable {
+	
+	/**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
+    // <Order orderId="1" orderDate="Wed Nov 15 13:45:28 EST 2006" statusCode="0" netAmount="59.97" totalAmount="64.92" tax="4.95">
+	private String orderId;
+	private Calendar orderDate;
+	private String statusCode;
+	private double netAmount;
+	private double totalAmount;
+	private double tax;
+	private double orderDiscount;
+	private int orderPriority;
+	
+	public void setOrderPriority(int orderPriority) {
+		this.orderPriority = orderPriority;
+	}
+	public int getOrderPriority() {
+		return this.orderPriority;
+	}
+	
+	public void setOrderDiscount(double orderDiscount) {
+		this.orderDiscount = orderDiscount;
+	}
+	public double getOrderDiscount() {
+		return orderDiscount;
+	}
+	/**
+	 * @return Returns the netAmount.
+	 */
+	public double getNetAmount() {
+		return netAmount;
+	}
+	/**
+	 * @param netAmount The netAmount to set.
+	 */
+	public void setNetAmount(double netAmount) {
+		this.netAmount = netAmount;
+	}
+	/**
+	 * @return Returns the orderDate.
+	 */
+	public Calendar getOrderDate() {
+		return orderDate;
+	}
+	/**
+	 * @param orderDate The orderDate to set.
+	 */
+	public void setOrderDate(Calendar orderDate) {
+		this.orderDate = orderDate;
+	}
+	/**
+	 * @return Returns the orderId.
+	 */
+	public String getOrderId() {
+		return orderId;
+	}
+	/**
+	 * @param orderId The orderId to set.
+	 */
+	public void setOrderId(String orderId) {
+		this.orderId = orderId;
+	}
+	/**
+	 * @return Returns the statusCode.
+	 */
+	public String getStatusCode() {
+		return statusCode;
+	}
+	/**
+	 * @param statusCode The statusCode to set.
+	 */
+	public void setStatusCode(String statusCode) {
+		this.statusCode = statusCode;
+	}
+	/**
+	 * @return Returns the tax.
+	 */
+	public double getTax() {
+		return tax;
+	}
+	/**
+	 * @param tax The tax to set.
+	 */
+	public void setTax(double tax) {
+		this.tax = tax;
+	}
+	/**
+	 * @return Returns the totalAmount.
+	 */
+	public double getTotalAmount() {
+		return totalAmount;
+	}
+	/**
+	 * @param totalAmount The totalAmount to set.
+	 */
+	public void setTotalAmount(double totalAmount) {
+		this.totalAmount = totalAmount;
+	}
+	
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return orderId + ", " + (orderDate == null?null:orderDate.getTime()) + ", " + statusCode + ", " + netAmount + ", " + totalAmount + ", " + tax + ", ";
+	}
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/OrderItem.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/OrderItem.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/OrderItem.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,114 +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.store;
-
-import java.io.Serializable;
-/**
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class OrderItem implements Serializable {
-
-	/**
-     * 
-     */
-    private static final long serialVersionUID = 1L;
-    // <OrderLine position="1" quantity="1">
-	// 		<Product productId="364" title="The 40-Year-Old Virgin " price="29.98"/>
-	// </OrderLine>
-	private int position;
-	private int quantity;
-	private String productId;
-	private String title;
-	private double price;
-	
-	/**
-	 * @return Returns the position.
-	 */
-	public int getPosition() {
-		return position;
-	}
-	/**
-	 * @param position The position to set.
-	 */
-	public void setPosition(int position) {
-		//System.out.println("**** position: " + position);
-		this.position = position;
-	}
-	/**
-	 * @return Returns the price.
-	 */
-	public double getPrice() {
-		return price;
-	}
-	/**
-	 * @param price The price to set.
-	 */
-	public void setPrice(double price) {
-		//System.out.println("**** price: " + price);
-		this.price = price;
-	}
-	/**
-	 * @return Returns the productId.
-	 */
-	public String getProductId() {
-		return productId;
-	}
-	/**
-	 * @param productId The productId to set.
-	 */
-	public void setProductId(String productId) {
-		this.productId = productId;
-	}
-	/**
-	 * @return Returns the quantity.
-	 */
-	public int getQuantity() {
-		return quantity;
-	}
-	/**
-	 * @param quantity The quantity to set.
-	 */
-	public void setQuantity(int quantity) {
-		this.quantity = quantity;
-	}
-	/**
-	 * @return Returns the title.
-	 */
-	public String getTitle() {
-		return title;
-	}
-	/**
-	 * @param title The title to set.
-	 */
-	public void setTitle(String title) {
-		this.title = title;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return position + "," + quantity + "," + productId + "," + title + "," + price;
-		
-	}
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/OrderItem.java (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/OrderItem.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/OrderItem.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/OrderItem.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,114 @@
+/*
+ * 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.store;
+
+import java.io.Serializable;
+/**
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class OrderItem implements Serializable {
+
+	/**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
+    // <OrderLine position="1" quantity="1">
+	// 		<Product productId="364" title="The 40-Year-Old Virgin " price="29.98"/>
+	// </OrderLine>
+	private int position;
+	private int quantity;
+	private String productId;
+	private String title;
+	private double price;
+	
+	/**
+	 * @return Returns the position.
+	 */
+	public int getPosition() {
+		return position;
+	}
+	/**
+	 * @param position The position to set.
+	 */
+	public void setPosition(int position) {
+		//System.out.println("**** position: " + position);
+		this.position = position;
+	}
+	/**
+	 * @return Returns the price.
+	 */
+	public double getPrice() {
+		return price;
+	}
+	/**
+	 * @param price The price to set.
+	 */
+	public void setPrice(double price) {
+		//System.out.println("**** price: " + price);
+		this.price = price;
+	}
+	/**
+	 * @return Returns the productId.
+	 */
+	public String getProductId() {
+		return productId;
+	}
+	/**
+	 * @param productId The productId to set.
+	 */
+	public void setProductId(String productId) {
+		this.productId = productId;
+	}
+	/**
+	 * @return Returns the quantity.
+	 */
+	public int getQuantity() {
+		return quantity;
+	}
+	/**
+	 * @param quantity The quantity to set.
+	 */
+	public void setQuantity(int quantity) {
+		this.quantity = quantity;
+	}
+	/**
+	 * @return Returns the title.
+	 */
+	public String getTitle() {
+		return title;
+	}
+	/**
+	 * @param title The title to set.
+	 */
+	public void setTitle(String title) {
+		this.title = title;
+	}
+	
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return position + "," + quantity + "," + productId + "," + title + "," + price;
+		
+	}
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/StoreAction.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/StoreAction.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/StoreAction.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,71 +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.store;
-
-import java.util.List;
-
-import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
-import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Message;
-
-/**
- * Store action.
- * <p/>
- * This action uses bean value objects that were prepopulated by Smooks in an earlier action on the pipline.
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class StoreAction extends AbstractActionPipelineProcessor {
-
-	public StoreAction(ConfigTree configTree) { }
-	
-	public Message process(Message message) throws ActionProcessingException {
-		
-		StringBuffer results = new StringBuffer();		
-	  // "order", "customer", "orderItem" is set in the smooks config file: from-dvdstore.xml
-		OrderHeader header = (OrderHeader) message.getBody().get("orderHeader"); 
-		Customer customer = (Customer) message.getBody().get("customer");
-		List orderItems = (List) message.getBody().get("orderItemList");
-		// System.out.println("************************\n\n");
-		// System.out.println(header.toString());
-		// System.out.println(customer.toString());
-		// System.out.println(orderItems.toString());
-		// System.out.println("************************\n\n");
-		results.append("Demonstrates Smooks ability to rip the XML into Objects\n");
-		results.append("********** StoreAction - Order Value Objects Populated ***********\n");
-		results.append("Header: " + header + "\n");
-		results.append("Customer: " + customer + "\n");
-		if(orderItems != null) {
-			results.append("Order Items (" + orderItems.size() + "):\n");
-			for(int i = 0; i < orderItems.size(); i++) {
-				results.append("\t" + i + ": " + orderItems.get(i) + "\n");
-			}
-		}
-		results.append("\n****************************************************************** ");
-		message.getBody().add("OrderHeader",header);
-		message.getBody().add("Customer",customer);
-		message.getBody().add("OrderItems",orderItems);
-		// Take this "parsed" and reformatted output
-		message.getBody().add(results.toString());
-		return message;
-	}
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/StoreAction.java (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/StoreAction.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/StoreAction.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/StoreAction.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,71 @@
+/*
+ * 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.store;
+
+import java.util.List;
+
+import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
+import org.jboss.soa.esb.actions.ActionProcessingException;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+
+/**
+ * Store action.
+ * <p/>
+ * This action uses bean value objects that were prepopulated by Smooks in an earlier action on the pipline.
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class StoreAction extends AbstractActionPipelineProcessor {
+
+	public StoreAction(ConfigTree configTree) { }
+	
+	public Message process(Message message) throws ActionProcessingException {
+		
+		StringBuffer results = new StringBuffer();		
+	  // "order", "customer", "orderItem" is set in the smooks config file: from-dvdstore.xml
+		OrderHeader header = (OrderHeader) message.getBody().get("orderHeader"); 
+		Customer customer = (Customer) message.getBody().get("customer");
+		List orderItems = (List) message.getBody().get("orderItemList");
+		// System.out.println("************************\n\n");
+		// System.out.println(header.toString());
+		// System.out.println(customer.toString());
+		// System.out.println(orderItems.toString());
+		// System.out.println("************************\n\n");
+		results.append("Demonstrates Smooks ability to rip the XML into Objects\n");
+		results.append("********** StoreAction - Order Value Objects Populated ***********\n");
+		results.append("Header: " + header + "\n");
+		results.append("Customer: " + customer + "\n");
+		if(orderItems != null) {
+			results.append("Order Items (" + orderItems.size() + "):\n");
+			for(int i = 0; i < orderItems.size(); i++) {
+				results.append("\t" + i + ": " + orderItems.get(i) + "\n");
+			}
+		}
+		results.append("\n****************************************************************** ");
+		message.getBody().add("OrderHeader",header);
+		message.getBody().add("Customer",customer);
+		message.getBody().add("OrderItems",orderItems);
+		// Take this "parsed" and reformatted output
+		message.getBody().add(results.toString());
+		return message;
+	}
+}

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/transforms (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/transforms)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/transforms/from-dvdstore.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/transforms/from-dvdstore.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/transforms/from-dvdstore.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,54 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd"
-        default-target-profile="from:dvdstore">
-
-    <!-- Populate the OrderHeader -->
-	<resource-config selector="order">
-        <resource>org.milyn.javabean.BeanPopulator</resource>
-        <param name="beanId">orderHeader</param>
-		<param name="beanClass">org.jboss.soa.esb.store.OrderHeader</param>
-        <param name="bindings">
-            <binding property="orderId" selector="Order @orderId" />
-            <binding property="orderDate" selector="Order @orderDate" type="LongDate"/>
-            <binding property="statusCode" selector="Order @statusCode" />
-            <binding property="netAmount" selector="Order @netAmount" type="Double" />
-            <binding property="totalAmount" selector="Order @totalAmount" type="Double" />
-            <binding property="tax" selector="Order @tax" type="Double" />
-        </param>
-    </resource-config>
-
-    <!-- Populate the Customer -->
-    <resource-config selector="order customer">
-        <resource>org.milyn.javabean.BeanPopulator</resource>
-		<param name="beanId">customer</param>
-		<param name="beanClass">org.jboss.soa.esb.store.Customer</param>
-        <param name="bindings">
-            <binding property="userName" selector="order customer @userName" />
-            <binding property="firstName" selector="order customer @firstName" />
-            <binding property="lastName" selector="order customer @lastName" />
-            <binding property="state" selector="order customer @state" />
-        </param>
-	</resource-config>
-
-    <!-- Populate the OrderItem list -->
-	<resource-config selector="order orderlines orderline">
-        <resource>org.milyn.javabean.BeanPopulator</resource>
-		<param name="beanId">orderItem</param>
-		<param name="beanClass">org.jboss.soa.esb.store.OrderItem</param>
-		<param name="addToList">true</param>
-        <param name="bindings">
-            <binding property="position"  selector="order orderlines orderline @position" type="Integer" />
-            <binding property="quantity"  selector="order orderlines orderline @quantity" type="Integer" />
-            <binding property="productId" selector="order orderlines orderline product @productId" />
-            <binding property="title"     selector="order orderlines orderline product @title" />
-            <binding property="price"     selector="order orderlines orderline product @price" type="Double" />
-        </param>
-	</resource-config>
-
-
-    <resource-config selector="decoder:LongDate">
-        <resource>org.milyn.javabean.decoders.CalendarDecoder</resource>
-        <param name="format">EEE MMM dd HH:mm:ss z yyyy</param>
-    </resource-config>
-    
-</smooks-resource-list>

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/transforms/from-dvdstore.xml (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/transforms/from-dvdstore.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/transforms/from-dvdstore.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/transforms/from-dvdstore.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,54 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd"
+        default-target-profile="from:dvdstore">
+
+    <!-- Populate the OrderHeader -->
+	<resource-config selector="order">
+        <resource>org.milyn.javabean.BeanPopulator</resource>
+        <param name="beanId">orderHeader</param>
+		<param name="beanClass">org.jboss.soa.esb.store.OrderHeader</param>
+        <param name="bindings">
+            <binding property="orderId" selector="Order @orderId" />
+            <binding property="orderDate" selector="Order @orderDate" type="LongDate"/>
+            <binding property="statusCode" selector="Order @statusCode" />
+            <binding property="netAmount" selector="Order @netAmount" type="Double" />
+            <binding property="totalAmount" selector="Order @totalAmount" type="Double" />
+            <binding property="tax" selector="Order @tax" type="Double" />
+        </param>
+    </resource-config>
+
+    <!-- Populate the Customer -->
+    <resource-config selector="order customer">
+        <resource>org.milyn.javabean.BeanPopulator</resource>
+		<param name="beanId">customer</param>
+		<param name="beanClass">org.jboss.soa.esb.store.Customer</param>
+        <param name="bindings">
+            <binding property="userName" selector="order customer @userName" />
+            <binding property="firstName" selector="order customer @firstName" />
+            <binding property="lastName" selector="order customer @lastName" />
+            <binding property="state" selector="order customer @state" />
+        </param>
+	</resource-config>
+
+    <!-- Populate the OrderItem list -->
+	<resource-config selector="order orderlines orderline">
+        <resource>org.milyn.javabean.BeanPopulator</resource>
+		<param name="beanId">orderItem</param>
+		<param name="beanClass">org.jboss.soa.esb.store.OrderItem</param>
+		<param name="addToList">true</param>
+        <param name="bindings">
+            <binding property="position"  selector="order orderlines orderline @position" type="Integer" />
+            <binding property="quantity"  selector="order orderlines orderline @quantity" type="Integer" />
+            <binding property="productId" selector="order orderlines orderline product @productId" />
+            <binding property="title"     selector="order orderlines orderline product @title" />
+            <binding property="price"     selector="order orderlines orderline product @price" type="Double" />
+        </param>
+	</resource-config>
+
+
+    <resource-config selector="decoder:LongDate">
+        <resource>org.milyn.javabean.decoders.CalendarDecoder</resource>
+        <param name="format">EEE MMM dd HH:mm:ss z yyyy</param>
+    </resource-config>
+    
+</smooks-resource-list>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/transforms/from-petstore.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/transforms/from-petstore.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/transforms/from-petstore.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,52 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd"
-        default-target-profile="from:petstore">
-
-    <!-- Populate the OrderHeader -->
-	<resource-config selector="order">
-        <resource>org.milyn.javabean.BeanPopulator</resource>
-        <param name="beanId">orderHeader</param>
-		<param name="beanClass">org.jboss.soa.esb.store.OrderHeader</param>
-        <param name="bindings">
-            <binding property="orderId" selector="Order @orderId" />
-            <binding property="orderDate" selector="Order @orderDate" type="LongDate"/>
-            <binding property="statusCode" selector="Order @status" />            
-            <binding property="totalAmount" selector="Order @totalPrice" type="Double" />            
-        </param>
-    </resource-config>
-
-    <!-- Populate the Customer -->
-    <resource-config selector="order">
-        <resource>org.milyn.javabean.BeanPopulator</resource>
-		<param name="beanId">customer</param>
-		<param name="beanClass">org.jboss.soa.esb.store.Customer</param>
-        <param name="bindings">
-            <binding property="userName" selector="order @username" />
-            <binding property="firstName" selector="order @shipToFirstName" />
-            <binding property="lastName" selector="order @shipToLastName" />
-            <binding property="state" selector="order @shipState" />
-        </param>
-	</resource-config>
-
-    <!-- Populate the OrderItem list -->
-	<resource-config selector="order LineItems LineItem">
-        <resource>org.milyn.javabean.BeanPopulator</resource>
-		<param name="beanId">orderItem</param>
-		<param name="beanClass">org.jboss.soa.esb.store.OrderItem</param>
-		<param name="addToList">true</param>
-        <param name="bindings">
-            <binding property="position"  selector="LineItem @lineNumber" type="Integer" />
-            <binding property="quantity"  selector="LineItem @quantity" type="Integer" />
-            <binding property="productId" selector="LineItem Item @itemId" />
-            <binding property="price"     selector="LineItem Item @listPrice" type="Double" />
-            <binding property="title"     selector="LineItem Item @name" />
-        </param>
-	</resource-config>
-
-
-    <resource-config selector="decoder:LongDate">
-        <resource>org.milyn.javabean.decoders.CalendarDecoder</resource>
-        <param name="format">EEE MMM dd HH:mm:ss z yyyy</param>
-    </resource-config>
-    
-</smooks-resource-list>

Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/transforms/from-petstore.xml (from rev 16648, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR1/product/samples/quickstarts/bpm_orchestration4/transforms/from-petstore.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/transforms/from-petstore.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration4/transforms/from-petstore.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -0,0 +1,52 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd"
+        default-target-profile="from:petstore">
+
+    <!-- Populate the OrderHeader -->
+	<resource-config selector="order">
+        <resource>org.milyn.javabean.BeanPopulator</resource>
+        <param name="beanId">orderHeader</param>
+		<param name="beanClass">org.jboss.soa.esb.store.OrderHeader</param>
+        <param name="bindings">
+            <binding property="orderId" selector="Order @orderId" />
+            <binding property="orderDate" selector="Order @orderDate" type="LongDate"/>
+            <binding property="statusCode" selector="Order @status" />            
+            <binding property="totalAmount" selector="Order @totalPrice" type="Double" />            
+        </param>
+    </resource-config>
+
+    <!-- Populate the Customer -->
+    <resource-config selector="order">
+        <resource>org.milyn.javabean.BeanPopulator</resource>
+		<param name="beanId">customer</param>
+		<param name="beanClass">org.jboss.soa.esb.store.Customer</param>
+        <param name="bindings">
+            <binding property="userName" selector="order @username" />
+            <binding property="firstName" selector="order @shipToFirstName" />
+            <binding property="lastName" selector="order @shipToLastName" />
+            <binding property="state" selector="order @shipState" />
+        </param>
+	</resource-config>
+
+    <!-- Populate the OrderItem list -->
+	<resource-config selector="order LineItems LineItem">
+        <resource>org.milyn.javabean.BeanPopulator</resource>
+		<param name="beanId">orderItem</param>
+		<param name="beanClass">org.jboss.soa.esb.store.OrderItem</param>
+		<param name="addToList">true</param>
+        <param name="bindings">
+            <binding property="position"  selector="LineItem @lineNumber" type="Integer" />
+            <binding property="quantity"  selector="LineItem @quantity" type="Integer" />
+            <binding property="productId" selector="LineItem Item @itemId" />
+            <binding property="price"     selector="LineItem Item @listPrice" type="Double" />
+            <binding property="title"     selector="LineItem Item @name" />
+        </param>
+	</resource-config>
+
+
+    <resource-config selector="decoder:LongDate">
+        <resource>org.milyn.javabean.decoders.CalendarDecoder</resource>
+        <param name="format">EEE MMM dd HH:mm:ss z yyyy</param>
+    </resource-config>
+    
+</smooks-resource-list>

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/conf/base-build.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/conf/base-build.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -68,7 +68,7 @@
 
     <target name="messaging-config">
         <property name="org.jboss.esb.server.deploy.dir" 
-            value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
+            value="${org.jboss.esb.server.server}/deploy"/>
 
         <condition property="messaging.present">
             <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging"/>
@@ -115,18 +115,42 @@
 <!-- ==================================================================== -->
 <!-- This section handles dependencies specific to each distribution.     -->
 <!-- It configures the following properties                               -->
-<!-- org.jboss.esb.server.config, org.jboss.esb.server.home and           -->
-<!-- deployment-classpath                                                 -->
+<!-- org.jboss.esb.server.config, org.jboss.esb.server.home,              -->
+<!-- org.jboss.esb.server.server and deployment-classpath                 -->
 <!-- ==================================================================== -->
 
 	<!-- Configure dependencies for jbossesb and source distributions -->
-	<target name="jbossesb-dependencies" if="build.jbossesb">
-		<condition property="base.jbossesb"
-			value="${product.dir}/build/jbossesb"
-			else="${product.dir}">
-			<isset property="hierarchy.source"/>
-		</condition>
+	<target name="jbossesb-dependencies" depends="jbossesb-source-dependencies, jbossesb-server-dependencies">
+		<property name="org.jboss.esb.server.server" location="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
 
+		<path id="deployment-classpath">
+			<fileset dir="${org.jboss.esb.server.server}/deploy/jbossesb.sar/lib" includes="*.jar"/>
+			<!-- jbossesb config -->
+			<fileset dir="${org.jboss.esb.server.server}/deploy/jbossesb.esb" includes="*.jar"/>
+			<pathelement location="${org.jboss.esb.server.server}/deploy/jbossesb.esb"/>
+			<!-- jbpm config -->
+			<fileset dir="${org.jboss.esb.server.server}/deploy/jbpm.esb" includes="*.jar"/>
+			<pathelement location="${org.jboss.esb.server.server}/deploy/jbpm.esb"/>
+			<pathelement location="${org.jboss.esb.server.server}/lib/cglib.jar"/>
+			<!-- smooks config -->
+			<fileset dir="${org.jboss.esb.server.server}/deploy/smooks.esb" includes="*.jar"/>
+			<pathelement location="${org.jboss.esb.server.server}/deploy/smooks.esb"/>
+			<!-- jbrules config -->
+			<fileset dir="${org.jboss.esb.server.server}/deploy/jbrules.esb" includes="*.jar"/>
+			<pathelement location="${org.jboss.esb.server.server}/deploy/jbrules.esb"/>
+			<!-- spring config -->
+			<fileset dir="${org.jboss.esb.server.server}/deploy/spring.esb" includes="*.jar"/>
+			<pathelement location="${org.jboss.esb.server.server}/deploy/spring.esb"/>
+			<!-- soap config -->
+			<fileset dir="${org.jboss.esb.server.server}/deploy/soap.esb" includes="*.jar"/>
+			<pathelement location="${org.jboss.esb.server.server}/deploy/soap.esb"/>
+			<!-- general libs -->
+			<pathelement location="${org.jboss.esb.server.server}/lib/commons-logging.jar"/>
+			<pathelement location="${org.jboss.esb.server.server}/lib/jboss-system.jar"/>
+		</path>
+	</target>
+
+	<target name="jbossesb-source-dependencies" if="build.jbossesb">
 		<condition 
 			property="org.jboss.esb.server.config" 
 			value="${quickstart.org.jboss.esb.server.config}">
@@ -158,60 +182,13 @@
 
 		<fail unless="org.jboss.esb.server.home" message="Cannot determine target deployment, please check quickstarts.properties or deployment.properties"/>
 
-		<path id="deployment-classpath">
-			<fileset dir="${base.jbossesb}/lib" includes="*.jar"/>
-			<fileset dir="${base.jbossesb}/lib/ext" includes="*.jar"/>
-			<!-- jbossesb config -->
-			<fileset dir="${base.jbossesb}/lib/jbossesb.esb" includes="*.jar"/>
-			<pathelement location="${base.jbossesb}/lib/jbossesb.esb"/>
-			<!-- jbpm config -->
-			<fileset dir="${base.jbossesb}/lib/jbpm.esb" includes="*.jar"/>
-			<pathelement location="${base.jbossesb}/lib/jbpm.esb"/>
-			<!-- smooks config -->
-			<fileset dir="${base.jbossesb}/lib/smooks.esb" includes="*.jar"/>
-			<pathelement location="${base.jbossesb}/lib/smooks.esb"/>
-			<!-- jbrules config -->
-			<fileset dir="${base.jbossesb}/lib/jbrules.esb" includes="*.jar"/>
-			<pathelement location="${base.jbossesb}/lib/jbrules.esb"/>
-			<!-- spring config -->
-			<fileset dir="${base.jbossesb}/lib/spring.esb" includes="*.jar"/>
-			<pathelement location="${base.jbossesb}/lib/spring.esb"/>
-			<!-- soap config -->
-			<fileset dir="${base.jbossesb}/lib/soap.esb" includes="*.jar"/>
-			<pathelement location="${base.jbossesb}/lib/soap.esb"/>
-		</path>
+		<property name="org.jboss.esb.server" location="${product.dir}/server/${org.jboss.esb.server.config}"/>
 	</target>
 
 	<!-- Configure dependencies for jbossesb-server distribution -->
 	<target name="jbossesb-server-dependencies" if="hierarchy.jbossesb-server">
 		<property name="org.jboss.esb.server.home" value="${product.dir}"/> 
 		<property name="org.jboss.esb.server.config" value="default"/>
-
-		<path id="deployment-classpath">
-			<fileset dir="${product.dir}/server/default/deploy/jbossesb.sar/lib" includes="*.jar"/>
-			<!-- jbossesb config -->
-			<fileset dir="${product.dir}/server/default/deploy/jbossesb.esb" includes="*.jar"/>
-			<pathelement location="${product.dir}/server/default/deploy/jbossesb.esb"/>
-			<!-- jbpm config -->
-			<fileset dir="${product.dir}/server/default/deploy/jbpm.esb" includes="*.jar"/>
-			<pathelement location="${product.dir}/server/default/deploy/jbpm.esb"/>
-			<pathelement location="${product.dir}/server/default/lib/cglib.jar"/>
-			<!-- smooks config -->
-			<fileset dir="${product.dir}/server/default/deploy/smooks.esb" includes="*.jar"/>
-			<pathelement location="${product.dir}/server/default/deploy/smooks.esb"/>
-			<!-- jbrules config -->
-			<fileset dir="${product.dir}/server/default/deploy/jbrules.esb" includes="*.jar"/>
-			<pathelement location="${product.dir}/server/default/deploy/jbrules.esb"/>
-			<!-- spring config -->
-			<fileset dir="${product.dir}/server/default/deploy/spring.esb" includes="*.jar"/>
-			<pathelement location="${product.dir}/server/default/deploy/spring.esb"/>
-			<!-- soap config -->
-			<fileset dir="${product.dir}/server/default/deploy/soap.esb" includes="*.jar"/>
-			<pathelement location="${product.dir}/server/default/deploy/soap.esb"/>
-			<!-- general libs -->
-			<pathelement location="${product.dir}/server/default/lib/commons-logging.jar"/>
-			<pathelement location="${product.dir}/lib/jboss-system.jar"/>
-		</path>
 	</target>
 	
 <!-- ==================================================================== -->
@@ -220,12 +197,13 @@
 <!-- compile-classpath, exec-classpath                                    -->
 <!-- ==================================================================== -->
 
-	<target name="dependencies" depends="check-jbossesb-dist, qslib-dependencies, non-qslib-dependencies, jbossesb-dependencies, jbossesb-server-dependencies, messaging-config, messaging-dependencies, jbossmq-dependencies, quickstart-specific-dependencies">
+	<target name="dependencies" depends="check-jbossesb-dist, qslib-dependencies, non-qslib-dependencies, jbossesb-dependencies, messaging-config, messaging-dependencies, jbossmq-dependencies, quickstart-specific-dependencies">
     	
 		<path id="compile-classpath">
 			<path refid="quickstart-dependencies-classpath" />
 			<path refid="quickstart-lib-classpath" />
 			<fileset dir="${org.jboss.esb.server.home}/client" includes="hibernate-client.jar" /> <!-- Required for jbpm Client Code. -->
+			<fileset dir="${org.jboss.esb.server.server}/lib" includes="hibernate3.jar"/> <!-- Required for the helloworld_hibernate_action quickstart -->
 			<path refid="deployment-classpath" />
 			<fileset dir="${org.jboss.esb.server.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. -->
 		</path>
@@ -234,12 +212,11 @@
 			<pathelement location="." />
 			<pathelement location="${classes}" />
 			<pathelement location="${basedir}/src" />
-			<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib" includes="jboss-remoting.jar jboss-j2ee.jar" /> <!-- Required for JMS Client Code. -->
-			<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib" includes="hibernate3.jar commons-collections.jar hsqldb.jar" /> <!-- Required for jbpm Client Code. -->
-			<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib" includes="bsh.jar" /> <!-- Required for scripting Client Code. -->
+			<fileset dir="${org.jboss.esb.server.server}/lib" includes="jboss-remoting.jar jboss-j2ee.jar jboss-messaging-client.jar" /> <!-- Required for JMS Client Code. -->
+			<fileset dir="${org.jboss.esb.server.server}/lib" includes="hibernate3.jar commons-collections.jar hsqldb.jar" /> <!-- Required for jbpm Client Code. -->
+			<fileset dir="${org.jboss.esb.server.server}/lib" includes="bsh.jar" /> <!-- Required for scripting Client Code. -->
 			<fileset dir="${org.jboss.esb.server.home}/lib/endorsed" includes="*.jar" /> <!-- Required for JMS Client Code. -->
-			<!--fileset dir="${org.jboss.esb.server.home}/client" includes="*.jar" /--> <!-- Required for JMS Client Code. -->
-			<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jboss-aop-jdk50.deployer" includes="jboss-aop-jdk50.jar" /> <!-- Required for JMS Client Code. -->
+			<fileset dir="${org.jboss.esb.server.server}/deploy/jboss-aop-jdk50.deployer" includes="jboss-aop-jdk50.jar" /> <!-- Required for JMS Client Code. -->
 			<path refid="compile-classpath" />
             <pathelement location="${pwd}/anttasks/classes" />
 		</path>
@@ -440,7 +417,7 @@
 <!-- ==================================================================== -->
 
     <target name="assert-ws-available">
-        <available property="ws-spi" file="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/jbossws-spi.jar"/>
+        <available property="ws-spi" file="${org.jboss.esb.server.server}/lib/jbossws-spi.jar"/>
     	<available property="ws-intros" file="${org.jboss.esb.server.deploy.dir}/jbossws.sar/jboss-jaxb-intros.jar"/>
     	
     	<condition property="ws-available">

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_file_notifier/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_file_notifier/build.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_file_notifier/build.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -30,7 +30,7 @@
 	<target name="sendesb" depends="compile"
 		description="Will send an esb Message">
 		<echo>Runs Test ESB Message Sender</echo>
-		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.helloworld.test.SendEsbMessage" failonerror="true">
+		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.helloworldfilenotifier.test.SendEsbMessage" failonerror="true">
 			<arg value="FirstServiceESB"/> <!--  service category -->
 			<arg value="SimpleListener"/>  <!--  service name -->
 			<arg value="Hello World - Straight to ESB listener - no Gateway"/> <!--  Message text -->

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_file_notifier/jboss-esb-unfiltered.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_file_notifier/jboss-esb-unfiltered.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_file_notifier/jboss-esb-unfiltered.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -54,7 +54,7 @@
                               maxThreads="1"
                 />
             </listeners>
-            <actions>
+            <actions mep="OneWay">
                	<action name="routeAction"  class="org.jboss.soa.esb.actions.StaticRouter">
 			<property name="destinations">
 				<route-to service-category="routerToDisplay" service-name="DisplayRouterListener" /> 

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_file_notifier/src/org/jboss/soa/esb/samples/quickstart/helloworldfilenotifier/MyJMSListenerAction.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_file_notifier/src/org/jboss/soa/esb/samples/quickstart/helloworldfilenotifier/MyJMSListenerAction.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_file_notifier/src/org/jboss/soa/esb/samples/quickstart/helloworldfilenotifier/MyJMSListenerAction.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -30,7 +30,6 @@
   protected ConfigTree	_config;
 	  
   public MyJMSListenerAction(ConfigTree config) { _config = config; } 
-
   
   public Message displayMessage(Message message) throws Exception{
 		
@@ -38,8 +37,5 @@
 		  System.out.println("Body: " + message.getBody().get());
 		  System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
 		  return message; 
-        		
 	}
-    
-	
 }
\ No newline at end of file

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_file_notifier/src/org/jboss/soa/esb/samples/quickstart/helloworldfilenotifier/test/SendEsbMessage.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_file_notifier/src/org/jboss/soa/esb/samples/quickstart/helloworldfilenotifier/test/SendEsbMessage.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_file_notifier/src/org/jboss/soa/esb/samples/quickstart/helloworldfilenotifier/test/SendEsbMessage.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -58,10 +58,9 @@
     	esbMessage.getHeader().setCall(call);
     	
     	// set body contents with args[2], and send
-    	esbMessage.getBody().add(args[2].getBytes());
+    	esbMessage.getBody().add(args[2]);
     	
         new ServiceInvoker(args[0], args[1]).deliverAsync(esbMessage);
-
     }
     
 }
\ No newline at end of file

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/load_generator/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/load_generator/build.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/load_generator/build.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -5,26 +5,25 @@
 		${line.separator}
 	</description>
 
-	<property environment="env"/>
-
 	<!-- Import the base Ant build script... -->
 	<import file="../conf/base-build.xml" />
-	<property file="${product.dir}/install/deployment.properties" />
 
-	<path id="groovy.classpath">
-		<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy">
-			<include name="jboss-aop-jdk50**/*.jar"/>
-		</fileset>
-		<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib" includes="*.jar"/>
-		<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib" includes="*.jar" />
-		<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib" includes="commons-*.jar" />
-		<fileset dir="${org.jboss.esb.server.home}/client" includes="jbossall-client.jar" />
-		<fileset dir="${org.jboss.esb.server.home}/lib/endorsed" includes="xercesImpl.jar" />
-	</path>
+	<target name="init-groovy" depends="dependencies">
+		<path id="groovy.classpath">
+			<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy">
+				<include name="jboss-aop-jdk50**/*.jar"/>
+			</fileset>
+			<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib" includes="*.jar"/>
+			<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib" includes="*.jar" />
+			<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib" includes="commons-*.jar" />
+			<fileset dir="${org.jboss.esb.server.home}/client" includes="jbossall-client.jar" />
+			<fileset dir="${org.jboss.esb.server.home}/lib/endorsed" includes="xercesImpl.jar" />
+		</path>
 
-	<taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="groovy.classpath" />
+		<taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="groovy.classpath" />
+	</target>
 
-	<target name="compile-churn" depends="compile" description="compile groovy to bytecode">
+	<target name="compile-churn" depends="compile, init-groovy" description="compile groovy to bytecode">
 		<mkdir dir="load_generator_classes" />
 		<copy todir="load_generator_classes" overwrite="true">
 			<fileset dir="${basedir}/scripts/">

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_producer/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_producer/jboss-esb.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_producer/jboss-esb.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -37,7 +37,7 @@
 
                 <jms-listener name="JMS-ESBListener" busidref="quickstartEsbChannel" maxThreads="1"/>
             </listeners>
-            <actions>
+            <actions mep="RequestResponse">
                 <action name="print-before" class="org.jboss.soa.esb.actions.SystemPrintln">
                     <property name="message"
                               value="[Quickstart_webservice_producer] BEFORE invoking jbossws endpoint"/>

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_producer/src/org/jboss/soa/esb/samples/quickstart/webserviceproducer/test/SendMessage.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_producer/src/org/jboss/soa/esb/samples/quickstart/webserviceproducer/test/SendMessage.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_producer/src/org/jboss/soa/esb/samples/quickstart/webserviceproducer/test/SendMessage.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -107,11 +107,14 @@
     	SendMessage sm = new SendMessage();
         String msg = getMessage("01");
 
+        sm.sendMessageToJBRListener("http", 8765, msg);        
+        /*
         String protocol = args[0];
         if(protocol.equals("jms")) {
             sm.sendMessageOverJMS(msg);
         } else {
             sm.sendMessageToJBRListener(protocol, Integer.parseInt(args[1]), msg);
         }
+        */
     }
 }
\ No newline at end of file

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanBroker.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanBroker.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanBroker.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -101,7 +101,6 @@
         return customer;
     }
 
-
     //uses plain JMS to send a text message
     private void sendToJMSBank(Customer customer) {
         try {
@@ -126,7 +125,7 @@
         }
     }
 
-    private int sendToCreditAgency(Customer customer) {
+    private int sendToCreditAgency(Customer customer) {d
         Message message = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
         Message replyMessage;
         int score = 0;
@@ -135,11 +134,11 @@
             logger.debug("sending to credit agency");
 
             //set the customer inside the message - csv format for now to test
-            message.getBody().setByteArray(customer.getCSV().getBytes());
+            message.getBody().add(customer.getCSV());
             replyMessage = serviceInvoker.deliverSync(message, 5000);
             if (replyMessage != null) {
-                logger.info("received reply from creditAgency action: " + replyMessage.getBody().getByteArray());
-                String xx = new String(replyMessage.getBody().getByteArray());
+                logger.info("received reply from creditAgency action: " + replyMessage.getBody().get());
+                String xx = (String) replyMessage.getBody().get();
                 score = Integer.parseInt(xx.trim());
             } else {
                 logger.debug("reply not received from credit agency - setting a value of 5");

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/actions/BankResponseActions.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/actions/BankResponseActions.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/actions/BankResponseActions.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -36,12 +36,12 @@
 	public BankResponseActions(ConfigTree config) { _config = config; }
 	
 	public Message processResponseFromJMSBank(Message message) throws Exception {
-		System.out.println("Got the message from the JMS bank: " + message.getBody().getByteArray());
+		System.out.println("Got the message from the JMS bank: " + message.getBody().get());
 		
-		_logger.debug("message received: \n" + new String(message.getBody().getByteArray()));
+		_logger.debug("message received: \n" + message.getBody().get());
 		
 		//get the response from the bank and set it in the customer
-		ConfigTree tree = ConfigTree.fromXml(new String(message.getBody().getByteArray()));		
+		ConfigTree tree = ConfigTree.fromXml((String) message.getBody().get());		
 		String quoteID = tree.getFirstTextChild("quoteId");
 		String rate = tree.getFirstTextChild("interestRate");
 		String errorCode = tree.getFirstTextChild("errorCode");
@@ -50,8 +50,6 @@
 		_logger.debug("info using for email: " + quoteID +" "+rate+" "+errorCode+" "+ssn+" "+email);
 		//_logger.debug("email address found: " + email);
 		
-		
-		
 		_logger.debug("preparing to send the quote response via email to customer");
 		ProcessEmail procEmail = new ProcessEmail(email, quoteID, rate, errorCode, ssn);
 		procEmail.sendEmail();

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/actions/CreditAgencyActions.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/actions/CreditAgencyActions.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/actions/CreditAgencyActions.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -44,10 +44,9 @@
 		
 		_logger.debug("message received: " + Util.serialize(message) );		
 		
-		String csvData = new String(message.getBody().getByteArray());
+		String csvData = (String) message.getBody().get();
 		_logger.debug("csv data received: " + csvData);
 		
-		
 		//generate a random score between 1 and 10
 		Random rand = new Random();
 		int n = 10;
@@ -56,7 +55,7 @@
 		//send back the reply
                 Message replyMessage = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);		
 		_logger.info("CreditAgency sending back a credit score of " + score);
-		replyMessage.getBody().setByteArray(Integer.toString(score).getBytes());
+		replyMessage.getBody().add(Integer.toString(score));
 		
 		return replyMessage;
 	}
@@ -64,9 +63,7 @@
 	public Message debugMessage(Message message) throws Exception{
 		
 		_logger.debug("message received in processCreditRequest with message: " + Util.serialize(message));
-
-		
-		
+	
 		return message;
 	}
 }

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -33,7 +33,7 @@
 
 import org.apache.log4j.Logger;
 import org.jboss.internal.soa.esb.message.urigen.DefaultMessageURIGenerator;
-import org.jboss.internal.soa.esb.thirdparty.Base64;
+import org.jboss.internal.soa.esb.util.Encoding;
 import org.jboss.soa.esb.Service;
 import org.jboss.soa.esb.client.ServiceInvoker;
 import org.jboss.soa.esb.common.Environment;
@@ -264,7 +264,7 @@
             
             while (rs.next()) {
                 URI uid = new URI(rs.getString(1));
-                Message msg = Util.deserialize((Serializable) Base64.decodeToObject( rs.getString(2)));
+                Message msg = Util.deserialize((Serializable) Encoding.decodeToObject( rs.getString(2)));
                 messages.put(uid, msg);
             }
             rs.close();
@@ -395,7 +395,7 @@
         ResultSet rs = selectStmt.executeQuery();
         if (rs.next()) {
             try {
-                message = Util.deserialize((Serializable) Base64.decodeToObject(rs.getString("message")));
+                message = Util.deserialize((Serializable) Encoding.decodeToObject(rs.getString("message")));
             } catch (Exception e) {
                 throw new MessageStoreException(e);
             }
@@ -416,7 +416,7 @@
         ResultSet rs = selectStmt.executeQuery();
         if (rs.next()) {
             try {
-                message = Util.deserialize((Serializable) Base64.decodeToObject(rs.getString("message")));
+                message = Util.deserialize((Serializable) Encoding.decodeToObject(rs.getString("message")));
             } catch (Exception e) {
                 throw new MessageStoreException(e);
             }
@@ -447,7 +447,7 @@
         ps.setString(1, uid.toString());
         ps.setString(2, message.getType().toString());
         try {
-            String messageString = Base64.encodeObject(Util.serialize(message));
+            String messageString = Encoding.encodeObject(Util.serialize(message));
             ps.setString(3, messageString);
         } catch (Exception e) {
             throw new MessageStoreException(e);

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/Constants.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/Constants.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/Constants.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -86,6 +86,7 @@
 	public static final String ACTORS_TAG					="actors";
 	public static final String ONE_ACTOR_TAG				="actor";
 	public static final String OVERWRITE_SWIMLANE_TAG		="overwrite-swimlane";
+    public static final String KEY_TAG                      ="key";
 
 	public enum OpCode
 	{

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/NewProcessInstanceFacade.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/NewProcessInstanceFacade.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/NewProcessInstanceFacade.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -51,6 +51,7 @@
 		_start		= start;
 		_actor		= config.getAttribute(Constants.ONE_ACTOR_TAG);
 		_processName= config.getAttribute(Constants.PROCESS_DEFINITION_NAME_TAG);
+        _keyPath    = config.getAttribute(Constants.KEY_TAG);
 		String aux	= config.getAttribute(Constants.PROCESS_DEFINITION_ID_TAG);
 		if (null!=aux)
 			try {_processId = Long.parseLong(aux); }

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/resources/META-INF/deployment.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/resources/META-INF/deployment.xml	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/resources/META-INF/deployment.xml	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jbossesb-deployment>
   <depends>jboss.esb:deployment=jbossesb.esb</depends>
+  <depends>jboss.jca:service=DataSourceBinding,name=JbpmDS</depends>
 </jbossesb-deployment>

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbrules/src/main/resources/XPathLanguage.dsl
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbrules/src/main/resources/XPathLanguage.dsl	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbrules/src/main/resources/XPathLanguage.dsl	2007-11-16 18:24:43 UTC (rev 16649)
@@ -1,7 +1,7 @@
 #JBossESB Content Based Routing using XPath DSL
-[when]xpathMatch "{xpath}"=msg : Message( type == MessageType.JBOSS_XML ) and eval( org.jboss.internal.soa.esb.services.routing.cbr.DslHelper.xmlContentMatches(msg, "{xpath}") )
-[when]xpathEquals "{xpath}", "{value}"=msg : Message( type == MessageType.JBOSS_XML ) and eval( org.jboss.internal.soa.esb.services.routing.cbr.DslHelper.xmlContentEquals(msg, "{xpath}", "{value}") )
-[when]xpathGreaterThan "{xpath}", "{value}"=msg : Message( type == MessageType.JBOSS_XML ) and eval( org.jboss.internal.soa.esb.services.routing.cbr.DslHelper.xmlContentGreaterThan(msg, "{xpath}", "{value}") )
-[when]xpathLessThan "{xpath}", "{value}"=msg : Message( type == MessageType.JBOSS_XML ) and eval( org.jboss.internal.soa.esb.services.routing.cbr.DslHelper.xmlContentLessThan(msg, "{xpath}", "{value}") )
+[when]xpathMatch "{xpath}"=msg : org.jboss.soa.esb.message.Message( type == org.jboss.soa.esb.message.format.MessageType.JBOSS_XML ) and eval( org.jboss.internal.soa.esb.services.routing.cbr.DslHelper.xmlContentMatches(msg, "{xpath}") )
+[when]xpathEquals "{xpath}", "{value}"=msg : org.jboss.soa.esb.message.Message( type == org.jboss.soa.esb.message.format.MessageType.JBOSS_XML ) and eval( org.jboss.internal.soa.esb.services.routing.cbr.DslHelper.xmlContentEquals(msg, "{xpath}", "{value}") )
+[when]xpathGreaterThan "{xpath}", "{value}"=msg : org.jboss.soa.esb.message.Message( type == org.jboss.soa.esb.message.format.MessageType.JBOSS_XML ) and eval( org.jboss.internal.soa.esb.services.routing.cbr.DslHelper.xmlContentGreaterThan(msg, "{xpath}", "{value}") )
+[when]xpathLessThan "{xpath}", "{value}"=msg : org.jboss.soa.esb.message.Message( type == org.jboss.soa.esb.message.format.MessageType.JBOSS_XML ) and eval( org.jboss.internal.soa.esb.services.routing.cbr.DslHelper.xmlContentLessThan(msg, "{xpath}", "{value}") )
 [then]Log : "{message}"=System.out.println("{message}");
 [then]Destination : "{message}"=destinations.add("{message}");

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

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/lib/ext/build-time/jbossws-jboss42.jar
===================================================================
(Binary files differ)

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

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPProcessor.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPProcessor.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPProcessor.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -19,31 +19,31 @@
  */
 package org.jboss.soa.esb.actions.soap;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.Set;
-
-import javax.management.ObjectName;
-
 import org.jboss.internal.soa.esb.publish.Publish;
 import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.listeners.message.MessageDeliverException;
 import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
 import org.jboss.soa.esb.actions.ActionProcessingException;
 import org.jboss.soa.esb.actions.ActionUtils;
 import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.listeners.message.MessageDeliverException;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.message.MessagePayloadProxy;
 import org.jboss.soa.esb.message.ResponseHeader;
 import org.jboss.soa.esb.message.body.content.BytesBody;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
 import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.BasicInvocationContext;
+import org.jboss.wsf.spi.invocation.InvocationContext;
 import org.jboss.wsf.spi.invocation.RequestHandler;
-import org.jboss.wsf.spi.invocation.InvocationContext;
 import org.jboss.wsf.spi.management.EndpointRegistry;
 import org.jboss.wsf.spi.management.EndpointRegistryFactory;
 
+import javax.management.ObjectName;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.Set;
+
 /**
  * JBoss Webservices SOAP Processor.
  * <p/>
@@ -136,7 +136,7 @@
             messageTL.set(message);
 
             RequestHandler requestHandler = endpoint.getRequestHandler();
-            InvocationContext invocationContext = new BasicInvocationContext();
+            InvocationContext invocationContext = new InvocationContext();
             ByteArrayOutputStream os = new ByteArrayOutputStream();
 
             requestHandler.handleRequest(endpoint, new ByteArrayInputStream(soapMessage), os, invocationContext);
@@ -215,7 +215,9 @@
      * @return The service endpoint, or null if the endpoint is not found.
      */
     protected static Endpoint getServiceEndpoint(String endpointName) {
-        EndpointRegistry registry = EndpointRegistryFactory.getEndpointRegistry();
+        SPIProvider spiProv = SPIProviderResolver.getInstance().getProvider();
+        EndpointRegistryFactory factory =  spiProv.getSPI(EndpointRegistryFactory.class);
+        EndpointRegistry registry = factory.getEndpointRegistry();
         Set<ObjectName> objectNames = registry.getEndpoints();
 
         for (ObjectName objectName : objectNames) {

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/WebserviceContractPublisher.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/WebserviceContractPublisher.java	2007-11-16 16:59:08 UTC (rev 16648)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/WebserviceContractPublisher.java	2007-11-16 18:24:43 UTC (rev 16649)
@@ -19,32 +19,33 @@
  */
 package org.jboss.soa.esb.actions.soap;
 
-import java.io.*;
-import java.net.URI;
-import java.util.List;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-import javax.servlet.http.HttpServletRequest;
-
+import org.apache.log4j.Logger;
 import org.jboss.internal.soa.esb.publish.ActionContractPublisher;
 import org.jboss.internal.soa.esb.publish.ContractInfo;
+import org.jboss.internal.soa.esb.util.StreamUtils;
 import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.addressing.EPR;
 import org.jboss.soa.esb.listeners.config.xbeanmodel.ActionDocument;
 import org.jboss.soa.esb.listeners.config.xbeanmodel.PropertyDocument;
-import org.jboss.soa.esb.addressing.EPR;
 import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.InvocationContext;
-import org.jboss.wsf.spi.invocation.RequestHandler;
-import org.jboss.ws.core.server.ServletRequestContext;
-import org.xml.sax.SAXException;
-import org.apache.log4j.Logger;
 import org.milyn.Smooks;
 import org.milyn.container.standalone.StandaloneExecutionContext;
+import org.xml.sax.SAXException;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.net.URI;
+import java.net.URL;
+import java.util.List;
+
 /**
  * Contract publisher for a Webservice endpoint.
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
@@ -103,17 +104,13 @@
             String targetServiceCat = servletRequest.getParameter("serviceCat");
             String targetServiceName = servletRequest.getParameter("serviceName");
             String targetProtocol = servletRequest.getParameter("protocol");
-            RequestHandler requestHandler = endpoint.getRequestHandler();
-            ByteArrayOutputStream wsdlStream =  new ByteArrayOutputStream();
-            InvocationContext invocationContext;
 
-            invocationContext = new ServletRequestContext(null, servletRequest, null);
-
             try {
                 // Generate the WSDL...
-                requestHandler.handleWSDLRequest(endpoint, wsdlStream, invocationContext);
-                String wsdl = updateWsdl(new String(wsdlStream.toByteArray()), epr, targetServiceCat, targetServiceName, targetProtocol);
+                String wsdl = getEndpointWsdl(endpoint);
 
+                wsdl = updateWsdl(wsdl, epr, targetServiceCat, targetServiceName, targetProtocol);
+
                 return new ContractInfo("text/xml", wsdl);
             } catch (Exception e) {
                 logger.error("Failed to load contract information from JBossWS Endpoint '" + endpointName + "'.", e);
@@ -126,6 +123,26 @@
     }
 
     /**
+     * Get the endpoints WSSDL from the JBossWS container.
+     * </p>
+     * See http://jira.jboss.com/jira/browse/JBWS-1909
+     *
+     * @param endpoint The endpoint.
+     * @return The WSDL.
+     * @throws IOException Error reading wsdl.
+     */
+    private String getEndpointWsdl(Endpoint endpoint) throws IOException {
+        URL endpointWsdlAddress = new URL(endpoint.getAddress() + "?wsdl");
+        InputStream wsdlStream = endpointWsdlAddress.openStream();
+
+        try {
+            return StreamUtils.readStreamString(wsdlStream, "UTF-8");
+        } finally {
+            wsdlStream.close();
+        }
+    }
+
+    /**
      * Update the supplied wsdl to take account of the ESB endpoint proxying of the JBossWS
      * invocation, as well as the fact that the transport may be different.
      *

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/configeditor/editor/docs/JBossESBConfigEditor.pdf
===================================================================
(Binary files differ)




More information about the jboss-svn-commits mailing list