[jboss-svn-commits] JBL Code SVN: r12351 - in labs/jbossesb/workspace/dbevenius: product and 206 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: beve
Date: 2007-06-06 10:23:48 -0400 (Wed, 06 Jun 2007)
New Revision: 12351

Added:
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializer.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializerMBean.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractSpringAction.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/mock/
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/mock/MockAction.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/mock/MockListener.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/AbstractSpringActionUnitTest.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/MockSpringAction.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/MyInterceptor.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/SaySomething.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/spring-context-1.xml
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/spring-context-2.xml
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/lifecycle/
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/lifecycle/EsbLifecycleListenerUnitTest.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/lifecycle/config-01.xml
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/persistence/
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/ConnectionManager.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerException.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactory.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/J2eeConnectionManager.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/StandaloneConnectionManager.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/util/ClassUtilUnitTest.java
   labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/internal/soa/esb/services/registry/MockRegistryImpl.java
   labs/jbossesb/workspace/dbevenius/product/jbossws21/
   labs/jbossesb/workspace/dbevenius/product/jbossws21/README.TXT
   labs/jbossesb/workspace/dbevenius/product/jbossws21/build.xml
   labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossas42/
   labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossas42/jbossws-jboss42.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossws-core/
   labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossws-core/jboss-jaxrpc.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossws-core/jboss-jaxws.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossws-core/jboss-saaj.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossws-core/jbossws-client.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/native/
   labs/jbossesb/workspace/dbevenius/product/jbossws21/native/jbossws-context.war
   labs/jbossesb/workspace/dbevenius/product/jbossws21/native/jbossws-native.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/native/jbossws-native42.sar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/
   labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsconsume.bat
   labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsconsume.sh
   labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsprovide.bat
   labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsprovide.sh
   labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wspublish.sh
   labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsrunclient.bat
   labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsrunclient.sh
   labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wstools.bat
   labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wstools.sh
   labs/jbossesb/workspace/dbevenius/product/jbossws21/spi/
   labs/jbossesb/workspace/dbevenius/product/jbossws21/spi/jbossws-spi.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/
   labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/jaxb-api.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/jaxb-impl.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/jaxb-xjc.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/jaxws-rt.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/jaxws-tools.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/juddi-service.sar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/wsdl4j.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/aspectjrt.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/aspectjweaver.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/spring-aspects.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/spring-mock.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/spring.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/standalone/
   labs/jbossesb/workspace/dbevenius/product/lib/ext/standalone/c3p0-0.9.1-pre9.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/aggregator/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/aggregator/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/src/services/rules/FunCBRRules-XPath.drl
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_action/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_action/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_db_registration/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_db_registration/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_file_action/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_file_action/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_ftp_action/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_ftp_action/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/jbpm_simple1/jboss-esb-unfiltered.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/more_action/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/more_action/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/scripting_groovy/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/scripting_groovy/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/src/services/rules/SimpleCBRRules-XPath.drl
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/src/services/rules/SimpleCBRRules.drl
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbossesb-gateway.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbossesb-listener.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbossesb-properties.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jndi.properties
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/juddi.properties
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/log4j.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/readme.txt
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/spring-context.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/MyInterceptor.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/MySpringEnabledAction.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/SaySomething.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/test/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbossesb-gateway.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbossesb-listener.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbossesb-properties.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jndi.properties
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/juddi.properties
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/log4j.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/readme.txt
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/spring-context-goodbye.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/spring-context-hello.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/MySpringEnabledAction.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/SaySomething.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/test/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/applicationContext.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/dataAccessContext-local.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore-hsqldb-dataload.sql
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore-hsqldb-schema.sql
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.properties
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.script
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.bat
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.sh
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.bat
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.properties
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.sh
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbossesb-gateway.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbossesb-listener.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbossesb-properties.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jdbc.properties
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jndi.properties
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/juddi.properties
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-beanutils.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-collections.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-dbcp.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-digester.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-discovery.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-logging.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-pool.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-validator.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/hsqldb.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/ibatis-2.3.0.677.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/jpetstore.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/xstream-1.2.2.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/log4j.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/readme.txt
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/sample-order.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/sql-map-config.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/InsertOrderAction.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/test/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/smooks-res-csv2xml.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_war1/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_war1/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_war1/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/c3p0-0.9.1-pre9.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/commons-io-1.3.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/commons-lang-2.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/hsqldb.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/jboss-system.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/jbossall-client.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/jbossts-common.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/junit-4.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/log4j.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/xercesImpl-2.7.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/jackrabbit-api-1.2.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/jackrabbit-core-1.2.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/jackrabbit-jcr-commons-1.2.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/jcr-1.0.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/lucene-core-2.0.0.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/MessageStoreFactory.java
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRConnectionManager.java
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRNodeNames.java
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/soa/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/soa/esb/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/soa/esb/actions/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/soa/esb/actions/MessagePersister.java
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/jbossesb-service.xml
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/hsqldb/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/hsqldb/create_database.sql
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/hsqldb/drop_database.sql
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/mysql/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/mysql/create_database.sql
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/postgresql/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/postgresql/create_database.sql
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/MessagePersisterTest.java
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/MessagePersisterTest.xml
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/tests/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/MessageStoreClient.java
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/MessageStoreTest.java
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/resources/jbossesb-unittest-properties.xml
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/antlr-3.0b7.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/core-3.2.1.v_677_R32x.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/drools-compiler-4.0.0.11754MR2.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/drools-core-4.0.0.11754MR2.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/drools-decisiontables-4.0.0.11754MR2.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/drools-jsr94-4.0.0.11754MR2.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/janino-2.5.6.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/jsr94-1.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/jxl-2.4.2.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/mvel14-1.2beta16.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/xpp3-1.1.3.4.O.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/base-project-build.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/build.properties
   labs/jbossesb/workspace/dbevenius/product/services/smooks/build.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time/commons-logging-1.0.4.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time/jbossall-client.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time/jbossts-common.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time/junit-4.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time/log4j.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-commons-0.9-SNAPSHOT.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-edisax-0.2-SNAPSHOT.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-core-0.9-SNAPSHOT.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-csv-0.1.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-edi-0.2-SNAPSHOT.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-javabean-0.3-SNAPSHOT.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-misc-0.2.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-scripting-0.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-templating-0.2.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksConfiguration.java
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksInstanceManager.java
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksService.java
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksServiceMBean.java
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/META-INF/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/META-INF/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/META-INF/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks-base-configs/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks-base-configs/creators.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks-service.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks.esb.properties
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/jboss/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/jboss/soa/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/jboss/soa/esb/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/converters/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/log4j.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/smooks-conf-01.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/smooks-conf-02.xml
   labs/jbossesb/workspace/dbevenius/product/services/soapui-client/lib/
   labs/jbossesb/workspace/dbevenius/product/services/soapui-client/lib/ext/
   labs/jbossesb/workspace/dbevenius/product/services/soapui-client/lib/ext/build-time/
   labs/jbossesb/workspace/dbevenius/product/tools/console/distro/jbossfaces-web.xml
   labs/jbossesb/workspace/dbevenius/product/tools/console/distro/myfaces-web.xml
Removed:
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializer.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializerMBean.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/MessagePersister.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/persistence/
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/mock/MockAction.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/mock/MockListener.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/device-profile.xml
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/smooks-test.cdrl
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/AbstractSpringActionUnitTest.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/MockSpringAction.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/MyInterceptor.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/SaySomething.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/spring-context-1.xml
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/spring-context-2.xml
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/lifecycle/EsbLifecycleListenerUnitTest.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/lifecycle/config-01.xml
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/smooks-cdr.lst
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/ConnectionManager.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerException.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactory.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/J2eeConnectionManager.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/StandaloneConnectionManager.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStoreFactory.java
   labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/internal/soa/esb/persistence/
   labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/soa/esb/persistence/
   labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/soa/esb/services/persistence/
   labs/jbossesb/workspace/dbevenius/product/core/services/tests/src/org/jboss/soa/esb/esb/
   labs/jbossesb/workspace/dbevenius/product/install/DMQ/
   labs/jbossesb/workspace/dbevenius/product/install/conf/smooks-cdr.lst
   labs/jbossesb/workspace/dbevenius/product/install/message-store/sql/
   labs/jbossesb/workspace/dbevenius/product/jbi/
   labs/jbossesb/workspace/dbevenius/product/jbossws21/README.TXT
   labs/jbossesb/workspace/dbevenius/product/jbossws21/build.xml
   labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossas42/
   labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossas42/jbossws-jboss42.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossws-core/
   labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossws-core/jboss-jaxrpc.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossws-core/jboss-jaxws.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossws-core/jboss-saaj.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossws-core/jbossws-client.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/native/
   labs/jbossesb/workspace/dbevenius/product/jbossws21/native/jbossws-context.war
   labs/jbossesb/workspace/dbevenius/product/jbossws21/native/jbossws-native.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/native/jbossws-native42.sar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/
   labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsconsume.bat
   labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsconsume.sh
   labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsprovide.bat
   labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsprovide.sh
   labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wspublish.sh
   labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsrunclient.bat
   labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsrunclient.sh
   labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wstools.bat
   labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wstools.sh
   labs/jbossesb/workspace/dbevenius/product/jbossws21/spi/
   labs/jbossesb/workspace/dbevenius/product/jbossws21/spi/jbossws-spi.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/
   labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/jaxb-api.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/jaxb-impl.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/jaxb-xjc.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/jaxws-rt.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/jaxws-tools.jar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/juddi-service.sar
   labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/wsdl4j.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/c3p0-0.9.1-pre9.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/commons-logging.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/jackrabbit-api-1.2.1.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/jackrabbit-core-1.2.1.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/jackrabbit-jcr-commons-1.2.1.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/jbossws-core.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/jcr-1.0.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/lucene-core-2.0.0.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/milyn-commons-0.9-SNAPSHOT.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/milyn-edisax-0.2-SNAPSHOT.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/milyn-smooks-core-0.9-SNAPSHOT.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/milyn-smooks-csv-0.1.1.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/milyn-smooks-edi-0.2-SNAPSHOT.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/milyn-smooks-javabean-0.3-SNAPSHOT.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/milyn-smooks-misc-0.2.1.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/milyn-smooks-scripting-0.1.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/milyn-smooks-templating-0.2.1.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/standalone/c3p0-0.9.1-pre9.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/bpm_orchestration1/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/jboss-mq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/src/services/rules/MyESBRules-XPath.drl
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/src/services/rules/XPathLanguage.dsl
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/jbpm_simple1/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/src/services/rules/MyESBRules-XPath.drl
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/src/services/rules/MyESBRules.drl
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbossesb-gateway.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbossesb-listener.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbossesb-properties.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jndi.properties
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/juddi.properties
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/log4j.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/readme.txt
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/spring-context.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/MyInterceptor.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/MySpringEnabledAction.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/SaySomething.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/test/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbossesb-gateway.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbossesb-listener.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbossesb-properties.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jndi.properties
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/juddi.properties
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/log4j.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/readme.txt
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/spring-context-goodbye.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/spring-context-hello.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/MySpringEnabledAction.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/SaySomething.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/test/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/applicationContext.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/dataAccessContext-local.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore-hsqldb-dataload.sql
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore-hsqldb-schema.sql
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.properties
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.script
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.bat
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.sh
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.bat
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.properties
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.sh
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbossesb-gateway.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbossesb-listener.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbossesb-properties.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jdbc.properties
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jndi.properties
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/juddi.properties
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-beanutils.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-collections.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-dbcp.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-digester.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-discovery.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-logging.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-pool.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-validator.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/hsqldb.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/ibatis-2.3.0.677.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/jpetstore.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/xstream-1.2.2.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/log4j.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/readme.txt
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/sample-order.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/sql-map-config.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/InsertOrderAction.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/test/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/smooks-cdr.lst
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/smooks-res.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/jbmq-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/smooks-cdr.lst
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/smooks-res.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/jbmq-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_war1/jbmq-service.xml
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/c3p0-0.9.1-pre9.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/commons-io-1.3.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/commons-lang-2.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/hsqldb.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/jboss-system.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/jbossall-client.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/jbossts-common.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/junit-4.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/log4j.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/xercesImpl-2.7.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/MessageStoreFactory.java
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRConnectionManager.java
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRNodeNames.java
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/soa/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/soa/esb/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/soa/esb/actions/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/soa/esb/actions/MessagePersister.java
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/hsqldb/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/hsqldb/create_database.sql
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/hsqldb/drop_database.sql
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/mysql/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/mysql/create_database.sql
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/postgresql/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/postgresql/create_database.sql
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/MessagePersisterTest.java
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/MessagePersisterTest.xml
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/tests/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/MessageStoreClient.java
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/MessageStoreTest.java
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/antlr-2.7.6.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/antlr-3.0ea8.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/commons-jci-core-1.0-406301.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/commons-jci-janino-2.4.3.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/commons-lang-2.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/commons-logging.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/drools-compiler-3.0.4.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/drools-core-3.0.4.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/janino-2.4.3.jar
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/stringtemplate-2.3b6.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/base-project-build.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/build.properties
   labs/jbossesb/workspace/dbevenius/product/services/smooks/build.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time/commons-logging-1.0.4.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time/jbossall-client.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time/jbossts-common.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time/junit-4.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time/log4j.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-commons-0.9-SNAPSHOT.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-edisax-0.2-SNAPSHOT.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-core-0.9-SNAPSHOT.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-csv-0.1.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-edi-0.2-SNAPSHOT.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-javabean-0.3-SNAPSHOT.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-misc-0.2.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-scripting-0.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-templating-0.2.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksConfiguration.java
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksInstanceManager.java
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksService.java
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksServiceMBean.java
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/META-INF/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/META-INF/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/META-INF/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks-base-configs/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks-base-configs/creators.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks-service.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks.esb.properties
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/jboss/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/jboss/soa/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/jboss/soa/esb/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/converters/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/log4j.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/smooks-conf-01.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/smooks-conf-02.xml
   labs/jbossesb/workspace/dbevenius/product/services/soapui-client/lib/ext/
   labs/jbossesb/workspace/dbevenius/product/services/soapui-client/lib/ext/build-time/
   labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.java
   labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.xml
   labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/SmooksTransformerConfig.xml
   labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/SmooksTransformerTest.java
   labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/smooks-cdr.lst
   labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/smooks-test.cdrl
   labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/messagestore/
   labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/util/DbUtils.java
Modified:
   labs/jbossesb/workspace/dbevenius/IDE/JBossIDE/core_src_plus_tests.classpath
   labs/jbossesb/workspace/dbevenius/product/.classpath
   labs/jbossesb/workspace/dbevenius/product/build-distr.xml
   labs/jbossesb/workspace/dbevenius/product/build.xml
   labs/jbossesb/workspace/dbevenius/product/core/listeners/build.xml
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/ContentBasedRouter.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/routing/AbstractRouter.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/soap/JBossWSAdapter.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/soap/JBossWSAdapterContractPublisher.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/soap/SOAPClient.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/templating/StringTemplateProcessor.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/ServiceInvoker.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/GatewayGenerator.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/Generator.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/ActionMapper.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/JcaGatewayMapper.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/MapperUtil.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/PackageJmsMessageContents.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/ActivationBridge.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/EndpointFactory.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/EndpointProxy.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/JBoss42ActivationBridge.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/JcaInflowGateway.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/JmsEndpoint.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/lifecycle/ManagedLifecycleController.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/build.xml
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/HttpRouterUnitTest.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/soap/SOAPClientUnitTest.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/ConfigurationControllerServiceUnitTest.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/util/ESBConfigUtil.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/util/XPathUtilTest.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/util/test/ESBConfigUtilUnitTest.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/build.xml
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/BodyImpl.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/soap/OGNLUtils.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/common/Configuration.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/common/Environment.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/common/ModulePropertyManager.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/dom/YADOMUtil.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/message/Body.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyEmail.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/util/ClassUtil.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/util/Util.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/soap/OGNLUtilsUnitTest.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/StreamUtils.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/testutils/TestEnvironmentUtil.java
   labs/jbossesb/workspace/dbevenius/product/docs/services/MessageTransformation.odt
   labs/jbossesb/workspace/dbevenius/product/etc/schemas/xml/jbossesb-1.0.1.xsd
   labs/jbossesb/workspace/dbevenius/product/install/build.xml
   labs/jbossesb/workspace/dbevenius/product/install/conf/jbossesb-properties.xml
   labs/jbossesb/workspace/dbevenius/product/install/deployment.properties-example
   labs/jbossesb/workspace/dbevenius/product/install/jboss-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/samples/quickstart/aggregator/test/ReceiveJMSMessage.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/bpm_orchestration1/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/jbm-queue-service-scoped.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/src/org/jboss/soa/esb/samples/quickstart/businessservice/test/SendJMSMessage.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf/base-build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf/jms/esb-quickstart-jbm-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf/jms/esb-quickstart-jbmq-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/readme.txt
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/test/ReceiveJMSMessage.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld/jbm-queue-service-scoped.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_action/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_db_registration/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_db_registration/jbm-queue-service-scoped.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_db_registration/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_file_action/jbm-queue-service-scoped.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_file_action/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_ftp_action/jbm-queue-service-scoped.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_ftp_action/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/jbpm_simple1/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/jbpm_simple1/src/org/jboss/soa/esb/samples/quickstart/jbpmsimple1/test/TestBpmProcessor.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/more_action/jbm-queue-service-scoped.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/more_action/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/scripting_groovy/jbm-queue-service-scoped.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/scripting_groovy/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/jbm-queue-service-scoped.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/readme.txt
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/test/ReceiveJMSMessage.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/jbm-queue-service-scoped.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbm-queue-service-scoped.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/smooks-res.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/src/org/jboss/xtrans/DateFormatter.groovy
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/src/org/jboss/xtrans/EnrichmentProcessor.groovy
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/jbm-queue-service-scoped.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/smooks-res.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/dvdstore/OrderHeader.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/dvdstore/OrderItem.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/samples/quickstart/transformxml2pojo/test/ReceiveJMSMessage.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbm-queue-service-scoped.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/smooks-res.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/src/org/jboss/soa/esb/samples/quickstart/transformxml2xmldatemanipulation/test/OrderDate.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/jbm-queue-service-scoped.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/smooks-res.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_war1/build.xml
   labs/jbossesb/workspace/dbevenius/product/services/build.xml
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/META-INF/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/META-INF/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/resources/log4j.xml
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/main/resources/XPathLanguage.dsl
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/test/resources/JBossESBPricingRoutingRules.drl
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/test/resources/JBossESBPricingRules.drl
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/test/resources/JBossESBRules-XPath.drl
   labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/test/resources/JBossESBRules.drl
   labs/jbossesb/workspace/dbevenius/product/tools/console/build.xml
   labs/jbossesb/workspace/dbevenius/product/tools/console/distro/application.xml
   labs/jbossesb/workspace/dbevenius/product/tools/console/distro/distro-build.xml
   labs/jbossesb/workspace/dbevenius/product/tools/console/src/org/jboss/soa/esb/admin/console/UpdateNotifier.java
   labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/server/jca/unit/JcaUnitTestCase.java
Log:
Merge from main 12232:12348

Modified: labs/jbossesb/workspace/dbevenius/IDE/JBossIDE/core_src_plus_tests.classpath
===================================================================
--- labs/jbossesb/workspace/dbevenius/IDE/JBossIDE/core_src_plus_tests.classpath	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/IDE/JBossIDE/core_src_plus_tests.classpath	2007-06-06 14:23:48 UTC (rev 12351)
@@ -45,9 +45,6 @@
 	<classpathentry kind="lib" path="lib/ext/junit-4.1.jar"/>
 	<classpathentry kind="lib" path="lib/ext/log4j.jar"/>
 	<classpathentry kind="lib" path="lib/ext/mail.jar"/>
-	<classpathentry kind="lib" path="lib/ext/milyn-edisax-0.1-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="lib/ext/milyn-smooks-csv-0.1.jar"/>
-	<classpathentry kind="lib" path="lib/ext/milyn-smooks-edi-0.1-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="lib/ext/mockejb.jar"/>
 	<classpathentry kind="lib" path="lib/ext/ognl-2.6.9.jar"/>
 	<classpathentry kind="lib" path="lib/ext/opencsv-1.6.jar"/>

Modified: labs/jbossesb/workspace/dbevenius/product/.classpath
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/.classpath	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/.classpath	2007-06-06 14:23:48 UTC (rev 12351)
@@ -7,18 +7,14 @@
 	<classpathentry excluding="**/.svn/" kind="src" path="core/listeners/tests/src"/>
 	<classpathentry excluding="**/.svn/" kind="src" path="core/services/src"/>
 	<classpathentry excluding="**/.svn/" kind="src" path="core/services/tests/src"/>
-	<classpathentry excluding="**/.svn/" kind="src" path="services/jbpm/src/test/java"/>
-	<classpathentry excluding="**/.svn/" kind="src" path="services/jbpm/src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/ext/activation.jar"/>
 	<classpathentry kind="lib" path="lib/ext/antlr-2.7.6.jar"/>
 	<classpathentry kind="lib" path="lib/ext/antlr-3.0ea8.jar"/>
-	<classpathentry kind="lib" path="lib/ext/c3p0-0.9.1-pre9.jar"/>
 	<classpathentry kind="lib" path="lib/ext/commons-collections-2.0.jar"/>
 	<classpathentry kind="lib" path="lib/ext/commons-collections-3.2.jar"/>
 	<classpathentry kind="lib" path="lib/ext/commons-dbcp-1.2.1.jar"/>
 	<classpathentry kind="lib" path="lib/ext/commons-lang-2.1.jar"/>
-	<classpathentry kind="lib" path="lib/ext/commons-logging.jar"/>
 	<classpathentry kind="lib" path="lib/ext/emma_ant.jar"/>
 	<classpathentry kind="lib" path="lib/ext/emma.jar"/>
 	<classpathentry kind="lib" path="lib/ext/groovy-all-1.0.jar"/>
@@ -34,16 +30,6 @@
 	<classpathentry kind="lib" path="lib/ext/junit-4.1.jar"/>
 	<classpathentry kind="lib" path="lib/ext/log4j.jar"/>
 	<classpathentry kind="lib" path="lib/ext/mail.jar"/>
-	<classpathentry kind="lib" path="lib/ext/milyn-commons-0.8.jar"/>
-	<classpathentry kind="lib" path="lib/ext/milyn-edisax-0.1-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="lib/ext/milyn-smooks-core-0.8.jar"/>
-	<classpathentry kind="lib" path="lib/ext/milyn-smooks-csv-0.1.jar"/>
-	<classpathentry kind="lib" path="lib/ext/milyn-smooks-edi-0.1-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="lib/ext/milyn-smooks-javabean-0.2.jar"/>
-	<classpathentry kind="lib" path="lib/ext/milyn-smooks-misc-0.2.jar"/>
-	<classpathentry kind="lib" path="lib/ext/milyn-smooks-scripting-0.1-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="lib/ext/milyn-smooks-templating-0.2.jar"/>
-	<classpathentry kind="lib" path="lib/ext/milyn-tinak-0.7.1.jar"/>
 	<classpathentry kind="lib" path="lib/ext/mockejb.jar"/>
 	<classpathentry kind="lib" path="lib/ext/ognl-2.6.9.jar"/>
 	<classpathentry kind="lib" path="lib/ext/opencsv-1.6.jar"/>
@@ -59,13 +45,7 @@
 	<classpathentry kind="lib" path="lib/ext/xstream-1.1.3.jar"/>
 	<classpathentry kind="lib" path="build/jbossesb/lib/jbossesb-config-model-1.0.1.jar"/>
 	<classpathentry kind="lib" path="lib/ext/jboss.jar"/>
-	<classpathentry kind="lib" path="lib/ext/jackrabbit-api-1.2.1.jar"/>
-	<classpathentry kind="lib" path="lib/ext/jackrabbit-core-1.2.1.jar"/>
-	<classpathentry kind="lib" path="lib/ext/jcr-1.0.jar"/>
 	<classpathentry kind="lib" path="lib/ext/commons-io-1.3.jar"/>
-	<classpathentry kind="lib" path="lib/ext/jbossws-core.jar"/>
-	<classpathentry kind="lib" path="lib/ext/jackrabbit-jcr-commons-1.2.1.jar"/>
-	<classpathentry kind="lib" path="lib/ext/lucene-core-2.0.0.jar"/>
 	<classpathentry kind="lib" path="lib/ext/edtftpj-1.5.4.jar"/>
 	<classpathentry kind="lib" path="ftp/lib/backport-util-concurrent-2.2.jar"/>
 	<classpathentry kind="lib" path="ftp/lib/ftplet-api-1.0-incubator-SNAPSHOT.jar"/>
@@ -84,5 +64,13 @@
 	<classpathentry kind="lib" path="services/jbpm/lib/ext/jbpm-jpdl.jar"/>
 	<classpathentry kind="lib" path="lib/ext/jgroups-all.jar"/>
 	<classpathentry kind="lib" path="lib/ext/cache.jar"/>
+	<classpathentry kind="lib" path="lib/ext/standalone/c3p0-0.9.1-pre9.jar"/>
+	<classpathentry kind="lib" path="jbossws21/jbossas42/jbossws-jboss42.jar"/>
+	<classpathentry kind="lib" path="jbossws21/jbossws-core/jboss-jaxrpc.jar"/>
+	<classpathentry kind="lib" path="jbossws21/jbossws-core/jboss-jaxws.jar"/>
+	<classpathentry kind="lib" path="jbossws21/jbossws-core/jboss-saaj.jar"/>
+	<classpathentry kind="lib" path="jbossws21/jbossws-core/jbossws-client.jar"/>
+	<classpathentry kind="lib" path="jbossws21/spi/jbossws-spi.jar"/>
+	<classpathentry kind="lib" path="lib/ext/spring.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: labs/jbossesb/workspace/dbevenius/product/build-distr.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/build-distr.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/build-distr.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,4 +1,10 @@
 <project name="JBESB Distribution Build" default="dist" basedir=".">
+    <!-- Set default properties filename -->
+    <property name="org.jboss.esb.properties" location="product.properties"/>
+
+    <!-- Load Build Properties File -->
+    <property file="${org.jboss.esb.properties}"/>
+
     <property name="build.dir" value="build"/>
     <property name="lib.ext.dir" value="lib/ext"/>
     <property name="services.dir" value="services"/>
@@ -51,11 +57,13 @@
                 <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"/>
@@ -109,13 +117,6 @@
             </fileset>
         </copy>
 
-        <mkdir dir="${build.dir}/jbossesb.sar/message-store-sql"/>
-        <copy todir="${build.dir}/jbossesb.sar/message-store-sql">
-            <fileset dir="${installation.files.dir}/message-store/sql">
-                <include name="**/*.sql"/>
-            </fileset>
-        </copy>
-
         <mkdir dir="${build.dir}/jbossesb.sar/lib"/>
         <copy todir="${build.dir}/jbossesb.sar/lib">
             <fileset dir="${lib.ext.dir}" includes="jbossts-common.jar"/>
@@ -149,7 +150,9 @@
         <mkdir dir="${build.dir}/services"/>
         <copy todir="${build.dir}/services">
             <fileset dir="${services.dir}/jbpm/build" includes="jbpm.esb/**/*"/>
-            <fileset dir="${services.dir}/jbossesb/build" includes="jbossesb.esb/**/*"/>
+            <fileset dir="${services.dir}/jbossesb/build" includes="jbossesb.esb/**/*" excludes="jbossesb.esb/jbmq-queue-service.xml jbossesb.esb/jbm-queue-service-scoped.xml"/>
+        	<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 smooks.esb/jbm-queue-service-scoped.xml"/>
         </copy>
     </target>
 

Modified: labs/jbossesb/workspace/dbevenius/product/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/build.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -4,6 +4,14 @@
 		JBoss ESB Project
 	</description>
 	
+	<!-- Set default properties filename -->
+	<property name="org.jboss.esb.properties" location="product.properties"/>
+	<property name="org.jboss.esb.deployment.properties" location="install/deployment.properties"/>
+
+	<!-- Load Build Properties File -->
+	<property file="${org.jboss.esb.properties}"/>
+	<property file="${org.jboss.esb.deployment.properties}"/>
+
 	<!-- class path behaviour -->
 	<property name="build.sysclasspath" value="ignore"/>
 
@@ -15,23 +23,15 @@
 	<!-- Product properties file -->
 	<property name="org.jboss.esb.product.properties" value="jbossesb-properties.xml"/>
 	
-	<!-- Set default properties filename -->
-	<property name="org.jboss.esb.properties" location="product.properties"/>
-	<property name="org.jboss.esb.deployment.properties" location="install/deployment.properties"/>
-
 	<!-- Some default build locations -->
 	<property name="org.jboss.esb.internal.dest" location="build"/>
 	<property name="org.jboss.esb.internal.jar.dest" location="build/jbossesb/lib"/>
 
 	<!-- JBoss ESB version -->
-	<property name="version" value="4.2.MR1"/>
+	<property name="version" value="4.2MR2"/>
 	<property name="esb.server.name" value="jbossesb-server-${version}"/>
 	<property name="esbserver.dist.dir" value="${org.jboss.esb.internal.dest}/${esb.server.name}"/>
 
-	<!-- Load Build Properties File -->
-	<property file="${org.jboss.esb.properties}"/>
-	<property file="${org.jboss.esb.deployment.properties}"/>
-
 	<!-- Set internal property defaults -->
 	<property name="org.jboss.esb.installationdirectory" location="build/jbossesb"/>
 	
@@ -148,10 +148,10 @@
     <target name="assert-build-available" unless="build-available">
         <echo message="" />
         <echo message="***" />
-        <echo message="*** Sorry, you must run the 'dist' target before runing the 'test' target." />
+        <echo message="*** Sorry, you must run the 'dist' target before running the 'test' target." />
         <echo message="***" />
         <echo message="" />
-        <fail message="Sorry, you must run the 'dist' target before runing the 'test' target." />
+        <fail message="Sorry, you must run the 'dist' target before running the 'test' target." />
     </target>
 
     <!-- Integration test targets -->

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/build.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -18,6 +18,7 @@
 	<path id="org.jboss.esb.listeners.base.classpath">
         <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="stax-api-1.0.1.jar,xalan.jar,xbean.jar"/>
 		<fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
+        <fileset dir="${org.jboss.esb.root.dir}/jbossws21/spi" includes="jbossws-spi.jar"/>
     </path>
 
 	<path id="org.jboss.esb.listeners.default.classpath">

Deleted: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializer.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializer.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializer.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,142 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.internal.soa.esb.dependencies;
-
-import java.net.URL;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import javax.naming.InitialContext;
-import javax.sql.DataSource;
-
-import org.jboss.soa.esb.listeners.config.Configuration;
-import org.jboss.system.ServiceMBeanSupport;
-
-/**
- * Initialize a given datasource
- *
- * Takes a list resources that are .sql files and checks to see if they have alrady been executed
- * on a given datasource by executing a sql query.  If the sql query fails, then the .sql files are executed.
- *
- * @author <a href="bill at jboss.com">Bill Burke</a>
- * @version $Revision: 1.1 $
- */
-public class DatabaseInitializer extends ServiceMBeanSupport implements DatabaseInitializerMBean
-{
-   private String datasource;
-   private String sqlFiles;
-   private String existsSql;
-
-
-   public String getExistsSql()
-   {
-      return existsSql;
-   }
-
-   public void setExistsSql(String existsSql)
-   {
-      this.existsSql = existsSql;
-   }
-
-   public String getSqlFiles()
-   {
-      return sqlFiles;
-   }
-
-   public void setSqlFiles(String sqlFiles)
-   {
-      this.sqlFiles = sqlFiles;
-   }
-
-   public String getDatasource()
-   {
-      return datasource;
-   }
-
-   public void setDatasource(String datasource)
-   {
-      this.datasource = datasource;
-   }
-
-   protected void initDatabase() throws Exception
-   {
-      DataSource ds = (DataSource)new InitialContext().lookup(datasource);
-      Connection conn = ds.getConnection();
-      boolean load = false;
-
-      Statement st = conn.createStatement();
-      ResultSet rs = null;
-      try
-      {
-         rs = st.executeQuery(existsSql.trim());
-         rs.close();
-      }
-      catch (SQLException e)
-      {
-         load = true;
-      }
-      st.close();
-      if (!load)
-      {
-         log.info(datasource + " datasource is already initialized");
-         return;
-      }
-
-      log.info("Initializing " + datasource + " from listed sql files");
-
-      String[] list = sqlFiles.split(",");
-      for (String sql : list)
-      {
-         executeSql(sql.trim(), conn);
-      }
-   }
-
-   public void executeSql(String resource, Connection conn)
-           throws Exception
-   {
-      URL url = Thread.currentThread().getContextClassLoader().getResource(resource);
-      String sql = Configuration.getStringFromStream(url.openStream());
-      String[] statements = sql.split(";");
-      for (String statement : statements)
-      {
-         Statement sqlStatement = conn.createStatement();
-         try
-         {
-            sqlStatement.executeUpdate(statement);
-         }
-         finally
-         {
-            sqlStatement.close();
-         }
-      }
-   }
-
-
-   @Override
-   protected void startService() throws Exception
-   {
-      initDatabase();
-      super.startService();
-   }
-}

Copied: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializer.java (from rev 12348, labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializer.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializer.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializer.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,142 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.internal.soa.esb.dependencies;
+
+import java.net.URL;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import javax.naming.InitialContext;
+import javax.sql.DataSource;
+
+import org.jboss.soa.esb.listeners.config.Configuration;
+import org.jboss.system.ServiceMBeanSupport;
+
+/**
+ * Initialize a given datasource
+ *
+ * Takes a list resources that are .sql files and checks to see if they have alrady been executed
+ * on a given datasource by executing a sql query.  If the sql query fails, then the .sql files are executed.
+ *
+ * @author <a href="bill at jboss.com">Bill Burke</a>
+ * @version $Revision: 1.1 $
+ */
+public class DatabaseInitializer extends ServiceMBeanSupport implements DatabaseInitializerMBean
+{
+   private String datasource;
+   private String sqlFiles;
+   private String existsSql;
+
+
+   public String getExistsSql()
+   {
+      return existsSql;
+   }
+
+   public void setExistsSql(String existsSql)
+   {
+      this.existsSql = existsSql;
+   }
+
+   public String getSqlFiles()
+   {
+      return sqlFiles;
+   }
+
+   public void setSqlFiles(String sqlFiles)
+   {
+      this.sqlFiles = sqlFiles;
+   }
+
+   public String getDatasource()
+   {
+      return datasource;
+   }
+
+   public void setDatasource(String datasource)
+   {
+      this.datasource = datasource;
+   }
+
+   protected void initDatabase() throws Exception
+   {
+      DataSource ds = (DataSource)new InitialContext().lookup(datasource);
+      Connection conn = ds.getConnection();
+      boolean load = false;
+
+      Statement st = conn.createStatement();
+      ResultSet rs = null;
+      try
+      {
+         rs = st.executeQuery(existsSql.trim());
+         rs.close();
+      }
+      catch (SQLException e)
+      {
+         load = true;
+      }
+      st.close();
+      if (!load)
+      {
+         log.info(datasource + " datasource is already initialized");
+         return;
+      }
+
+      log.info("Initializing " + datasource + " from listed sql files");
+
+      String[] list = sqlFiles.split(",");
+      for (String sql : list)
+      {
+         executeSql(sql.trim(), conn);
+      }
+   }
+
+   public void executeSql(String resource, Connection conn)
+           throws Exception
+   {
+      URL url = Thread.currentThread().getContextClassLoader().getResource(resource);
+      String sql = Configuration.getStringFromStream(url.openStream());
+      String[] statements = sql.split(";");
+      for (String statement : statements)
+      {
+         Statement sqlStatement = conn.createStatement();
+         try
+         {
+            sqlStatement.executeUpdate(statement);
+         }
+         finally
+         {
+            sqlStatement.close();
+         }
+      }
+   }
+
+
+   @Override
+   protected void startService() throws Exception
+   {
+      initDatabase();
+      super.startService();
+   }
+}

Deleted: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializerMBean.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializerMBean.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializerMBean.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,51 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.internal.soa.esb.dependencies;
-
-import org.jboss.system.ServiceMBean;
-
-/**
- * comment
- *
- * @author <a href="bill at jboss.com">Bill Burke</a>
- * @version $Revision: 1.1 $
- */
-public interface DatabaseInitializerMBean extends ServiceMBean
-{
-   String getExistsSql()
-           ;
-
-   void setExistsSql(String existsSql)
-           ;
-
-   String getSqlFiles()
-           ;
-
-   void setSqlFiles(String sqlFiles)
-           ;
-
-   String getDatasource()
-           ;
-
-   void setDatasource(String datasource)
-           ;
-}

Copied: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializerMBean.java (from rev 12348, labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializerMBean.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializerMBean.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializerMBean.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,51 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.internal.soa.esb.dependencies;
+
+import org.jboss.system.ServiceMBean;
+
+/**
+ * comment
+ *
+ * @author <a href="bill at jboss.com">Bill Burke</a>
+ * @version $Revision: 1.1 $
+ */
+public interface DatabaseInitializerMBean extends ServiceMBean
+{
+   String getExistsSql()
+           ;
+
+   void setExistsSql(String existsSql)
+           ;
+
+   String getSqlFiles()
+           ;
+
+   void setSqlFiles(String sqlFiles)
+           ;
+
+   String getDatasource()
+           ;
+
+   void setDatasource(String datasource)
+           ;
+}

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -25,10 +25,8 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-
 import java.net.URI;
 import java.net.URL;
-
 import java.util.Properties;
 
 import javax.naming.InitialContext;

Copied: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractSpringAction.java (from rev 12348, labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractSpringAction.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractSpringAction.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractSpringAction.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,194 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.soa.esb.actions;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * Abstract class for Actions that make calls to Spring beans. 
+ * 
+ * <p>This class creates a Spring IoC from a jboss-esb.xml element named "springContextXml". 
+ * A comma separated list of spring context files may be used.
+ * 
+ * @author <a href="mailto:james.williams at redhat.com">James Williams</a>.
+ * 
+ */
+public abstract class AbstractSpringAction extends AbstractActionLifecycle
+      implements ActionLifecycle
+{
+   private static Logger logger = Logger.getLogger(AbstractSpringAction.class);
+
+   private static final String SPRING_CONTEXT_XML_ATTR = "springContextXml";
+
+   private String springContextXml;
+
+   protected ConfigTree configTree;
+
+   private BeanFactory factory;
+
+   /*
+    * (non-Javadoc)
+    * 
+    * @see org.jboss.soa.esb.actions.AbstractActionLifecycle#initialise()
+    */
+   public void initialise() throws ActionLifecycleException
+   {
+      springContextXml = configTree.getAttribute(SPRING_CONTEXT_XML_ATTR);
+
+      if (springContextXml == null)
+      {
+         logger.error("No Spring context specified on action config "
+               + configTree.getAttribute("name")
+               + ". Expecting Spring context name.");
+         throw new ActionLifecycleException(
+               "No Spring context specified on action config: "
+                     + SPRING_CONTEXT_XML_ATTR + ".");
+      } else
+      {
+         initializeSpring();
+      }
+   }
+
+   /**
+    * Initialize Spring IoC
+    * 
+    * @throws ActionLifecycleException
+    */
+   protected void initializeSpring() throws ActionLifecycleException
+   {
+      if (isBeanFactoryNull())
+      {
+         loadSpringIoc();
+      }
+   }
+
+   /**
+    * Request a BeanFactory instance from the action. If no Spring IoC container
+    * exists, create one.
+    * 
+    * @return Spring Bean Factory
+    * @throws ActionLifecycleException
+    */
+   protected BeanFactory getBeanFactory() throws ActionLifecycleException
+   {
+      return this.factory;
+   }
+
+   /**
+    * Check to see if Spring Bean factory is null. Mostly used for unit tests,
+    * but could provide use in other situations.
+    * 
+    * @return
+    */
+   public boolean isBeanFactoryNull()
+   {
+      if (factory == null)
+      {
+         return true;
+      } else
+      {
+         return false;
+      }
+   }
+
+   /**
+    * Create a spring IoC container.
+    * 
+    * @throws ActionLifecycleException
+    */
+   private void loadSpringIoc() throws ActionLifecycleException
+   {
+      String springContextXml = configTree
+            .getAttribute(SPRING_CONTEXT_XML_ATTR);
+      try
+      {
+         ApplicationContext springContext;
+
+         if (springContextXml.contains(","))
+         {
+            String[] springContextXmls = springContextXml.split(",");
+            springContext = new ClassPathXmlApplicationContext(
+                  springContextXmls);
+         } else
+         {
+            springContext = new ClassPathXmlApplicationContext(springContextXml);
+         }
+
+         factory = (BeanFactory) springContext;
+      } catch (Exception e)
+      {
+         throw new ActionLifecycleException(e);
+      }
+   }
+
+   /**
+    * Generic Exception handler for Spring Actions. Displays the root cause
+    * message and full stack trace.
+    * 
+    * @param message
+    * @param exception
+    */
+   public void exceptionHandler(Message message, Throwable exception)
+   {
+      Throwable rootCause = exception.getCause();
+      StackTraceElement[] traceElms = rootCause.getStackTrace();
+
+      StringBuffer stackTrace = new StringBuffer("Exception Root Cause is: \n");
+      stackTrace.append(rootCause.getMessage());
+      stackTrace.append("\n Full Stack Trace is: \n");
+      for (StackTraceElement elm : traceElms)
+      {
+         stackTrace.append(elm);
+         stackTrace.append("\n");
+      }
+
+      logger.error(stackTrace.toString());
+   }
+
+   /**
+    * Conviencence method for printing a console log header
+    */
+   protected void logHeader()
+   {
+      System.out.println("\n&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
+   }
+
+   /**
+    * Conviencence method for printing a console log footer
+    */
+   protected void logFooter()
+   {
+      System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&\n");
+   }
+
+   /* (non-Javadoc)
+    * @see org.jboss.soa.esb.actions.AbstractActionLifecycle#destroy()
+    */
+   public void destroy() throws ActionLifecycleException
+   {
+   }
+}

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/ContentBasedRouter.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/ContentBasedRouter.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/ContentBasedRouter.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -46,9 +46,11 @@
  */
 public class ContentBasedRouter extends AbstractActionPipelineProcessor
 {
-	public static final String ROUTE_TO_TAG = "route-to";
-    public static final String OBJECT_PATH_TAG = "object-path";
-    public static final String OBJECT_PATH     = "path";
+    private static final String MESSAGE_PERSISTER_SERVICE_CATEGORY = "";
+    private static final String MESSAGE_PERSISTER_SERVICE_NAME = "";
+	public static final String ROUTE_TO_TAG      = "route-to";
+    public static final String OBJECT_PATH_TAG   = "object-path";
+    public static final String OBJECT_PATH       = "path";
     public static final String DEFAULT_CBR_CLASS = "org.jboss.internal.soa.esb.services.routing.cbr.JBossRulesRouter";
 	private Logger log = Logger.getLogger(this.getClass());
 
@@ -94,8 +96,8 @@
                         + " are  not in found in the destination names in the configuration "
                         + _destinations.keySet() + ". Please fix your configuration.");
                
-                MessageRouter.deliverMessage(MessagePersister.SERVICE_CATEGORY
-                                           , MessagePersister.SERVICE_NAME
+                MessageRouter.deliverMessage(MESSAGE_PERSISTER_SERVICE_CATEGORY
+                                           , MESSAGE_PERSISTER_SERVICE_NAME
                                            , message);
             }
     		return message;

Deleted: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/MessagePersister.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/MessagePersister.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/MessagePersister.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,107 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-/**
- * Routes the Message argument to a fixed list of services ([category,name]) 
- * @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
- * @since Version 4.0
- */
-package org.jboss.soa.esb.actions;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.apache.log4j.Logger;
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.services.persistence.MessageStore;
-import org.jboss.soa.esb.services.persistence.MessageStoreException;
-import org.jboss.soa.esb.services.persistence.MessageStoreFactory;
-import org.jboss.soa.esb.services.persistence.MessageStoreType;
-import org.jboss.soa.esb.services.registry.RegistryException;
-import org.jboss.soa.esb.services.routing.MessageRouterException;
-
-public class MessagePersister extends AbstractActionPipelineProcessor
-{
-    public final static String SERVICE_CATEGORY = "JBossESB-Internal";
-    public final static String SERVICE_NAME = "DeadLetterService";
-    public final static String MESSAGE_STORE_TYPE_ATTR = "message-store-type";
-    public final static String CLASSIFICATION_ATTR = "classfication";
-    
-    protected ConfigTree config;
-    protected MessageStore messageStore;
-    private String classification;
-	private Logger log = Logger.getLogger(this.getClass());
-
-	public MessagePersister(ConfigTree config) throws ConfigurationException, RegistryException, MessageRouterException
-	{
-        this.config = config;
-	}
-	/** 
-     * Persists the message to the MessageStore
-	 */
-	public Message process(Message message) throws ActionProcessingException
-	{
-        try {
-            messageStore.addMessage(message, classification);
-        } catch (MessageStoreException mse) {
-            log.error("Could not store undeliverable message.", mse);
-        }
-		return message;
-	}
-    /* (non-Javadoc)
-     * @see org.jboss.soa.esb.actions.ActionLifecycle#initialise()
-     */
-    public void initialise() throws ActionLifecycleException {
-        //Reading the config
-        String messageStoreTypeValue = config.getAttribute(MESSAGE_STORE_TYPE_ATTR);
-        try {
-            
-            URI messageStoreType = MessageStoreType.DEFAULT_TYPE;
-            if (messageStoreTypeValue!=null) {
-                messageStoreType = new URI(messageStoreTypeValue);
-            }
-            String classificationValue   = config.getAttribute(CLASSIFICATION_ATTR);
-            if (classificationValue!=null) {
-                classification = classificationValue;
-            }
-            if (log.isDebugEnabled()) {
-                log.debug("MessagePersister started with classification=" + classification 
-                    + " and message-store-type=" + messageStoreType);
-            }
-            messageStore = MessageStoreFactory.getInstance().getMessageStore(messageStoreType);
-        } catch (URISyntaxException e) {
-                throw new ActionLifecycleException(
-                        "The message store type '" + messageStoreTypeValue + "' is not valid.", e);
-        }
-       
-    }
-    /* (non-Javadoc)
-     * @see org.jboss.soa.esb.actions.ActionLifecycle#destroy()
-     */
-    public void destroy() throws ActionLifecycleException {
-       classification=null;
-    }
-    
-    
-}

Deleted: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/converters/SmooksTransformer.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/converters/SmooksTransformer.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,632 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.soa.esb.actions.converters;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-
-import javax.jms.JMSException;
-import javax.jms.MessageListener;
-import javax.jms.Topic;
-import javax.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
-import javax.jms.TopicSession;
-import javax.jms.TopicSubscriber;
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-import org.apache.log4j.Logger;
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.actions.ActionLifecycleException;
-import org.jboss.soa.esb.actions.ActionPipelineProcessor;
-import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.actions.ActionUtils;
-import org.jboss.soa.esb.common.Configuration;
-import org.jboss.soa.esb.common.ModulePropertyManager;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.helpers.KeyValuePair;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.services.transform.TransformationException;
-import org.jboss.soa.esb.services.transform.TransformationService;
-import org.milyn.Smooks;
-import org.milyn.SmooksUtil;
-import org.milyn.container.standalone.StandaloneExecutionContext;
-import org.milyn.javabean.BeanAccessor;
-import org.milyn.profile.DefaultProfileSet;
-import org.milyn.profile.ProfileStore;
-import org.milyn.profile.UnknownProfileMemberException;
-import org.milyn.resource.URIResourceLocator;
-
-/**
- * Smooks Transformer.
- * <p/>
- * This processor hooks the <a href="http://milyn.codehaus.org/Smooks">Milyn Smooks</a>
- * XML Transformation/Processing Engine into a message processing pipeline to support
- * non binary message transformations.
- * 
- * <h3>Action Configuration</h3>
- * This action is configured as follows:
- * <pre>
- * &lt;action name="transformAB" class="<b>org.jboss.soa.esb.actions.converters.SmooksTransformer</b>"&gt;
- * 	&lt;property name="<b>from</b>" value="A" /&gt;
- * 	&lt;property name="<b>from-type</b>" value="text/xml:messageAtA" /&gt;
- * 	&lt;property name="<b>to</b>" value="B" /&gt;
- * 	&lt;property name="<b>to-type</b>" value="text/xml:messageAtB" /&gt;
- * &lt;/action&gt;
- * </pre>
- * 
- * <h3>Configuartion Loading &amp; Administration Console Integration</h3>
- * This class picks up its list of transformation resource configurations from a list file
- * specified in the "configuration.list.file.uri" parameter of the "transformation" 
- * section of the ESB configuration file.  This configuration
- * should specify a URI to this list file and is loaded using the {@link URIResourceLocator}.
- * The default list file is "classpath:/smooks-cdr.lst" (note classpath based URIs are supported).
- * <p/>  
- * This file contains a list of URIs that reference
- * <a href="http://milyn.codehaus.org/Smooks">Smooks</a> resource configurations files.
- * Again, {@link URIResourceLocator} is used to load these configurations.  "classpath:/"
- * is the default if no scheme is specified.  This is also where the Administration Console
- * is integrated with this class.  The list file needs to specify the following a HTTP based 
- * URI for accessing the configurations under management by the Administration console:
- * <pre>
- * 	http://localhost:8080/jboss-esb-console/transform/smooks-config.jsp
- * </pre>
- * ... where the host and port values need to be modified appropriately.
- * 
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- * @since Version 4.0
- */
-
-public class SmooksTransformer implements TransformationService, ActionPipelineProcessor {
-
-	/**
-	 * Configuration section key.
-	 */
-	public static final String CONFIGURATION_SECTION = "transformation";
-	/**
-	 * Key for storing/accessing any potential message Body bean HashMaps as populated
-	 * by the Smooks Javabean Cartridge.
-	 */
-	public static final String EXTRACTED_BEANS_HASH = "EXTRACTED_BEANS_HASH";
-	/**
-	 * Config property key for setting a true/false flag to indicate whether or not
-	 * a bean hashs should be set as the message payload before exiting the process method.
-	 */
-	public static final String SET_BEANHASH_TO_PAYLOAD = "set-beanhash-to-payload";
-		
-	public static final String FROM = "from";
-	public static final String FROM_TYPE = "from-type";
-	public static final String TO = "to";
-	public static final String TO_TYPE = "to-type";
-	
-    private static Logger logger = Logger.getLogger(SmooksTransformer.class);
-    private Smooks smooks;
-	private ConfigurationUpdateListener updateListener;
-    private String defaultMessageFromType;
-    private String defaultMessageFrom;
-    private String defaultMessageToType;
-    private String defaultMessageTo;
-    private boolean setPayloadToBeanHash = false;
-    private List<KeyValuePair> properties;
-
-    /**
-     * Public constructor.
-     * @param name Action name.
-     * @param propertiesTree Action Properties.
-     * @throws ConfigurationException Action not properly configured.
-     */
-	public SmooksTransformer(String name, ConfigTree propertiesTree) throws ConfigurationException {
-		this(propertiesTree);
-	}
-    
-    /**
-     * Public constructor.
-     * @param propertiesTree Action Properties.
-     * @throws ConfigurationException 
-     * @throws ConfigurationException Action not properly configured.
-     */
-	public SmooksTransformer(ConfigTree propertiesTree) throws ConfigurationException {
-		properties = propertiesTree.attributesAsList();
-
-		// Get the message flow properties...
-		defaultMessageFromType = KeyValuePair.getValue(FROM_TYPE, properties);
-		if(defaultMessageFromType != null && defaultMessageFromType.trim().equals("")) {
-			throw new ConfigurationException("Empty '" + FROM_TYPE + "' config attribute supplied.");
-		}
-		defaultMessageToType = KeyValuePair.getValue(TO_TYPE, properties);
-		if(defaultMessageToType != null && defaultMessageToType.trim().equals("")) {
-			throw new ConfigurationException("Empty '" + TO_TYPE + "' config attribute supplied.");
-		}
-		defaultMessageFrom = KeyValuePair.getValue(FROM, properties);
-		if(defaultMessageFrom != null && defaultMessageFrom.trim().equals("")) {
-			throw new ConfigurationException("Empty '" + FROM + "' config attribute supplied.");
-		}
-		defaultMessageTo = KeyValuePair.getValue(TO, properties);
-		if(defaultMessageTo != null && defaultMessageTo.trim().equals("")) {
-			throw new ConfigurationException("Empty '" + TO + "' config attribute supplied.");
-		}
-		
-		// Get the set-beanhash-to-payload property...
-		setPayloadToBeanHash = KeyValuePair.getBooleanValue(SET_BEANHASH_TO_PAYLOAD, properties, false);
-        
-        updateListener = new ConfigurationUpdateListener(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.jboss.soa.esb.services.transform.TransformationService#transform(org.jboss.soa.esb.message.Message)
-	 */
-	public Message transform(Message message) throws TransformationException {
-		try {
-			return process(message);
-		} catch (ActionProcessingException e) {
-			throw new TransformationException(e);
-		}
-	}
-
-    /* (non-Javadoc)
-     * @see org.jboss.soa.esb.actions.ActionProcessor#process(java.lang.Object)
-     */
-    public Message process(Message message) throws ActionProcessingException {
-    	Object payload = ActionUtils.getTaskObject(message);
-    	
-    	try {
-        	if(payload instanceof byte[]) {
-        		payload = new String((byte[])payload, "UTF-8");
-        	}
-        	
-        	if(payload instanceof String) {
-	            byte[] messageBytes = null;
-	            String transformedMessage;
-	        	String messageProfile;
-	            
-	            // Register the message useragent with Smooks (if not already registered)...
-	        	messageProfile = registerMessageProfile(message);
-	            
-                messageBytes = ((String)payload).getBytes("UTF-8");
-	
-	            long start = System.currentTimeMillis();
-	            StandaloneExecutionContext request;
-	            
-	            // Filter and Serialise...
-	            request = smooks.createExecutionContext( messageProfile );
-	            transformedMessage = SmooksUtil.filterAndSerialize( request, new ByteArrayInputStream( messageBytes), smooks );
-	            
-	            // Javabean cartridge resources may have extract data from the message and populated some beans.
-	            // Get them and stick them on the message - so they can be accessed by downstream actions...
-	            HashMap beanHash = BeanAccessor.getBeans(request);
-	            if(beanHash != null) {
-	            	message.getBody().add(EXTRACTED_BEANS_HASH, beanHash);
-	            }
-	            
-	            if(logger.isDebugEnabled()) {
-	            	long timeTaken = System.currentTimeMillis() - start;
-	            	logger.debug("Transformed message for useragent [" + messageProfile + "]. Time taken: " 
-	            			+ timeTaken + ".  Message in:\n[" + payload.toString()+ "].  \nMessage out:\n[" + transformedMessage + "].");
-	            }
-	            
-	            if(beanHash != null && setPayloadToBeanHash) {
-	            	ActionUtils.setTaskObject(message, beanHash);
-	            } else {
-	            	ActionUtils.setTaskObject(message, transformedMessage);
-	            	message.getBody().setByteArray(transformedMessage.getBytes("UTF-8"));
-	            }
-	        } else {
-	        	String sClass = (null==payload) ? "<null>" : payload.getClass().getName();
-	            logger.warn("String message types only supported.  Input message was [" 
-	            		+ sClass + "].  Returning message untransformed.");
-	        }
-    	} catch(Throwable thrown) {
-    		thrown.printStackTrace();
-    		throw new ActionProcessingException("Message transformation failed.", thrown);
-    	}
-        
-        // TODO: Cater for more message input types e.g. InputStream, DOM Document...
-        // TODO: Cater for more message output types e.g. InputStream, DOM Document...
-    	
-    	return message;
-    }
-
-    /**
-	 * Register the Message Exchange as a profile within Smooks.
-	 * @param message The message.
-	 * @return The Smooks "profile" string that uniquely identifies the message flow associated
-	 * with the message.
-	 * @throws ActionProcessingException Failed to register the message flow for the message.
-	 */
-	private String registerMessageProfile(Message message) throws ActionProcessingException {
-		String messageProfile;
-    	String messageFromType;
-        String messageFrom;
-        String messageToType;
-        String messageTo;
-
-        // Get the routing info from the message...
-        messageFrom = (String)message.getProperties().getProperty(FROM, defaultMessageFrom);
-        messageTo = (String)message.getProperties().getProperty(TO, defaultMessageTo);
-        
-        // Get the message typing info from the message...
-		messageFromType = (String)message.getProperties().getProperty(FROM_TYPE, defaultMessageFromType);
-		messageToType = (String)message.getProperties().getProperty(TO_TYPE, defaultMessageToType);
-		
-		// Construct the message useragent string for use with Smooks.  This is basically the 
-		// name of the Message Exchange on which transformations are to be performed...
-        messageProfile = getMessageProfileString(messageFromType, messageFrom, messageToType, messageTo);
-        
-        // Register this message flow if it isn't already registered...
-        try {
-        	ProfileStore profileStore = smooks.getApplicationContext().getProfileStore();
-        	profileStore.getProfileSet(messageProfile);
-        } catch(UnknownProfileMemberException e) {
-        	String[] profiles = getMessageProfiles(messageFromType, messageFrom, messageToType, messageTo);
-        	
-            synchronized (SmooksTransformer.class) {
-		        // Register the message flow within the Smooks context....
-	        	logger.info("Registering JBoss ESB Message-Exchange as Smooks Profile: [" + messageProfile + "].  Profiles: [" + Arrays.asList(profiles) + "]");
-	        	SmooksUtil.registerProfileSet(DefaultProfileSet.create( messageProfile, profiles ), smooks);
-            }
-        }
-        
-		return messageProfile;
-	}
-
-    /**
-     * Get the profile list based on the supplied message flow properties.
-	 * @param messageFromType The type string for the message source.
-	 * @param messageFrom The Message Exchange Participant name for the message source.
-	 * @param messageToType The type string for the message target.
-	 * @param messageTo The Message Exchange Participant name for the message target.
-	 * @return The list of profiles.
-	 */
-	protected static String[] getMessageProfiles(String messageFromType, String messageFrom, String messageToType, String messageTo) {
-		List<String> profiles = new ArrayList<String>();
-		String[] profileArray;
-		
-		if(messageFromType != null) {
-			profiles.add(FROM_TYPE + ":" + messageFromType);
-		}
-		if(messageFrom != null) {
-			profiles.add(FROM + ":" + messageFrom);
-		}
-		if(messageToType != null) {
-			profiles.add(TO_TYPE + ":" + messageToType);
-		}
-		if(messageTo != null) {
-			profiles.add(TO + ":" + messageTo);
-		}
-		
-		profileArray = new String[profiles.size()];
-		profiles.toArray(profileArray);
-
-		return profileArray;
-	}
-
-	/**
-	 * Construct the Smooks profile string based on the supplied message flow properties.
-	 * @param messageFromType The type string for the message source.
-	 * @param messageFrom The EPR string for the message source.
-	 * @param messageToType The type string for the message target.
-	 * @param messageTo The EPR srting for the message target.
-	 * @return Smooks profile string for the message flow.
-	 */
-	protected static String getMessageProfileString(String messageFromType, String messageFrom, String messageToType, String messageTo) {
-		StringBuffer string = new StringBuffer();
-		
-		if(messageFromType != null) {
-			string.append(FROM_TYPE + ":" + messageFromType);
-			string.append((messageFrom!=null || messageToType!=null || messageTo!=null?":":""));
-		}
-		if(messageFrom != null) {
-			string.append(FROM + ":" + messageFrom);
-			string.append((messageToType!=null || messageTo!=null?":":""));
-		}
-		if(messageToType != null) {
-			string.append(TO_TYPE + ":" + messageToType);
-			string.append((messageTo!=null?":":""));
-		}
-		if(messageTo != null) {
-			string.append(TO + ":" + messageTo);
-		}
-		
-		return string.toString();
-	}
-
-    public void processException(final Message message, final Throwable th) {
-    }
-
-    public void processSuccess(final Message message) {
-    }
-
-    /**
-     * Initialise the SmooksStandalone instance.
-     * <p/>
-     * We may need to write a Smooks Container implementation specifically for JBossESB's needs.  SmooksStandalone is
-     * fine for a start though.
-     * @throws ActionLifecycleException Failed to load Smooks configurations.
-     */
-    public void initialise() throws ActionLifecycleException {
-        String smooksCdrlFile;
-        InputStream configListStream;
-
-        // Get the configuration list file - can be overridden through a system property...
-        smooksCdrlFile = ModulePropertyManager.getPropertyManager(CONFIGURATION_SECTION).getProperty("configuration.list.file.uri", "classpath:/smooks-cdr.lst");
-        try {
-            configListStream = (new URIResourceLocator()).getResource(smooksCdrlFile);
-        } catch (IOException e) {
-            throw new ActionLifecycleException("Failed to locate Tranformation configuration list file [" + smooksCdrlFile + "].  This resource must be made available at the specified URI.", e);
-        }
-        if(configListStream == null) {
-            throw new ActionLifecycleException("Failed to locate Tranformation configuration list file [" + smooksCdrlFile + "].  This resource must be made available at the specified URI.");
-        }
-
-        // Initialise the local SmooksStandalone instance.  This "local" reference is
-        // used because we are using on the "global" smooks variable reference to controll
-        // access to this synchronisation block ...
-//        smooks = new SmooksStandalone("UTF-8");
-        smooks = new Smooks();
-
-        try {
-            BufferedReader configReader = new BufferedReader(new InputStreamReader(configListStream));
-            StandaloneExecutionContext context = smooks.createExecutionContext();
-            context.getContext().getStore().load(configReader );
-        } catch (Exception e) {
-        	e.printStackTrace();
-            smooks = null;
-            throw new ActionLifecycleException("Smooks configuration load failed.", e);
-        } finally {
-            try {
-                configListStream.close();
-            } catch (IOException e) {
-                logger.error("Error while closing transformation list config stream [" + smooksCdrlFile + "].", e);
-            }
-        }
-
-        logger.info("All Smooks configurations are now loaded.");
-    }
-
-    public void destroy() throws ActionLifecycleException {
-        updateListener.close();
-    }
-    
-    /**
-     * Reset the transformer.
-     * <p/>
-     * Clears the internal static smooks instance.
-     */
-    public void reset() {
-    	Smooks instance = smooks;
-    	
-        synchronized (SmooksTransformer.class) {
-        	if(smooks == instance) {
-        		smooks = null;
-        	}
-        }
-    }
-
-    /**
-     * JMS Listener for receiving configuration update notifications.
-     * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
-     */
-    private static class ConfigurationUpdateListener implements MessageListener {
-    	
-    	private TopicConnection conn = null;
-    	private TopicSession session = null;
-    	private Topic topic = null;
-        private SmooksTransformer transformer;
-
-        public ConfigurationUpdateListener(SmooksTransformer transformer) {
-            this.transformer = transformer;
-        }
-
-        /**
-    	 * Private constructor.
-    	 * <p/>
-    	 * Connects the listener to the topic.
-    	 */
-    	private ConfigurationUpdateListener() {
-    		try {
-    			connect();
-    		} catch(Throwable t) {
-				logger.error("Unexpected error while attempting to connect Transformation configuration Update Listener.  Update listener not enabled!", t);
-				close();
-				return;
-    		}
-    	}
-
-		/**
-    	 * Receive a notification message.
-    	 */
-		public void onMessage(javax.jms.Message message) {
-			// Reset the transformer instance so as to force a config reload.
-			logger.info("Transformation configuration update notification received.  Resetting SmooksTransformer in order to force a configuration re-read.");
-			transformer.reset();
-		}    	
-
-		/**
-		 * Connect to the configured topic.
-		 */
-    	private boolean connect() {
-    		TopicConnectionFactory connectionFactory = null;
-
-			logger.info("Attempting to connect Transformation configuration Update Listener to update notification topic.");
-    		
-    		// Get the Topic ConnectionFactory...
-    		try {
-				connectionFactory = (TopicConnectionFactory) Configuration.getJmsConnectionFactory(CONFIGURATION_SECTION);
-			} catch (ConfigurationException e) {
-				logger.error("Lookup of the JMS ConnectionFactory failed for the Transformation configuration Update Listener. Update listener not enabled!", e);
-				return false;
-			} catch (ClassCastException e) {
-				logger.error("Invalid JMS ConnectionFactory config for the Transformation configuration Update Listener.  ConnectionFactory doesn't implement " + TopicConnectionFactory.class.getName() + ". Update listener not enabled!", e);
-				return false;
-			}
-			
-			// Create the topic connection...
-			try {
-				conn = connectionFactory.createTopicConnection();
-			} catch (JMSException e) {
-				logger.error("Failed to open JMS TopicConnection for the Transformation configuration Update Listener. Update listener not enabled!", e);
-				return false;
-			}
-			
-			// Lookup the topic...
-    		String notificationTopic = ModulePropertyManager.getPropertyManager(CONFIGURATION_SECTION).getProperty("update.notification.topic", "topic/org.jboss.soa.esb.transformation.Update");
-			try {
-				Context context = Configuration.getNamingContext(CONFIGURATION_SECTION);
-				topic = (Topic) context.lookup(notificationTopic);
-                context.close();
-			} catch (ConfigurationException e) {
-				logger.error("Topic lookup failed for the Transformation configuration Update Listener.  Topic name '" + notificationTopic + "'.  \n\t\tThis JMS Topic may not be deployed, or this ESB instance may not be looking at the correct JMS provider (check configuration '" + Context.PROVIDER_URL + "' in config module/section '" + CONFIGURATION_SECTION + "').  \n\t\tUpdate listener not enabled!", e);
-				close();
-				return false;
-			} catch (NamingException e) {
-				logger.warn("Topic lookup failed for the Transformation configuration Update Listener.  Topic name '" + notificationTopic + "'.  \n\tThis JMS Topic may not be deployed, or this ESB instance may not be looking at the correct JMS provider (check configuration '" + Context.PROVIDER_URL + "' in config module/section '" + CONFIGURATION_SECTION + "').  \n\tUpdate listener not enabled!");
-				close();
-				return false;
-			}
-			
-			// Create the TopicSession...
-			try {
-				session = conn.createTopicSession(false, TopicSession.AUTO_ACKNOWLEDGE);
-			} catch (JMSException e) {
-				logger.error("TopicSession creation failed for the Transformation configuration Update Listener.  Update listener not enabled!", e);
-				close();
-				return false;
-			}
-			
-			// Start the connection...
-			try {
-				conn.start();
-			} catch (JMSException e) {
-				logger.error("Failed to start JMS TopicConnection for the Transformation configuration Update Listener.  Update listener not enabled!", e);
-				close();
-				return false;
-			}
-			
-			// Bind "this" listener to the topic...
-			try {
-				TopicSubscriber topicSubscriber = session.createSubscriber(topic);
-				topicSubscriber.setMessageListener(this);
-			} catch (JMSException e) {
-				logger.error("Failed to start JMS TopicConnection for the Transformation configuration Update Listener.  Update listener not enabled!", e);
-				close();
-				return false;
-			}
-
-			// Listen for exceptions on the connection...
-			try {
-				conn.setExceptionListener(new ExceptionListener());
-			} catch (JMSException e) {
-				logger.error("Failed to attach an ExceptionListener for the Transformation configuration Update Listener.  Update listener not enabled!", e);
-				close();
-				return false;
-			}
-
-			logger.info("Transformation Configuration Update Listener started!");
-
-			return true;
-    	}
-    	
-    	@Override
-		protected void finalize() throws Throwable {
-    		close();
-			super.finalize();
-		}
-
-		/**
-    	 * Close out the listener and all it's resources.
-    	 */
-		private void close() {
-			try {
-				if(conn != null) {
-					conn.stop();
-					logger.info("Update Listener JMS TopicConnection stopped.");
-				}
-			} catch (Throwable e) {
-				logger.error("Failed to stop Update Listener JMS connection.", e);
-				conn = null;
-			}
-			try {
-				if(session != null) {
-					session.close();
-					logger.info("Update Listener JMS TopicSession closed.");
-				}
-			} catch (Throwable e) {
-				logger.error("Failed to close Update Listener JMS session.", e);
-			} finally {
-				session = null;
-			}
-			try {
-				if(conn != null) {
-					conn.close();
-					logger.info("Update Listener JMS TopicConnection closed.");
-				}
-			} catch (Throwable e) {
-				logger.error("Failed to close Update Listener JMS connection.", e);
-			} finally {
-				conn = null;
-			}
-			topic = null;
-		}
-
-		/**
-		 * Exception Listener.
-		 * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
-		 */
-		private class ExceptionListener implements javax.jms.ExceptionListener {
-
-			/**
-			 * We want this listener to handle only one exception.
-			 * It will close all existing resources and create a new instance
-			 * once it successfully reconnects.
-			 */
-			private boolean hasHandledOneException = false;
-			
-			/* (non-Javadoc)
-			 * @see javax.jms.ExceptionListener#onException(javax.jms.JMSException)
-			 */
-			public void onException(JMSException e) {
-				synchronized (ExceptionListener.class) {
-					if(!hasHandledOneException) {
-						logger.error("JMS Exception on Transformation Configuration Update Listener.", e);
-						close();
-						while(!connect()) {
-							try {
-								Thread.sleep(5000);
-							} catch (InterruptedException e1) {
-								logger.error("Interrupted during reconnect attempt.  Aborting reconnect!  Will need restart to reconnect.", e);
-							}
-						}
-						hasHandledOneException = true;
-					}
-				}
-			}
-		}
-    }
-}

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/routing/AbstractRouter.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/routing/AbstractRouter.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/routing/AbstractRouter.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -27,8 +27,8 @@
 import javax.naming.NamingException;
 
 import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
 import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.actions.ActionProcessor;
 import org.jboss.soa.esb.actions.ActionUtils;
 import org.jboss.soa.esb.helpers.KeyValuePair;
 import org.jboss.soa.esb.message.Message;
@@ -41,7 +41,7 @@
  * 
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  */
-public abstract class AbstractRouter implements ActionProcessor {
+public abstract class AbstractRouter extends AbstractActionPipelineProcessor {
 
 	/**
 	 * Unwrap the message payload before routing. 

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/soap/JBossWSAdapter.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/soap/JBossWSAdapter.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/soap/JBossWSAdapter.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -22,9 +22,9 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.UnsupportedEncodingException;
+import java.util.Set;
 
 import javax.management.ObjectName;
-import javax.xml.soap.SOAPMessage;
 
 import org.jboss.internal.soa.esb.publish.Publish;
 import org.jboss.soa.esb.ConfigurationException;
@@ -33,9 +33,11 @@
 import org.jboss.soa.esb.actions.ActionUtils;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.message.Message;
-import org.jboss.ws.server.ServiceEndpoint;
-import org.jboss.ws.server.ServiceEndpointManager;
-import org.jboss.ws.server.ServiceEndpointManagerFactory;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.InvocationContext;
+import org.jboss.wsf.spi.invocation.RequestHandler;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
 
 /**
  * JBoss Webservices endpoint adapter.
@@ -67,20 +69,22 @@
      * @throws ActionProcessingException
      */
     public Message process(final Message message) throws ActionProcessingException {
-        ServiceEndpoint sep = getServiceEndpoint(jbossws_endpoint);
+        Endpoint endpoint = getServiceEndpoint(jbossws_endpoint);
         byte[] soapMessage;
 
-        if(sep == null) {
+        if(endpoint == null) {
             throw new ActionProcessingException("Unknown Service Endpoint '" + jbossws_endpoint + "'.");
         }
 
         soapMessage = getSOAPMessagePayload(message);
         try {
             messageTL.set(message);
-            SOAPMessage resMessage = sep.handleRequest(null, null, new ByteArrayInputStream(soapMessage));
+            RequestHandler requestHandler = endpoint.getRequestHandler();
+            InvocationContext invocationContext = endpoint.getInvocationHandler().createInvocation().getInvocationContext();
             ByteArrayOutputStream os = new ByteArrayOutputStream();
 
-            resMessage.writeTo(os);
+            requestHandler.handleRequest(endpoint, new ByteArrayInputStream(soapMessage), os, invocationContext);
+
             ActionUtils.setTaskObject(message, new String(os.toByteArray()).trim());
         }
         catch (Exception ex) {
@@ -122,15 +126,15 @@
      * @param endpointName Service Endpoint name.
      * @return The service endpoint, or null if the endpoint is not found.
      */
-    protected static ServiceEndpoint getServiceEndpoint(String endpointName) {
-        ServiceEndpointManagerFactory factory = ServiceEndpointManagerFactory.getInstance();
-        ServiceEndpointManager epManager = factory.getServiceEndpointManager();
+    protected static Endpoint getServiceEndpoint(String endpointName) {
+        EndpointRegistry registry = EndpointRegistryFactory.getEndpointRegistry();
+        Set<ObjectName> objectNames = registry.getEndpoints();
 
-        for (ObjectName epObjectName : epManager.getServiceEndpoints()) {
-            String endpoint = epObjectName.getKeyProperty("endpoint");
+        for (ObjectName objectName : objectNames) {
+            String endpoint = objectName.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
 
             if (endpoint != null && endpoint.equals(endpointName)) {
-                return epManager.getServiceEndpointByID(epObjectName);
+                return registry.getEndpoint(objectName);
             }
         }
 

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/soap/JBossWSAdapterContractPublisher.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/soap/JBossWSAdapterContractPublisher.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/soap/JBossWSAdapterContractPublisher.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -23,7 +23,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.URI;
-import java.net.URL;
 import java.util.List;
 
 import javax.xml.transform.stream.StreamResult;
@@ -35,8 +34,10 @@
 import org.jboss.soa.esb.dom.YADOMUtil;
 import org.jboss.soa.esb.listeners.config.ActionDocument.Action;
 import org.jboss.soa.esb.listeners.config.PropertyDocument.Property;
-import org.jboss.ws.server.ServiceEndpoint;
-import org.milyn.xml.XmlUtil;
+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.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
@@ -79,12 +80,14 @@
      * @return WSDL Contract.
      */
     public ContractInfo getContractInfo(EPR epr) {
-        ServiceEndpoint endpoint = JBossWSAdapter.getServiceEndpoint(endpointName);
+        Endpoint endpoint = JBossWSAdapter.getServiceEndpoint(endpointName);
+        RequestHandler requestHandler = endpoint.getRequestHandler();
+        InvocationContext invocationContext = new BasicInvocationContext();
         ByteArrayOutputStream wsdlStream =  new ByteArrayOutputStream();
 
         try {
             // Generate the WSDL...
-            endpoint.handleWSDLRequest(wsdlStream, new URL("http://x.y.z"), null);
+            requestHandler.handleWSDLRequest(endpoint, wsdlStream, invocationContext);
             String wsdl = updateWsdl(new String(wsdlStream.toByteArray()), epr);
 
             return new ContractInfo("text/xml", wsdl);
@@ -107,8 +110,8 @@
 
         // Now, fudge it to fix up the binding transport and endpoint addressing info...
         Document wsdlDoc = YADOMUtil.parseStream(new ByteArrayInputStream(wsdl.getBytes("UTF-8")), false, false);
-        Attr transport = (Attr) XmlUtil.getNode(wsdlDoc, "/definitions/binding/binding/@transport");
-        Attr address = (Attr) XmlUtil.getNode(wsdlDoc, "/definitions/service/port/address/@location");
+        Attr transport = (Attr) YADOMUtil.getNode(wsdlDoc, "/definitions/binding/binding/@transport");
+        Attr address = (Attr) YADOMUtil.getNode(wsdlDoc, "/definitions/service/port/address/@location");
 
         // TODO: Doubt this is the correct thing to do!!
         transport.setNodeValue("http://schemas.xmlsoap.org/soap/" + endpointURI.getScheme());

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/soap/SOAPClient.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/soap/SOAPClient.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/soap/SOAPClient.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,38 +1,46 @@
 package org.jboss.soa.esb.actions.soap;
 
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanException;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.management.ReflectionException;
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.soap.OGNLUtils;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.soa.esb.ConfigurationException;
 import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
+import org.jboss.soa.esb.actions.ActionLifecycleException;
 import org.jboss.soa.esb.actions.ActionProcessingException;
 import org.jboss.soa.esb.actions.ActionUtils;
-import org.jboss.soa.esb.actions.ActionLifecycleException;
 import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.util.ClassUtil;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.internal.soa.esb.soap.OGNLUtils;
-import org.apache.log4j.Logger;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpStatus;
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
-import org.xml.sax.InputSource;
 
-import javax.management.*;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.namespace.QName;
-import java.util.Map;
-import java.util.LinkedHashMap;
-import java.io.IOException;
-import java.io.StringReader;
-
 import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
+import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.xml.QNameMap;
 import com.thoughtworks.xstream.io.xml.StaxDriver;
-import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 
 /**
  * SOAP Client action processor.
@@ -351,7 +359,7 @@
     }
 
     private Map<String, String> populateResponseOgnlMap(String response) throws ActionProcessingException {
-        Map map = new LinkedHashMap<String, String>();
+        Map<String, String> map = new LinkedHashMap<String, String>();
 
         try {
             DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
@@ -417,7 +425,7 @@
     }
 
     private static DocumentBuilderFactory createDocumentBuilderFactory() {
-        DocumentBuilderFactory factory = factory = DocumentBuilderFactory.newInstance();
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         
         factory.setNamespaceAware(true);
         factory.setExpandEntityReferences(true);

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/templating/StringTemplateProcessor.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/templating/StringTemplateProcessor.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/templating/StringTemplateProcessor.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,14 +1,14 @@
 package org.jboss.soa.esb.actions.templating;
 
+import java.util.Map;
+
+import org.antlr.stringtemplate.StringTemplate;
+import org.antlr.stringtemplate.StringTemplateGroup;
 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.antlr.stringtemplate.StringTemplate;
-import org.antlr.stringtemplate.StringTemplateGroup;
 
-import java.util.Map;
-
 /**
  * <a href="http://www.stringtemplate.org">StringTemplate</a> Processor.
  * <p/>

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/ServiceInvoker.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/ServiceInvoker.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/ServiceInvoker.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -21,17 +21,17 @@
 */
 package org.jboss.soa.esb.listeners;
 
-import org.jboss.soa.esb.message.Message;
+import java.util.Collection;
+
 import org.jboss.soa.esb.addressing.EPR;
 import org.jboss.soa.esb.addressing.MalformedEPRException;
+import org.jboss.soa.esb.couriers.Courier;
+import org.jboss.soa.esb.couriers.CourierException;
 import org.jboss.soa.esb.couriers.CourierFactory;
 import org.jboss.soa.esb.couriers.CourierUtil;
-import org.jboss.soa.esb.couriers.Courier;
-import org.jboss.soa.esb.couriers.CourierException;
+import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.services.registry.RegistryException;
 
-import java.util.Collection;
-
 /**
  * At initialization, this object looks up target EPR for a given service/category.
  * The postMessage method invokes on a target EPR.

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/GatewayGenerator.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/GatewayGenerator.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/GatewayGenerator.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -36,10 +36,10 @@
 import org.jboss.soa.esb.listeners.config.mappers.FtpListenerMapper;
 import org.jboss.soa.esb.listeners.config.mappers.GroovyListenerMapper;
 import org.jboss.soa.esb.listeners.config.mappers.JbrListenerMapper;
+import org.jboss.soa.esb.listeners.config.mappers.JcaGatewayMapper;
 import org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapper;
 import org.jboss.soa.esb.listeners.config.mappers.SqlListenerMapper;
 import org.jboss.soa.esb.listeners.config.mappers.UntypedListenerMapper;
-import org.jboss.soa.esb.listeners.config.mappers.JcaGatewayMapper;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/Generator.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/Generator.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/Generator.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -197,7 +197,7 @@
 			this.jbossesb = xmlBeansDoc.getJbossesb();
 		}
 
-		/**
+        /**
 		 * Get the list of ESB Gateway Listeners from the configuration.
 		 * @return The list of ESB Gateway Listeners from the configuration.
 		 */
@@ -213,7 +213,7 @@
 			return getListeners(false);
 		}
 
-		/**
+        /**
 		 * Get the Service to which the supplied {@link Listener} configuration instance is bound.
 		 * @param listener The listener instance (Gateway or ESB Aware).
 		 * @return The Service to which the 

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/ActionMapper.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/ActionMapper.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/ActionMapper.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -29,7 +29,6 @@
 import org.jboss.soa.esb.listeners.config.Generator.XMLBeansModel;
 import org.jboss.soa.esb.listeners.config.PropertyDocument.Property;
 import org.jboss.soa.esb.listeners.config.ServiceDocument.Service;
-import org.milyn.xml.DomUtils;
 import org.w3c.dom.Element;
 
 /**
@@ -79,7 +78,7 @@
 			// If the property has child content, add that directy to the action.  Of course it only really
 			// makes sense to do this with one property!
 			if(propertyElement.hasChildNodes()) {
-				DomUtils.copyChildNodes(propertyElement, actionConfigTree);
+				YADOMUtil.copyChildNodes(propertyElement, actionConfigTree);
 			} else {
 				actionConfigTree.setAttribute(property.getName(), property.getValue());
 			}

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/JcaGatewayMapper.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/JcaGatewayMapper.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/JcaGatewayMapper.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -25,8 +25,8 @@
 import org.jboss.soa.esb.dom.YADOMUtil;
 import org.jboss.soa.esb.listeners.ListenerTagNames;
 import org.jboss.soa.esb.listeners.config.Generator;
+import org.jboss.soa.esb.listeners.config.ServiceDocument;
 import org.jboss.soa.esb.listeners.config.JcaGatewayDocument.JcaGateway;
-import org.jboss.soa.esb.listeners.config.ServiceDocument;
 import org.jboss.soa.esb.listeners.jca.JcaInflowGateway;
 import org.w3c.dom.Element;
 

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/MapperUtil.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/MapperUtil.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/MapperUtil.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -27,6 +27,7 @@
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlCursor.TokenType;
 import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.dom.YADOMUtil;
 import org.jboss.soa.esb.listeners.ListenerTagNames;
 import org.jboss.soa.esb.listeners.config.Bus;
 import org.jboss.soa.esb.listeners.config.Listener;
@@ -37,7 +38,6 @@
 import org.jboss.soa.esb.listeners.message.MessageAwareListener;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.milyn.xml.DomUtils;
 
 /**
  * Mapper utility methods.
@@ -98,7 +98,7 @@
          serialize(property, propertyElement);
          if (propertyElement.hasChildNodes())
          {
-            DomUtils.copyChildNodes(propertyElement, target);
+            YADOMUtil.copyChildNodes(propertyElement, target);
          }
          else
          {

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/PackageJmsMessageContents.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/PackageJmsMessageContents.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/PackageJmsMessageContents.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -55,7 +55,7 @@
 
      javax.jms.Message jmsMsg = (javax.jms.Message) obj;
      Message message = MessageFactory.getInstance().getMessage();
-     message.getBody().setContents(getMessageContent(jmsMsg));
+     message.getBody().setByteArray(getMessageContent(jmsMsg));
      Enumeration<String> EE = jmsMsg.getPropertyNames();
      if (null != EE)
      {

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/ActivationBridge.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/ActivationBridge.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/ActivationBridge.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -21,9 +21,10 @@
 */
 package org.jboss.soa.esb.listeners.jca;
 
-import javax.resource.spi.endpoint.MessageEndpointFactory;
 import java.util.Map;
 
+import javax.resource.spi.endpoint.MessageEndpointFactory;
+
 /**
  * Bridges different vendor JCA implementations to activate an endpoint
  *

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/EndpointFactory.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/EndpointFactory.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/EndpointFactory.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -21,15 +21,16 @@
 */
 package org.jboss.soa.esb.listeners.jca;
 
-import javax.resource.spi.UnavailableException;
-import javax.resource.spi.endpoint.MessageEndpoint;
-import javax.resource.spi.endpoint.MessageEndpointFactory;
-import javax.transaction.xa.XAResource;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
+import javax.resource.spi.UnavailableException;
+import javax.resource.spi.endpoint.MessageEndpoint;
+import javax.resource.spi.endpoint.MessageEndpointFactory;
+import javax.transaction.xa.XAResource;
+
 /**
  * comment
  *

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/EndpointProxy.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/EndpointProxy.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/EndpointProxy.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -21,9 +21,8 @@
 */
 package org.jboss.soa.esb.listeners.jca;
 
-import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
-import org.jboss.logging.Logger;
-import org.jboss.tm.TransactionManagerLocator;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
 
 import javax.resource.ResourceException;
 import javax.resource.spi.endpoint.MessageEndpointFactory;
@@ -31,9 +30,12 @@
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
 import javax.transaction.xa.XAResource;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
 
+import org.jboss.logging.Logger;
+import org.jboss.tm.TransactionManagerLocator;
+
+import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
+
 /**
  * comment
  *

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/JBoss42ActivationBridge.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/JBoss42ActivationBridge.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/JBoss42ActivationBridge.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -21,20 +21,21 @@
 */
 package org.jboss.soa.esb.listeners.jca;
 
-import org.apache.log4j.Logger;
-import org.jboss.metadata.ActivationConfigPropertyMetaData;
-import org.jboss.mx.util.JMXExceptionDecoder;
-import org.jboss.mx.util.MBeanServerLocator;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map;
 
 import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 import javax.resource.spi.ActivationSpec;
 import javax.resource.spi.endpoint.MessageEndpointFactory;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Map;
 
+import org.apache.log4j.Logger;
+import org.jboss.metadata.ActivationConfigPropertyMetaData;
+import org.jboss.mx.util.JMXExceptionDecoder;
+import org.jboss.mx.util.MBeanServerLocator;
+
 /**
  * interfaces with JCA to activate an endpoint
  *

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/JcaInflowGateway.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/JcaInflowGateway.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/JcaInflowGateway.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -21,19 +21,19 @@
 */
 package org.jboss.soa.esb.listeners.jca;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+
 import org.jboss.soa.esb.ConfigurationException;
 import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.listeners.ListenerTagNames;
+import org.jboss.soa.esb.listeners.ListenerUtil;
+import org.jboss.soa.esb.listeners.ServiceInvoker;
 import org.jboss.soa.esb.listeners.lifecycle.AbstractThreadedManagedLifecycle;
 import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleException;
-import org.jboss.soa.esb.listeners.ListenerUtil;
-import org.jboss.soa.esb.listeners.ListenerTagNames;
-import org.jboss.soa.esb.listeners.ServiceInvoker;
 
-import java.util.HashMap;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
 /**
  * @author <a href="bill at jboss.com">Bill Burke</a>
  * @version $Revision: 1.1 $

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/JmsEndpoint.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/JmsEndpoint.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/jca/JmsEndpoint.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -21,12 +21,12 @@
 */
 package org.jboss.soa.esb.listeners.jca;
 
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
 import org.jboss.soa.esb.listeners.ServiceInvoker;
 import org.jboss.soa.esb.listeners.gateway.PackageJmsMessageContents;
 
-import javax.jms.MessageListener;
-import javax.jms.Message;
-
 /**
  * comment
  *

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/lifecycle/ManagedLifecycleController.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/lifecycle/ManagedLifecycleController.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/lifecycle/ManagedLifecycleController.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -37,6 +37,7 @@
  */
 public class ManagedLifecycleController
 {
+
    /**
     * The managed lifecycle instances.
     */
@@ -46,7 +47,7 @@
     */
    private final String lifecycleIdentity ;
 
-   /**
+    /**
     * Construct the controller to manage the specified managed lifecycle instances.
     *
     * @param lifecycles The managed lifecycle instances.
@@ -74,6 +75,7 @@
    {
       final LifecycleIdentity lifecycleIdentitySingleton = LifecycleIdentity.getSingleton() ;
       final String currentIdentity = lifecycleIdentitySingleton.getThreadLifecycleIdentity() ;
+
       try
       {
          lifecycleIdentitySingleton.setThreadLifecycleIdentity(lifecycleIdentity) ;
@@ -86,7 +88,7 @@
       }
    }
 
-   /**
+    /**
     * Restart the lifecyles for the managed instances.
     * <p/>
     * The managed instances will be left in the destroyed state if an error occurs.
@@ -127,7 +129,7 @@
          lifecycleIdentitySingleton.setThreadLifecycleIdentity(lifecycleIdentity) ;
          stopInstances();
          destroyInstances();
-      
+
          // Cleanup resources.
          CourierFactory.releaseCouriers() ;
          CourierFactory.destroyLifecycleIdentityMap(lifecycleIdentity) ;

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -252,8 +252,6 @@
                     waitForEventAndProcess(100) ;
                 }
             }
-            if (null != _execService)
-                _execService.shutdown();
 
             if (_logger.isDebugEnabled())
             {
@@ -293,25 +291,17 @@
 
 		if (null != message)
 		{
-			try
-			{
-                            final Runnable pipelineRunner = new Runnable() {
-                                public void run() {
-                                    try {
-                                        pipeline.process(message) ;
-                                    } finally {
-                                        updateThreadCount(-1) ;
-                                    }
-                                }
-                            } ;
-                            updateThreadCount(+1);
-                            _execService.execute(pipelineRunner);
-			}
-			catch (Exception e)
-			{
-				_logger.error("ActionProcessingPipeline exception", e);
-				return;
-			}
+                    final Runnable pipelineRunner = new Runnable() {
+                        public void run() {
+                            try {
+                                pipeline.process(message) ;
+                            } finally {
+                                updateThreadCount(-1) ;
+                            }
+                        }
+                    } ;
+                    updateThreadCount(+1);
+                    _execService.execute(pipelineRunner);
 		}
 
 	} // ________________________________
@@ -324,8 +314,17 @@
         protected void doDestroy()
             throws ManagedLifecycleException
         {
-            checkExecutorTermination() ;
+            if (!waitForRunningStateChange(ManagedLifecycleThreadState.STOPPED, getTerminationPeriod()))
+            {
+                throw new ManagedLifecycleException("Failed to reach STOPPED state within specified termination period") ;
+            }
             
+            if (_execService != null)
+            {
+                _execService.shutdown() ;
+                checkExecutorTermination() ;
+            }
+            
             pipeline.destroy() ;
             pipeline = null ;
             

Copied: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/mock (from rev 12348, labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/mock)

Deleted: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/mock/MockAction.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/mock/MockAction.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/mock/MockAction.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,40 +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, JBoss Inc.
- */
-package org.jboss.soa.esb.mock;
-
-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;
-
-/**
- * Mock action implementation.
- * 
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class MockAction extends AbstractActionPipelineProcessor {
-
-    public MockAction(ConfigTree config) {        
-    }
-
-    public Message process(final Message message) throws ActionProcessingException {
-        return message;
-    }
-}

Copied: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/mock/MockAction.java (from rev 12348, labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/mock/MockAction.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/mock/MockAction.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/mock/MockAction.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,40 @@
+/*
+ * 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, JBoss Inc.
+ */
+package org.jboss.soa.esb.mock;
+
+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;
+
+/**
+ * Mock action implementation.
+ * 
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class MockAction extends AbstractActionPipelineProcessor {
+
+    public MockAction(ConfigTree config) {        
+    }
+
+    public Message process(final Message message) throws ActionProcessingException {
+        return message;
+    }
+}

Deleted: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/mock/MockListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/mock/MockListener.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/mock/MockListener.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,54 +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, JBoss Inc.
- */
-package org.jboss.soa.esb.mock;
-
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.listeners.lifecycle.AbstractManagedLifecycle;
-import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleException;
-
-/**
- * Mock listener implementation.
- * 
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class MockListener extends AbstractManagedLifecycle {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = 1L;
-
-    public MockListener(ConfigTree config) throws ConfigurationException {
-        super(config);
-    }
-
-    protected void doInitialise() throws ManagedLifecycleException {
-    }
-
-    protected void doStart() throws ManagedLifecycleException {
-    }
-
-    protected void doStop() throws ManagedLifecycleException {
-    }
-
-    protected void doDestroy() throws ManagedLifecycleException {
-    }
-}

Copied: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/mock/MockListener.java (from rev 12348, labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/mock/MockListener.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/mock/MockListener.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/mock/MockListener.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,54 @@
+/*
+ * 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, JBoss Inc.
+ */
+package org.jboss.soa.esb.mock;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.listeners.lifecycle.AbstractManagedLifecycle;
+import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleException;
+
+/**
+ * Mock listener implementation.
+ * 
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class MockListener extends AbstractManagedLifecycle {
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
+
+    public MockListener(ConfigTree config) throws ConfigurationException {
+        super(config);
+    }
+
+    protected void doInitialise() throws ManagedLifecycleException {
+    }
+
+    protected void doStart() throws ManagedLifecycleException {
+    }
+
+    protected void doStop() throws ManagedLifecycleException {
+    }
+
+    protected void doDestroy() throws ManagedLifecycleException {
+    }
+}

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/build.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -32,11 +32,13 @@
     	<fileset dir="${org.jboss.esb.ext.lib.dir}" includes="jaxr-api*.jar,scout*.jar,juddi*.jar"/>
         <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar" excludes="jboss-messaging-client.jar,jboss-remoting.jar"/>
         <fileset dir="${org.jboss.esb.ftp.lib.dir}" includes="*.jar"/>
+        <fileset dir="${org.jboss.esb.root.dir}/jbossws21/spi" includes="jbossws-spi.jar"/>
         <pathelement location="${org.jboss.esb.module.classes.root.dir}/rosetta"/>
         <pathelement location="${org.jboss.esb.module.classes.root.dir}/services"/>
     	<pathelement location="${gendir}/classes"/>
         <pathelement location="${org.jboss.esb.module.classes.dir}"/>
         <pathelement location="${org.jboss.esb.module.tests.conf.dir}"/>
+        <pathelement location="${org.jboss.esb.root.dir}/etc/schemas/xml"/>
         <!--
         <fileset dir="${org.jboss.esb.ext.lib.dir}"
                  includes="activation.jar jbossall-client.jar log4j.jar mail.jar junit.jar emma.jar emma_ant.jar"/>

Deleted: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/device-profile.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/device-profile.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/device-profile.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE device-profiles PUBLIC "-//MILYN//DTD TINAK 1.0//EN" "http://www.milyn.org/dtd/device-profile-1.0.dtd">
-
-<device-profiles>
-	<device-profile name="type:Acme-Order-XML" list="profile1,profile2"/>
-	<device-profile name="from:Acme" list="profile23,profile24"/>
-	<device-profile name="to:AcmePartner" list="profile55,profile56"/>
-
-	<device-profile name="profile1" list="A"/>
-	<device-profile name="profile2" list="B"/>
-	<device-profile name="profile23" list="C"/>
-	<device-profile name="profile24" list="D"/>
-	<device-profile name="profile55" list="E"/>
-	<device-profile name="profile56" list="E"/>
-</device-profiles>

Deleted: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,122 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.soa.esb.actions.converters;
-
-import java.net.URISyntaxException;
-
-import junit.framework.TestCase;
-
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.actions.ActionLifecycleException;
-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.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-
-/**
- * SmooksTransformer unit tests.
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- * @since Version 4.0
- */
-public class SmooksTransformerUnitTest extends TestCase {
-
-    public void test_bad_config() {
-    	ConfigTree properties = new ConfigTree("name");
-
-        // Should get exceptions where message type configs are specified but empty...
-        properties.setAttribute(SmooksTransformer.FROM_TYPE, " ");
-        assertConfigException(properties, "Empty '" + SmooksTransformer.FROM_TYPE + "' config attribute supplied.");
-        properties.setAttribute(SmooksTransformer.FROM_TYPE, "x");
-        properties.setAttribute(SmooksTransformer.TO_TYPE, " ");
-        assertConfigException(properties, "Empty '" + SmooksTransformer.TO_TYPE + "' config attribute supplied.");
-    }
-
-    public void test_trans() throws ActionProcessingException, ConfigurationException, URISyntaxException, ActionLifecycleException {
-        String stringMessage;
-        String transRes;
-        
-        // Very basic test!  Just illustrates profile based resource selection.
-        // Read the smooks-test.cdrl config file in this package!! 
-
-        // Initialise the acme order message...
-        stringMessage = "<a><ddd>value</ddd></a>";
-        
-        // Transform the order message going to "AcmePartner1"...
-        transRes = transform(stringMessage, "Acme-Order-XML", "Acme", "AcmePartner1", "Partner1-Order-XML");
-        assertEquals("<x><b>value</b></x>", transRes);
-        
-        // Transform the order message going to "AcmePartner2"...
-        transRes = transform(stringMessage, "Acme-Order-XML", "Acme", "AcmePartner2", "Partner2-Order-XML");
-        assertEquals("<x><c>value</c></x>", transRes);
-    }
-    
-    private String transform(String stringMessage, String fromType, String from, String to, String toType) throws ActionProcessingException, ConfigurationException, URISyntaxException, ActionLifecycleException {
-        ConfigTree properties = new ConfigTree("name");
-
-        // Set the message properties in order to trigger the appropriate transformations
-        // on the message...
-        properties.setAttribute(SmooksTransformer.FROM, from);
-        properties.setAttribute(SmooksTransformer.FROM_TYPE, fromType);
-        properties.setAttribute(SmooksTransformer.TO, to);
-        properties.setAttribute(SmooksTransformer.TO_TYPE, toType);
-
-    	// The smooks-cdr.lst and device-profile.xml files are located in the root of the 
-        // test src folder.  You need to look at these to see how this works...
-        SmooksTransformer transformer = new SmooksTransformer(properties);
-        Message message;
-
-        transformer.initialise();
-
-        // Perform the transformation by setting the payload on the task object.
-        message = createNewMessage(fromType, from, to, toType);
-        ActionUtils.setTaskObject(message, stringMessage);
-        message = transformer.process(message);
-        String resultThroughTaskObj = (String) ActionUtils.getTaskObject(message);
-        assertEquals(resultThroughTaskObj, new String(message.getBody().getByteArray()));
-        
-        // Perform the transformation by setting the payload on the body "contents".
-        message = createNewMessage(fromType, from, to, toType);
-        message.getBody().setByteArray(stringMessage.getBytes());
-        message = transformer.process(message);
-        assertEquals(resultThroughTaskObj, new String(message.getBody().getByteArray()));
-        
-        return resultThroughTaskObj;
-    }
-
-	private Message createNewMessage(String fromType, String from, String to, String toType) {
-		Message message;
-		message = MessageFactory.getInstance().getMessage();
-        
-		return message;
-	}
-
-    private void assertConfigException(ConfigTree properties, String expectedException) {
-        try {
-            new SmooksTransformer("trans", properties);
-            fail("Expected ConfigurationException: [" + expectedException + "...]");
-        } catch(ConfigurationException e) {
-            assertTrue("Expected exception message to start with [" + expectedException + "]. Was [" + e.getMessage() + "]", e.getMessage().startsWith(expectedException));
-        }
-    }
-}

Deleted: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/smooks-test.cdrl
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/smooks-test.cdrl	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/smooks-test.cdrl	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
-
-	<!-- 
-		"Acme-Order-XML" messages going from "Acme" to "AcmePartner1" 
-	-->
-	<resource-config target-profile="from-type:Acme-Order-XML AND from:Acme AND to-type:Partner1-Order-XML AND to:AcmePartner1" selector="ddd">
-		<resource>org.milyn.cdres.trans.RenameElementTU</resource>
-		<param name="replacementElement">b</param>
-	</resource-config>
-
-	<!-- 
-		"Acme-Order-XML" messages going from "Acme" to "AcmePartner2" 
-	-->
-	<resource-config target-profile="from-type:Acme-Order-XML AND from:Acme AND to-type:Partner2-Order-XML AND to:AcmePartner2" selector="ddd">
-		<resource>org.milyn.cdres.trans.RenameElementTU</resource>
-		<param name="replacementElement">c</param>
-	</resource-config>
-
-	<!-- 
-		"Acme-Order-XML" messages going from "Acme" to anywhere
-	-->
-	<resource-config target-profile="from-type:Acme-Order-XML AND from:Acme" selector="a" >
-		<resource>org.milyn.cdres.trans.RenameElementTU</resource>
-		<param name="replacementElement">x</param>
-	</resource-config>
-
-</smooks-resource-list>
-

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/HttpRouterUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/HttpRouterUnitTest.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/HttpRouterUnitTest.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -22,7 +22,7 @@
 
 package org.jboss.soa.esb.actions.routing;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.fail;
 import junit.framework.JUnit4TestAdapter;
 
 import org.apache.log4j.Logger;
@@ -45,7 +45,7 @@
 	@Before
 	public void setUp()
 	{
-		msg.getBody().setContents("hello world".getBytes());
+		msg.getBody().setByteArray("hello world".getBytes());
 	}
 	
 	

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/soap/SOAPClientUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/soap/SOAPClientUnitTest.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/soap/SOAPClientUnitTest.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,17 +1,18 @@
 package org.jboss.soa.esb.actions.soap;
 
+import java.util.Map;
+
 import junit.framework.TestCase;
-import org.jboss.soa.esb.util.ESBConfigUtil;
-import org.jboss.soa.esb.helpers.ConfigTree;
+
+import org.jboss.internal.soa.esb.util.StreamUtils;
 import org.jboss.soa.esb.ConfigurationException;
 import org.jboss.soa.esb.actions.ActionProcessingException;
 import org.jboss.soa.esb.actions.soap.beans.Order;
+import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.internal.soa.esb.util.StreamUtils;
+import org.jboss.soa.esb.util.ESBConfigUtil;
 
-import java.util.Map;
-
 /**
  * @author
  */
@@ -31,6 +32,7 @@
         assertEquals(false, message.getBody().get());
     }
 
+    @SuppressWarnings("unchecked")
     public void test_OgnlMap_ResponseProcessing_1() throws ConfigurationException, ActionProcessingException {
         ConfigTree actionConfig = configUtil.getActionConfig("OrderNotificationService", "soapui-client-action-02");
         SOAPClient soapClient = new SOAPClient(actionConfig);
@@ -54,9 +56,10 @@
         soapClient.processResponse(message, responseString);
         Order order = (Order) message.getBody().get();
         //assertEquals();
-        System.out.println("sss");
+        System.out.println("sss " + order);
     }
 
+    @SuppressWarnings("unchecked")
     public void test_OgnlMap_ResponseProcessing_3() throws ConfigurationException, ActionProcessingException {
         ConfigTree actionConfig = configUtil.getActionConfig("OrderNotificationService", "soapui-client-action-02");
         SOAPClient soapClient = new SOAPClient(actionConfig);

Copied: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring (from rev 12348, labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring)

Deleted: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/AbstractSpringActionUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/AbstractSpringActionUnitTest.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/AbstractSpringActionUnitTest.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,84 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- *
- * (C) 2005-2006, JBoss Inc.
- */
-package org.jboss.soa.esb.actions.spring;
-
-import junit.framework.TestCase;
-
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
-
-/**
- * Unit tests for org.jboss.soa.esb.actions.AbstractSpringAction
- * 
- * @author <a href="mailto:james.williams at redhat.com">james.williams at redhat.com</a>
- */
-public class AbstractSpringActionUnitTest extends TestCase
-{
-
-   public void test_bean_factory_load_single() throws Exception
-   {
-      ConfigTree config = new ConfigTree("<config/>");
-
-      String pathToConfigFile = new StringBuilder().append(
-            TestEnvironmentUtil.getUserDir("product")).append(
-            "org/jboss/soa/esb/actions/spring/").append("spring-context-1.xml")
-            .toString();
-
-      config.setAttribute("springContextXml", pathToConfigFile);
-
-      MockSpringAction mockAction = new MockSpringAction(config);
-      assertEquals("hello from Spring", mockAction.sayHelloSpring());
-      assertEquals(false, mockAction.isBeanFactoryNull());
-   }
-
-   public void test_bean_factory_load_multiple() throws Exception
-   {
-      ConfigTree config = new ConfigTree("<config/>");
-
-      String pathToConfigFile = new StringBuilder().append(
-            TestEnvironmentUtil.getUserDir("product")).append(
-            "org/jboss/soa/esb/actions/spring/").toString();
-      String configPath1 = pathToConfigFile + "spring-context-1.xml";
-      String configPath2 = pathToConfigFile + "spring-context-2.xml";
-
-      config.setAttribute("springContextXml", configPath1 + "," + configPath2);
-
-      MockSpringAction mockAction = new MockSpringAction(config);
-      assertEquals("hello from Spring", mockAction.sayHelloSpring());
-      assertEquals("goodbye from Spring", mockAction.sayGoodbyeSpring());
-      assertEquals(false, mockAction.isBeanFactoryNull());
-   }
-
-   public void test_spring_aop() throws Exception
-   {
-      ConfigTree config = new ConfigTree("<config/>");
-
-      String pathToConfigFile = new StringBuilder().append(
-            TestEnvironmentUtil.getUserDir("product")).append(
-            "org/jboss/soa/esb/actions/spring/").append("spring-context-1.xml")
-            .toString();
-
-      config.setAttribute("springContextXml", pathToConfigFile);
-
-      MockSpringAction mockAction = new MockSpringAction(config);
-      assertEquals("Greeting Changed", mockAction.sayHelloAopStyle());
-      assertEquals(false, mockAction.isBeanFactoryNull());
-   }
-}

Copied: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/AbstractSpringActionUnitTest.java (from rev 12348, labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/AbstractSpringActionUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/AbstractSpringActionUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/AbstractSpringActionUnitTest.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2005-2006, JBoss Inc.
+ */
+package org.jboss.soa.esb.actions.spring;
+
+import junit.framework.TestCase;
+
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
+
+/**
+ * Unit tests for org.jboss.soa.esb.actions.AbstractSpringAction
+ * 
+ * @author <a href="mailto:james.williams at redhat.com">james.williams at redhat.com</a>
+ */
+public class AbstractSpringActionUnitTest extends TestCase
+{
+
+   public void test_bean_factory_load_single() throws Exception
+   {
+      ConfigTree config = new ConfigTree("<config/>");
+
+      String pathToConfigFile = new StringBuilder().append(
+            TestEnvironmentUtil.getUserDir("product")).append(
+            "org/jboss/soa/esb/actions/spring/").append("spring-context-1.xml")
+            .toString();
+
+      config.setAttribute("springContextXml", pathToConfigFile);
+
+      MockSpringAction mockAction = new MockSpringAction(config);
+      assertEquals("hello from Spring", mockAction.sayHelloSpring());
+      assertEquals(false, mockAction.isBeanFactoryNull());
+   }
+
+   public void test_bean_factory_load_multiple() throws Exception
+   {
+      ConfigTree config = new ConfigTree("<config/>");
+
+      String pathToConfigFile = new StringBuilder().append(
+            TestEnvironmentUtil.getUserDir("product")).append(
+            "org/jboss/soa/esb/actions/spring/").toString();
+      String configPath1 = pathToConfigFile + "spring-context-1.xml";
+      String configPath2 = pathToConfigFile + "spring-context-2.xml";
+
+      config.setAttribute("springContextXml", configPath1 + "," + configPath2);
+
+      MockSpringAction mockAction = new MockSpringAction(config);
+      assertEquals("hello from Spring", mockAction.sayHelloSpring());
+      assertEquals("goodbye from Spring", mockAction.sayGoodbyeSpring());
+      assertEquals(false, mockAction.isBeanFactoryNull());
+   }
+
+   public void test_spring_aop() throws Exception
+   {
+      ConfigTree config = new ConfigTree("<config/>");
+
+      String pathToConfigFile = new StringBuilder().append(
+            TestEnvironmentUtil.getUserDir("product")).append(
+            "org/jboss/soa/esb/actions/spring/").append("spring-context-1.xml")
+            .toString();
+
+      config.setAttribute("springContextXml", pathToConfigFile);
+
+      MockSpringAction mockAction = new MockSpringAction(config);
+      assertEquals("Greeting Changed", mockAction.sayHelloAopStyle());
+      assertEquals(false, mockAction.isBeanFactoryNull());
+   }
+}

Deleted: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/MockSpringAction.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/MockSpringAction.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/MockSpringAction.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,64 +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.actions.spring;
-
-import org.jboss.soa.esb.actions.AbstractSpringAction;
-import org.jboss.soa.esb.helpers.ConfigTree;
-
-/**
- * Used to test Spring integration.
- * 
- * @author James Williams(james.williams at redhat.com)
- * 
- */
-public class MockSpringAction extends AbstractSpringAction
-{
-
-   public MockSpringAction(ConfigTree config) throws Exception
-   {
-      configTree = config;
-      initialise();
-   }
-
-   public String sayHelloSpring() throws Exception
-   {
-      SaySomething hello = (SaySomething) getBeanFactory().getBean(
-            "helloObject");
-
-      return hello.getGreeting();
-   }
-
-   public String sayGoodbyeSpring() throws Exception
-   {
-      SaySomething goodbye = (SaySomething) getBeanFactory().getBean(
-            "goodbyeObject");
-      return goodbye.getGreeting();
-   }
-
-   public String sayHelloAopStyle() throws Exception
-   {
-      SaySomething hello = (SaySomething) getBeanFactory().getBean(
-            "helloObject");
-      hello.setGreeting("trying to trigger interceptor");
-
-      return hello.getGreeting();
-   }
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/MockSpringAction.java (from rev 12348, labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/MockSpringAction.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/MockSpringAction.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/MockSpringAction.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,64 @@
+/*
+ * 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.actions.spring;
+
+import org.jboss.soa.esb.actions.AbstractSpringAction;
+import org.jboss.soa.esb.helpers.ConfigTree;
+
+/**
+ * Used to test Spring integration.
+ * 
+ * @author James Williams(james.williams at redhat.com)
+ * 
+ */
+public class MockSpringAction extends AbstractSpringAction
+{
+
+   public MockSpringAction(ConfigTree config) throws Exception
+   {
+      configTree = config;
+      initialise();
+   }
+
+   public String sayHelloSpring() throws Exception
+   {
+      SaySomething hello = (SaySomething) getBeanFactory().getBean(
+            "helloObject");
+
+      return hello.getGreeting();
+   }
+
+   public String sayGoodbyeSpring() throws Exception
+   {
+      SaySomething goodbye = (SaySomething) getBeanFactory().getBean(
+            "goodbyeObject");
+      return goodbye.getGreeting();
+   }
+
+   public String sayHelloAopStyle() throws Exception
+   {
+      SaySomething hello = (SaySomething) getBeanFactory().getBean(
+            "helloObject");
+      hello.setGreeting("trying to trigger interceptor");
+
+      return hello.getGreeting();
+   }
+}
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/MyInterceptor.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/MyInterceptor.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/MyInterceptor.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,21 +0,0 @@
-package org.jboss.soa.esb.actions.spring;
-
-import java.lang.reflect.Method;
-
-import org.springframework.aop.AfterReturningAdvice;
-
-/**
- * Spring interceptor implementation used to test Spring AOP integration.
- * 
- * @author James Williams(james.williams at redhat.com)
- * 
- */
-public class MyInterceptor implements AfterReturningAdvice
-{
-   public void afterReturning(Object returnValue, Method m, Object[] args,
-         Object target) throws Exception
-   {
-      SaySomething something = (SaySomething) target;
-      something.setGreeting("Greeting Changed");
-   }
-}

Copied: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/MyInterceptor.java (from rev 12348, labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/MyInterceptor.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/MyInterceptor.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/MyInterceptor.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,21 @@
+package org.jboss.soa.esb.actions.spring;
+
+import java.lang.reflect.Method;
+
+import org.springframework.aop.AfterReturningAdvice;
+
+/**
+ * Spring interceptor implementation used to test Spring AOP integration.
+ * 
+ * @author James Williams(james.williams at redhat.com)
+ * 
+ */
+public class MyInterceptor implements AfterReturningAdvice
+{
+   public void afterReturning(Object returnValue, Method m, Object[] args,
+         Object target) throws Exception
+   {
+      SaySomething something = (SaySomething) target;
+      something.setGreeting("Greeting Changed");
+   }
+}

Deleted: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/SaySomething.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/SaySomething.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/SaySomething.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,22 +0,0 @@
-package org.jboss.soa.esb.actions.spring;
-
-/**
- * Simple pojo used to test Spring AOP integration.
- * 
- * @author James Williams(james.williams at redhat.com)
- * 
- */
-public class SaySomething
-{
-   private String greeting;
-
-   public String getGreeting()
-   {
-      return greeting;
-   }
-
-   public void setGreeting(String greeting)
-   {
-      this.greeting = greeting;
-   }
-}

Copied: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/SaySomething.java (from rev 12348, labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/SaySomething.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/SaySomething.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/SaySomething.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,22 @@
+package org.jboss.soa.esb.actions.spring;
+
+/**
+ * Simple pojo used to test Spring AOP integration.
+ * 
+ * @author James Williams(james.williams at redhat.com)
+ * 
+ */
+public class SaySomething
+{
+   private String greeting;
+
+   public String getGreeting()
+   {
+      return greeting;
+   }
+
+   public void setGreeting(String greeting)
+   {
+      this.greeting = greeting;
+   }
+}

Deleted: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/spring-context-1.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/spring-context-1.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/spring-context-1.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Spring AOP and simple spring beans definitions to test AbstractSpringAction -->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-           http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
-
-	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
-
-	<bean id="helloObject" class="org.jboss.soa.esb.actions.spring.SaySomething">
-		<property name="greeting" value="hello from Spring"/>
-	</bean>
-	
-	<aop:config proxy-target-class="true">
-		<aop:advisor pointcut="execution(* setGreeting*(..))" advice-ref="myInterceptor" />
-	</aop:config>
-
-	<bean id="myInterceptor"
-		class="org.jboss.soa.esb.actions.spring.MyInterceptor"/>
-	
-
-</beans>

Copied: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/spring-context-1.xml (from rev 12348, labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/spring-context-1.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/spring-context-1.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/spring-context-1.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Spring AOP and simple spring beans definitions to test AbstractSpringAction -->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+           http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+
+	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
+
+	<bean id="helloObject" class="org.jboss.soa.esb.actions.spring.SaySomething">
+		<property name="greeting" value="hello from Spring"/>
+	</bean>
+	
+	<aop:config proxy-target-class="true">
+		<aop:advisor pointcut="execution(* setGreeting*(..))" advice-ref="myInterceptor" />
+	</aop:config>
+
+	<bean id="myInterceptor"
+		class="org.jboss.soa.esb.actions.spring.MyInterceptor"/>
+	
+
+</beans>

Deleted: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/spring-context-2.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/spring-context-2.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/spring-context-2.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Second spring context to test loading multiple spring contexts using AbstractSpringAction -->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-	     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
-
-	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
-
-	<bean id="goodbyeObject" class="org.jboss.soa.esb.actions.spring.SaySomething">
-		<property name="greeting" value="goodbye from Spring"/>
-	</bean>
-	
-
-</beans>

Copied: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/spring-context-2.xml (from rev 12348, labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/spring-context-2.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/spring-context-2.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/spring-context-2.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Second spring context to test loading multiple spring contexts using AbstractSpringAction -->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+	     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
+
+	<bean id="goodbyeObject" class="org.jboss.soa.esb.actions.spring.SaySomething">
+		<property name="greeting" value="goodbye from Spring"/>
+	</bean>
+	
+
+</beans>

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/ConfigurationControllerServiceUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/ConfigurationControllerServiceUnitTest.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/ConfigurationControllerServiceUnitTest.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -21,10 +21,10 @@
 
 package org.jboss.soa.esb.listeners.config;
 
+import junit.framework.TestCase;
+
 import org.apache.log4j.Logger;
 
-import junit.framework.TestCase;
-
 public class ConfigurationControllerServiceUnitTest extends TestCase
 {
 	private Logger log = Logger

Copied: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/lifecycle (from rev 12348, labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/lifecycle)

Deleted: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/lifecycle/EsbLifecycleListenerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/lifecycle/EsbLifecycleListenerUnitTest.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/lifecycle/EsbLifecycleListenerUnitTest.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,48 +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, JBoss Inc.
- */
-package org.jboss.soa.esb.listeners.lifecycle;
-
-import junit.framework.TestCase;
-
-import org.jboss.internal.soa.esb.services.registry.MockRegistry;
-import org.jboss.internal.soa.esb.util.StreamUtils;
-import org.jboss.soa.esb.listeners.config.Configuration;
-
-/**
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class EsbLifecycleListenerUnitTest extends TestCase {
-
-    protected void setUp() throws Exception {
-        MockRegistry.install();
-    }
-
-    protected void tearDown() throws Exception {
-        MockRegistry.uninstall();
-    }
-
-    public void test() throws ManagedLifecycleException {
-        String config = new String(StreamUtils.readStream(getClass().getResourceAsStream("config-01.xml")));
-        ManagedLifecycleController controller = Configuration.create(config);
-
-        controller.start();
-        controller.stop();
-    }
-}

Copied: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/lifecycle/EsbLifecycleListenerUnitTest.java (from rev 12348, labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/lifecycle/EsbLifecycleListenerUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/lifecycle/EsbLifecycleListenerUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/lifecycle/EsbLifecycleListenerUnitTest.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,48 @@
+/*
+ * 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, JBoss Inc.
+ */
+package org.jboss.soa.esb.listeners.lifecycle;
+
+import junit.framework.TestCase;
+
+import org.jboss.internal.soa.esb.services.registry.MockRegistry;
+import org.jboss.internal.soa.esb.util.StreamUtils;
+import org.jboss.soa.esb.listeners.config.Configuration;
+
+/**
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class EsbLifecycleListenerUnitTest extends TestCase {
+
+    protected void setUp() throws Exception {
+        MockRegistry.install();
+    }
+
+    protected void tearDown() throws Exception {
+        MockRegistry.uninstall();
+    }
+
+    public void test() throws ManagedLifecycleException {
+        String config = new String(StreamUtils.readStream(getClass().getResourceAsStream("config-01.xml")));
+        ManagedLifecycleController controller = Configuration.create(config);
+
+        controller.start();
+        controller.stop();
+    }
+}

Deleted: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/lifecycle/config-01.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/lifecycle/config-01.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/lifecycle/config-01.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,30 +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">
-
-    <providers>
-        <provider name="provider">
-            <property name="protocol" value="jms" />
-            <bus busid="bus">
-                <property name="destination-type" value="topic" />
-                <property name="destination-name" value="queue/B" />
-            </bus>
-        </provider>
-    </providers>
-
-    <services>
-        <service category="ServiceCat" name="ServiceName" description="Test Service">
-
-            <listeners>
-                <listener name="listener" busidref="bus" is-gateway="true">
-                    <property name="gatewayClass" value="org.jboss.soa.esb.mock.MockListener" />
-                </listener>
-                <listener name="listener" busidref="bus" />
-            </listeners>
-
-            <actions>
-                <action name="action" class="org.jboss.soa.esb.mock.MockAction" />
-            </actions>			
-        </service>
-    </services>
-
-</jbossesb>
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/lifecycle/config-01.xml (from rev 12348, labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/lifecycle/config-01.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/lifecycle/config-01.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/lifecycle/config-01.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,30 @@
+<?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">
+
+    <providers>
+        <provider name="provider">
+            <property name="protocol" value="jms" />
+            <bus busid="bus">
+                <property name="destination-type" value="topic" />
+                <property name="destination-name" value="queue/B" />
+            </bus>
+        </provider>
+    </providers>
+
+    <services>
+        <service category="ServiceCat" name="ServiceName" description="Test Service">
+
+            <listeners>
+                <listener name="listener" busidref="bus" is-gateway="true">
+                    <property name="gatewayClass" value="org.jboss.soa.esb.mock.MockListener" />
+                </listener>
+                <listener name="listener" busidref="bus" />
+            </listeners>
+
+            <actions>
+                <action name="action" class="org.jboss.soa.esb.mock.MockAction" />
+            </actions>			
+        </service>
+    </services>
+
+</jbossesb>
\ No newline at end of file

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/util/ESBConfigUtil.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/util/ESBConfigUtil.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/util/ESBConfigUtil.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -19,23 +19,20 @@
  */
 package org.jboss.soa.esb.util;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+
+import junit.framework.TestCase;
+
+import org.jboss.internal.soa.esb.assertion.AssertArgument;
+import org.jboss.soa.esb.dom.YADOMUtil;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.listeners.config.Generator;
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.dom.YADOMUtil;
-import org.jboss.internal.soa.esb.assertion.AssertArgument;
-import org.xml.sax.SAXException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
-import java.io.InputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ByteArrayInputStream;
-
-import junit.framework.TestCase;
-
 /**
  * Utility class for working with the ESB configuration.
  *

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/util/XPathUtilTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/util/XPathUtilTest.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/util/XPathUtilTest.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -21,7 +21,8 @@
  */
 package org.jboss.soa.esb.util;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.IOException;
 

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/util/test/ESBConfigUtilUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/util/test/ESBConfigUtilUnitTest.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/util/test/ESBConfigUtilUnitTest.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,14 +1,10 @@
 package org.jboss.soa.esb.util.test;
 
-import static java.lang.System.out;
-
 import junit.framework.TestCase;
-import org.jboss.soa.esb.util.ESBConfigUtil;
-import org.jboss.soa.esb.dom.YADOMUtil;
+
 import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.util.ESBConfigUtil;
 
-import javax.xml.transform.stream.StreamResult;
-
 /**
  * @author
  */

Deleted: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/smooks-cdr.lst
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/smooks-cdr.lst	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/smooks-cdr.lst	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1 +0,0 @@
-classpath:/org/jboss/soa/esb/actions/converters/smooks-test.cdrl

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/build.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -15,6 +15,7 @@
 	
 	<path id="org.jboss.esb.rosetta.base.classpath">
         <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
+        <fileset dir="${org.jboss.esb.ext.lib.dir}/standalone" includes="*.jar"/>
 	</path>
 
     <target name="org.jboss.esb.rosetta.init">

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/BodyImpl.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/BodyImpl.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/BodyImpl.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -4,6 +4,7 @@
 import java.util.Hashtable;
 import java.util.Set;
 
+import org.jboss.internal.soa.esb.assertion.AssertArgument;
 import org.jboss.soa.esb.message.Body;
 import org.jboss.soa.esb.util.Util;
 
@@ -69,10 +70,12 @@
 	
 	public void add (String name, Object value)
 	{
-		if ((name == null) || (value == null))
-			throw new IllegalArgumentException();
-		
-		if (value instanceof Serializable)
+        AssertArgument.isNotNull(value, "value");
+        if (name == null) {
+			name = Body.DEFAULT_LOCATION;
+        }
+
+        if (value instanceof Serializable)
 		{
 			synchronized (_objects)
 			{
@@ -90,6 +93,9 @@
 	
 	public Object get (String name)
 	{
+        if (name == null) {
+			name = Body.DEFAULT_LOCATION;
+        }
 		synchronized (_objects)
 		{
 			return _objects.get(name);

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -4,6 +4,7 @@
 import java.util.Hashtable;
 import java.util.Set;
 
+import org.jboss.internal.soa.esb.assertion.AssertArgument;
 import org.jboss.internal.soa.esb.message.format.xml.marshal.MarshalUnmarshalManager;
 import org.jboss.internal.soa.esb.thirdparty.Base64;
 import org.jboss.soa.esb.MarshalException;
@@ -65,8 +66,10 @@
 	
 	public void add(String name, Object value)
 	{
-		if ((name == null) || (value == null))
-			throw new IllegalArgumentException();
+        AssertArgument.isNotNull(value, "value");
+        if (name == null) {
+			name = Body.DEFAULT_LOCATION;
+        }
 
 		synchronized (_objects)
 		{
@@ -81,6 +84,9 @@
 	
 	public Object get(String name)
 	{
+        if (name == null) {
+			name = Body.DEFAULT_LOCATION;
+        }
 		synchronized (_objects)
 		{
 			return _objects.get(name);

Copied: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/persistence (from rev 12348, labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/persistence)

Copied: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/persistence/manager (from rev 12348, labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/persistence/manager)

Deleted: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/ConnectionManager.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/ConnectionManager.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/ConnectionManager.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,22 +0,0 @@
-package org.jboss.internal.soa.esb.persistence.manager;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import org.jboss.soa.esb.ConfigurationException;
-
-public interface ConnectionManager {
-    /**
-     * 
-     * @return
-     */
-    public ConnectionManager getInstance();
-	/**
-	 * Returns a connection from the pool.
-	 */
-	public Connection getConnection() throws SQLException;
-	/**
-     * Initializes the Connection Manager.
-	 */
-    public void init() throws  ConfigurationException;
-}

Copied: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/ConnectionManager.java (from rev 12348, labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/ConnectionManager.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/ConnectionManager.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/ConnectionManager.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,22 @@
+package org.jboss.internal.soa.esb.persistence.manager;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import org.jboss.soa.esb.ConfigurationException;
+
+public interface ConnectionManager {
+    /**
+     * 
+     * @return
+     */
+    public ConnectionManager getInstance();
+	/**
+	 * Returns a connection from the pool.
+	 */
+	public Connection getConnection() throws SQLException;
+	/**
+     * Initializes the Connection Manager.
+	 */
+    public void init() throws  ConfigurationException;
+}

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/soap/OGNLUtils.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/soap/OGNLUtils.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/soap/OGNLUtils.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,16 +1,16 @@
 package org.jboss.internal.soa.esb.soap;
 
-import org.apache.log4j.Logger;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Comment;
-import org.jboss.soa.esb.dom.YADOMUtil;
-
 import java.util.Map;
 
 import ognl.Ognl;
 import ognl.OgnlException;
 
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.dom.YADOMUtil;
+import org.w3c.dom.Comment;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
 /**
  * OGNL Utilities for SOAP message processing.
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
@@ -47,7 +47,6 @@
     public static String getOGNLExpression(Element element) {
         StringBuffer ognlExpression = new StringBuffer();
         Node parent = element.getParentNode();
-        boolean isCollection;
         boolean isInBody = false;
 
         ognlExpression.append(getOGNLToken(element));

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/common/Configuration.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/common/Configuration.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/common/Configuration.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -58,10 +58,6 @@
 			new KeyValuePair(Environment.PARAMS_REPOS_IMPL_CLASS,		getParamRepositoryImplClass()),
 			new KeyValuePair(Environment.OBJECT_STORE_CONFIG_FILE, 		getObjStoreConfigFile()),
 			new KeyValuePair(Environment.ENCRYPT_FACTORY_CLASS, 		getEncryptionFactoryClass()),
-			new KeyValuePair(Environment.DB_DRIVER, 					getDbDriver()),
-			new KeyValuePair(Environment.DB_URL, 						getDbUrl()),
-			new KeyValuePair(Environment.DB_USER, 						getDbUser()),
-			new KeyValuePair(Environment.DB_PASSWORD, 					getDbPassword()),
 			new KeyValuePair(Environment.MSG_STORE_DB_CONNECTION_URL, 	getStoreUrl()),
 			new KeyValuePair(Environment.MSG_STORE_DB_JDBC_DRIVER, 		getStoreDriver()),
 			new KeyValuePair(Environment.MSG_STORE_DB_CONNECTION_USER, 	getStoreUser()),
@@ -71,7 +67,6 @@
 			new KeyValuePair(Environment.MSG_STORE_DB_POOL_INITIAL_SIZE,getStorePoolInitialSize()),
 			new KeyValuePair(Environment.MSG_STORE_DB_POOL_TEST_TABLE,  getStorePoolTestTable()),
 			new KeyValuePair(Environment.MSG_STORE_DB_POOL_TIMEOUT_MILLIS,getStorePoolTimeoutMillis()),
-			new KeyValuePair(Environment.MSG_STORE_CONN_FACTORY			,getStoreConnectionFactory()),
 			new KeyValuePair(Environment.MSG_STORE_DB_CONN_MANAGER		,getStoreDBConnectionManager()),
 			new KeyValuePair(Environment.MSG_STORE_DB_DATASOURCE_NAME	,getStoreDBDatasourceName())
 	};
@@ -212,30 +207,6 @@
 						.getName());
 	}
 	
-	public static String getDbDriver()
-	{
-		String property = ModulePropertyManager.getPropertyManager(ModulePropertyManager.CONNECTION_MODULE).getProperty(Environment.DB_DRIVER);
-		return property;
-	}
-	
-	public static String getDbUrl()
-	{
-		String property = ModulePropertyManager.getPropertyManager(ModulePropertyManager.CONNECTION_MODULE).getProperty(Environment.DB_URL);
-		return property;
-	}
-	
-	public static String getDbUser()
-	{
-		String property = ModulePropertyManager.getPropertyManager(ModulePropertyManager.CONNECTION_MODULE).getProperty(Environment.DB_USER);
-		return property;
-	}
-	
-	public static String getDbPassword()
-	{
-		String property = ModulePropertyManager.getPropertyManager(ModulePropertyManager.CONNECTION_MODULE).getProperty(Environment.DB_PASSWORD);
-		return property;
-	}
-	
 	public static String getStoreUrl()
 	{
 		String property = ModulePropertyManager.getPropertyManager(ModulePropertyManager.DBSTORE_MODULE).getProperty(Environment.MSG_STORE_DB_CONNECTION_URL);
@@ -290,12 +261,6 @@
 		return property;
 	}
 	
-	public static String getStoreConnectionFactory()
-	{
-		String property = ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.MSG_STORE_CONN_FACTORY);
-		return property;
-	}	
-	
 	public static String getStoreDBConnectionManager()
 	{
 		String property = ModulePropertyManager.getPropertyManager(ModulePropertyManager.DBSTORE_MODULE).getProperty(Environment.MSG_STORE_DB_CONN_MANAGER);

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/common/Environment.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/common/Environment.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/common/Environment.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -87,13 +87,6 @@
 	 * Property that holds directory to use with the helper EPRManager class.
 	 */
 	public static final String REGISTRY_FILE_HELPER_DIR       = "org.jboss.soa.esb.registry.file.directory";
-	/*
-	 * Connection specific properties
-	 */
-	public static String DB_DRIVER = "org.jboss.esb.db.driver";
-	public static String DB_URL = "org.jboss.esb.db.url";
-	public static String DB_USER = "org.jboss.esb.db.user";
-	public static String DB_PASSWORD = "org.jboss.esb.db.password";
 	
 	/*
 	 * Some default values.
@@ -109,7 +102,6 @@
 	/*
 	 * DatabaseMessageStore Persistence Store properties.
 	 */
-	public static final String MSG_STORE_CONN_FACTORY			= "org.jboss.soa.esb.persistence.connection.factory";	
 	public static final String MSG_STORE_DB_CONNECTION_URL 		= "org.jboss.soa.esb.persistence.db.connection.url";
 	public static final String MSG_STORE_DB_CONNECTION_USER 	= "org.jboss.soa.esb.persistence.db.user";
 	public static final String MSG_STORE_DB_CONNECTION_PWD 		= "org.jboss.soa.esb.persistence.db.pwd";

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/common/ModulePropertyManager.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/common/ModulePropertyManager.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/common/ModulePropertyManager.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -90,8 +90,6 @@
 	public static final String TRANSPORTS_MODULE = "transports";
 
 	public static final String DBSTORE_MODULE = "dbstore";
-
-	public static final String ROUTER_MODULE = "messagerouting";
 	
 	public static final String FILTER_MODULE = "filters";
 

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/dom/YADOMUtil.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/dom/YADOMUtil.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/dom/YADOMUtil.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -38,14 +38,19 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-import javax.xml.xpath.XPathFactory;
 import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
 
+import org.jboss.internal.soa.esb.assertion.AssertArgument;
 import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.internal.soa.esb.assertion.AssertArgument;
-import org.w3c.dom.*;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
 /**
@@ -412,4 +417,20 @@
             return element.getTagName();
         }
     }
+    /**
+     * Copy child node references from source to target.
+     * @param source Source Node.
+     * @param target Target Node.
+     */
+    public static void copyChildNodes(Node source, Node target) {
+        AssertArgument.isNotNull(source, "source");
+        AssertArgument.isNotNull(target, "target");
+        
+        List nodeList = copyNodeList(source.getChildNodes());
+        int childCount = nodeList.size();
+        
+        for(int i = 0; i < childCount; i++) {
+            target.appendChild((Node)nodeList.get(i));
+        }
+    }
 }

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/message/Body.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/message/Body.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/message/Body.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -79,9 +79,10 @@
 	 * Add the specified Object to the body.
 	 * 
 	 * @param name
-	 *            the name of the object. MUST be unique within this body.
+	 *            The name of the object. MUST be unique within this body.  If null,
+     *            the object will be stored under the {@link Body#DEFAULT_LOCATION default name}.
 	 * @param value
-	 *            the Object to add.
+	 *            The Object to add.
 	 */
 
 	public void add(String name, Object value);
@@ -99,7 +100,8 @@
 	 * Get the specified Object, or <code>null</code> if not present.
 	 * 
 	 * @param name
-	 *            the name of the Object to retrieve.
+	 *            the name of the Object to retrieve.  If null,
+     *            the object will be looked for under the {@link Body#DEFAULT_LOCATION default name}.
 	 * @return the Object.
 	 */
 

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyEmail.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyEmail.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyEmail.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -22,8 +22,6 @@
 
 package org.jboss.soa.esb.notification;
 
-import java.io.Serializable;
-
 import javax.mail.MessagingException;
 import javax.mail.internet.AddressException;
 import javax.mail.internet.InternetAddress;

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

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

Deleted: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerException.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerException.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerException.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,19 +0,0 @@
-package org.jboss.soa.esb.persistence.manager;
-
-public class ConnectionManagerException extends Exception {
-	
-private static final long serialVersionUID = 1L;
-    
-    public ConnectionManagerException(){
-        super();
-    }
-    
-    public ConnectionManagerException (String msg){
-        super(msg);
-    }
-    
-    public ConnectionManagerException (String msg, Throwable cause){
-        super (msg, cause);
-    }
-
-}

Copied: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerException.java (from rev 12348, labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerException.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerException.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerException.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,19 @@
+package org.jboss.soa.esb.persistence.manager;
+
+public class ConnectionManagerException extends Exception {
+	
+private static final long serialVersionUID = 1L;
+    
+    public ConnectionManagerException(){
+        super();
+    }
+    
+    public ConnectionManagerException (String msg){
+        super(msg);
+    }
+    
+    public ConnectionManagerException (String msg, Throwable cause){
+        super (msg, cause);
+    }
+
+}

Deleted: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactory.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactory.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactory.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,40 +0,0 @@
-package org.jboss.soa.esb.persistence.manager;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
-import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
-import org.jboss.soa.esb.common.Configuration;
-import org.jboss.soa.esb.util.ClassUtil;
-
-public class ConnectionManagerFactory {
-	
-    private static String DEFAULT = J2eeConnectionManager.class.getName();
-	private static Logger logger = Logger.getLogger(ConnectionManagerFactory.class);
-	
-	public static ConnectionManager getConnectionManager() throws ConnectionManagerException
-    {
-		ConnectionManager manager = null;
-        String className = Configuration.getStoreDBConnectionManager();
-        //If not specified use the default
-        if (className==null) {
-            className = DEFAULT;
-        }
-		logger.log(Priority.DEBUG, "Going to load " + className);
-		try{
-			// instruct class loader to load the connection manager
-			Class managerClass = ClassUtil.forName(className, ConnectionManagerFactory.class);
-			ConnectionManager tmp = (ConnectionManager) managerClass.newInstance();
-            manager = tmp.getInstance();
-		}
-		catch (ClassNotFoundException cnfex)
-		{
-			throw new ConnectionManagerException("Connection Manager Implementation=" + className
-					+ " not found", cnfex);
-		} catch (Exception e) {
-			throw new ConnectionManagerException("Invocation exception. "
-					+ e.getLocalizedMessage(), e);
-		}
-		return manager;
-	}
-
-}

Copied: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactory.java (from rev 12348, labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactory.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactory.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactory.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,40 @@
+package org.jboss.soa.esb.persistence.manager;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.Priority;
+import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
+import org.jboss.soa.esb.common.Configuration;
+import org.jboss.soa.esb.util.ClassUtil;
+
+public class ConnectionManagerFactory {
+	
+    private static String DEFAULT = J2eeConnectionManager.class.getName();
+	private static Logger logger = Logger.getLogger(ConnectionManagerFactory.class);
+	
+	public static ConnectionManager getConnectionManager() throws ConnectionManagerException
+    {
+		ConnectionManager manager = null;
+        String className = Configuration.getStoreDBConnectionManager();
+        //If not specified use the default
+        if (className==null) {
+            className = DEFAULT;
+        }
+		logger.log(Priority.DEBUG, "Going to load " + className);
+		try{
+			// instruct class loader to load the connection manager
+			Class managerClass = ClassUtil.forName(className, ConnectionManagerFactory.class);
+			ConnectionManager tmp = (ConnectionManager) managerClass.newInstance();
+            manager = tmp.getInstance();
+		}
+		catch (ClassNotFoundException cnfex)
+		{
+			throw new ConnectionManagerException("Connection Manager Implementation=" + className
+					+ " not found", cnfex);
+		} catch (Exception e) {
+			throw new ConnectionManagerException("Invocation exception. "
+					+ e.getLocalizedMessage(), e);
+		}
+		return manager;
+	}
+
+}

Deleted: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/J2eeConnectionManager.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/J2eeConnectionManager.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/J2eeConnectionManager.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,81 +0,0 @@
-package org.jboss.soa.esb.persistence.manager;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.sql.DataSource;
-
-import org.apache.log4j.Logger;
-import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.common.Configuration;
-
-/**
- * J2EE datasource based Connection Pooling implementation for use when deploying to a J2EE container 
- *
- */
-public class J2eeConnectionManager implements ConnectionManager {
-    
-    private static J2eeConnectionManager instance = null;
-    @SuppressWarnings("unused")
-    private DataSource datasource = null;
-    private Context oJndiCtx = null;
-    
-    private static Logger _logger = Logger.getLogger(J2eeConnectionManager.class);
-    private static final Object foo = new Integer(0);
-
-    public Connection getConnection() throws SQLException 
-    {
-        return datasource.getConnection();
-    }
-
-    public ConnectionManager getInstance() {
-        if (null != instance)
-        {
-            return instance;
-        }
-        
-        synchronized (foo)
-        {
-            if (null != instance) 
-                return instance;
-            
-            try
-            {
-                instance = new J2eeConnectionManager();
-                instance.init();
-            }
-            catch (Exception e)
-            {
-                _logger.error("Could not initialise instance.", e);
-                
-                return null;
-            }
-
-            return instance;
-        }
-    }
-
-    public void init() throws ConfigurationException {
-        _logger.info("initializing...");
-        
-                             
-        try
-        {
-            oJndiCtx = new InitialContext();
-            if (null == oJndiCtx) {
-                _logger.error("could not get a valid context");
-                throw new ConfigurationException("could not get a valid context - check your settings in the config file");
-            } 
-            String dataSourcename = Configuration.getStoreDBDatasourceName();
-            datasource =  ((DataSource) oJndiCtx.lookup(dataSourcename));
-        }
-        catch (Exception ex)
-        {
-                throw new ConfigurationException(ex);
-        }
-    }
-
-}

Copied: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/J2eeConnectionManager.java (from rev 12348, labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/J2eeConnectionManager.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/J2eeConnectionManager.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/J2eeConnectionManager.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,81 @@
+package org.jboss.soa.esb.persistence.manager;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.sql.DataSource;
+
+import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.common.Configuration;
+
+/**
+ * J2EE datasource based Connection Pooling implementation for use when deploying to a J2EE container 
+ *
+ */
+public class J2eeConnectionManager implements ConnectionManager {
+    
+    private static J2eeConnectionManager instance = null;
+    @SuppressWarnings("unused")
+    private DataSource datasource = null;
+    private Context oJndiCtx = null;
+    
+    private static Logger _logger = Logger.getLogger(J2eeConnectionManager.class);
+    private static final Object foo = new Integer(0);
+
+    public Connection getConnection() throws SQLException 
+    {
+        return datasource.getConnection();
+    }
+
+    public ConnectionManager getInstance() {
+        if (null != instance)
+        {
+            return instance;
+        }
+        
+        synchronized (foo)
+        {
+            if (null != instance) 
+                return instance;
+            
+            try
+            {
+                instance = new J2eeConnectionManager();
+                instance.init();
+            }
+            catch (Exception e)
+            {
+                _logger.error("Could not initialise instance.", e);
+                
+                return null;
+            }
+
+            return instance;
+        }
+    }
+
+    public void init() throws ConfigurationException {
+        _logger.info("initializing...");
+        
+                             
+        try
+        {
+            oJndiCtx = new InitialContext();
+            if (null == oJndiCtx) {
+                _logger.error("could not get a valid context");
+                throw new ConfigurationException("could not get a valid context - check your settings in the config file");
+            } 
+            String dataSourcename = Configuration.getStoreDBDatasourceName();
+            datasource =  ((DataSource) oJndiCtx.lookup(dataSourcename));
+        }
+        catch (Exception ex)
+        {
+                throw new ConfigurationException(ex);
+        }
+    }
+
+}

Deleted: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/StandaloneConnectionManager.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/StandaloneConnectionManager.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/StandaloneConnectionManager.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,141 +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 daniel.brum at jboss.com
- */
-
-package org.jboss.soa.esb.persistence.manager;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import org.apache.log4j.Logger;
-import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.common.Configuration;
-
-import com.mchange.v2.c3p0.ComboPooledDataSource;
-
-/**
- * C3PO Connection Pooling implementation for stand-alone use, outside of a J2EE container 
- *
- */
-public class StandaloneConnectionManager implements ConnectionManager
-{
-
-    private static StandaloneConnectionManager instance = null;
-
-    protected ComboPooledDataSource pooledDS = null;
-
-    private static final Object foo = new Integer(0);
-
-    private static Logger _logger = Logger.getLogger(StandaloneConnectionManager.class);
-
-    protected StandaloneConnectionManager ()
-    {
-    }
-
-    public ConnectionManager getInstance ()
-    {
-        if (null != instance)
-        {
-            return instance;
-        }
-        
-        synchronized (foo)
-        {
-            if (null != instance) 
-                return instance;
-            
-            try
-            {
-                instance = new StandaloneConnectionManager();
-                instance.init();
-            }
-            catch (Exception e)
-            {
-                _logger.error("Could not initialise instance.", e);
-                
-                return null;
-            }
-
-            return instance;
-        }
-    }
-
-    public void init () throws ConfigurationException
-    {
-        _logger.info("initializing...");
-        pooledDS = new ComboPooledDataSource();
-
-        try
-        {
-            pooledDS.setDriverClass(Configuration.getStoreDriver());
-            pooledDS.setJdbcUrl(Configuration.getStoreUrl());
-            pooledDS.setUser(Configuration.getStoreUser());
-            pooledDS.setPassword(Configuration.getStorePwd());
-            pooledDS.setMinPoolSize(Integer.valueOf(Configuration
-                    .getStorePoolMinSize()));
-            pooledDS.setInitialPoolSize(Integer.valueOf(Configuration
-                    .getStorePoolInitialSize()));
-            pooledDS.setMaxPoolSize(Integer.valueOf(Configuration
-                    .getStorePoolMaxSize()));
-            pooledDS.setAutomaticTestTable(Configuration.getStorePoolTestTable());
-            pooledDS.setCheckoutTimeout(Integer.valueOf(Configuration
-                    .getStorePoolTimeoutMillis()));
-        }
-        catch (Exception ex)
-        {
-            throw new ConfigurationException(ex);
-        }
-    }
-
-    public Connection getConnection () throws SQLException
-    {
-        Connection conn = null;
-
-        // TODO: figure out why this is neccessary - pool should never return
-        // null if DB is up and can connect
-        // testing showed null was being returned from pool in QA test
-        // MessageStoreTest
-        
-        while (true)
-        {
-            if (null != pooledDS)
-            {
-                if (null != (conn = pooledDS.getConnection())) 
-                    break;
-                else
-                    _logger.error("Null pooledDS");
-            }
-            
-            try
-            {
-                // TODO magic number
-                
-                Thread.sleep(1000);
-            }
-            catch (Exception e)
-            {
-            }
-        }
-
-        return conn;
-    }
-
-}

Copied: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/StandaloneConnectionManager.java (from rev 12348, labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/StandaloneConnectionManager.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/StandaloneConnectionManager.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/StandaloneConnectionManager.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,141 @@
+/*
+ * 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 daniel.brum at jboss.com
+ */
+
+package org.jboss.soa.esb.persistence.manager;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.common.Configuration;
+
+import com.mchange.v2.c3p0.ComboPooledDataSource;
+
+/**
+ * C3PO Connection Pooling implementation for stand-alone use, outside of a J2EE container 
+ *
+ */
+public class StandaloneConnectionManager implements ConnectionManager
+{
+
+    private static StandaloneConnectionManager instance = null;
+
+    protected ComboPooledDataSource pooledDS = null;
+
+    private static final Object foo = new Integer(0);
+
+    private static Logger _logger = Logger.getLogger(StandaloneConnectionManager.class);
+
+    protected StandaloneConnectionManager ()
+    {
+    }
+
+    public ConnectionManager getInstance ()
+    {
+        if (null != instance)
+        {
+            return instance;
+        }
+        
+        synchronized (foo)
+        {
+            if (null != instance) 
+                return instance;
+            
+            try
+            {
+                instance = new StandaloneConnectionManager();
+                instance.init();
+            }
+            catch (Exception e)
+            {
+                _logger.error("Could not initialise instance.", e);
+                
+                return null;
+            }
+
+            return instance;
+        }
+    }
+
+    public void init () throws ConfigurationException
+    {
+        _logger.info("initializing...");
+        pooledDS = new ComboPooledDataSource();
+
+        try
+        {
+            pooledDS.setDriverClass(Configuration.getStoreDriver());
+            pooledDS.setJdbcUrl(Configuration.getStoreUrl());
+            pooledDS.setUser(Configuration.getStoreUser());
+            pooledDS.setPassword(Configuration.getStorePwd());
+            pooledDS.setMinPoolSize(Integer.valueOf(Configuration
+                    .getStorePoolMinSize()));
+            pooledDS.setInitialPoolSize(Integer.valueOf(Configuration
+                    .getStorePoolInitialSize()));
+            pooledDS.setMaxPoolSize(Integer.valueOf(Configuration
+                    .getStorePoolMaxSize()));
+            pooledDS.setAutomaticTestTable(Configuration.getStorePoolTestTable());
+            pooledDS.setCheckoutTimeout(Integer.valueOf(Configuration
+                    .getStorePoolTimeoutMillis()));
+        }
+        catch (Exception ex)
+        {
+            throw new ConfigurationException(ex);
+        }
+    }
+
+    public Connection getConnection () throws SQLException
+    {
+        Connection conn = null;
+
+        // TODO: figure out why this is neccessary - pool should never return
+        // null if DB is up and can connect
+        // testing showed null was being returned from pool in QA test
+        // MessageStoreTest
+        
+        while (true)
+        {
+            if (null != pooledDS)
+            {
+                if (null != (conn = pooledDS.getConnection())) 
+                    break;
+                else
+                    _logger.error("Null pooledDS");
+            }
+            
+            try
+            {
+                // TODO magic number
+                
+                Thread.sleep(1000);
+            }
+            catch (Exception e)
+            {
+            }
+        }
+
+        return conn;
+    }
+
+}

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -29,6 +29,7 @@
 
 public interface MessageStore
 {
+    public final static String DEFAULT = "org.jboss.internal.soa.esb.persistence.format.db.DBMessageStoreImpl";
     public final static String DEFAULT_CLASSIFICATION = "STORE";
     public final static String DLQ_CLASSIFICATION = "DLQ";
 	/**

Deleted: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStoreFactory.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStoreFactory.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStoreFactory.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,82 +0,0 @@
-package org.jboss.soa.esb.services.persistence;
-
-/*
- * 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 mark.little at jboss.com
- */
-
-import java.lang.reflect.Constructor;
-import java.net.URI;
-
-import org.jboss.soa.esb.common.Configuration;
-import org.jboss.soa.esb.util.ClassUtil;
-
-
-
-
- at SuppressWarnings("unchecked")
-public abstract class MessageStoreFactory {
-	
-	private static MessageStoreFactory theFactory;
-	
-	static
-	{
-		
-		try {			
-//			Class cls = Class.forName("org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl");
-			Class cls = ClassUtil.forName(Configuration.getStoreConnectionFactory(), MessageStoreFactory.class);
-			Constructor<MessageStoreFactory> c = cls.getConstructor(new Class[]{});
-			theFactory = c.newInstance(new Object[]{});
-		} catch (Exception e) {			
-			e.printStackTrace();
-		}
-		
-		
-	}
-	
-	
-	/**
-	 * @return a default implementation.
-	 */
-	
-	public abstract MessageStore getMessageStore ();
-	
-	/**
-	 * @param type the unique identifier representing the type of this MessageStore.
-	 * @return the MessageStore, or <code>null</code> if no suitable store is available.
-	 */
-	
-	public abstract MessageStore getMessageStore (URI type);
-	
-	
-	public static MessageStoreFactory getInstance ()
-	{
-		return theFactory;
-	}
-	
-	/**
-	 * Reload the plugins.
-	 */
-	
-	public abstract void reset ();
-	
-	
-	
-
-}

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/util/ClassUtil.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/util/ClassUtil.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/util/ClassUtil.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -21,10 +21,22 @@
  */
 package org.jboss.soa.esb.util;
 
+import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
+import org.apache.log4j.Logger;
+
 /**
  * Utility methods to aid in class/resource loading.
  * 
@@ -32,6 +44,8 @@
  */
 public class ClassUtil
 {
+    private static Logger logger = Logger.getLogger(ClassUtil.class);
+
     /**
      * Load the specified class.
      * @param className The name of the class to load.
@@ -127,4 +141,93 @@
     public static String getPath(Package packageObj) {
         return "/" + packageObj.getName().replace('.', '/');
     }
+
+    public static List<String> getResourceList(String regex, Class caller) {
+        ClasspathResourceFilter filter = new ClasspathResourceFilter(regex);
+        ClassLoader classLoader;
+
+        classLoader = Thread.currentThread().getContextClassLoader();
+        if(classLoader instanceof URLClassLoader) {
+            filter.filter((URLClassLoader) classLoader);
+        }
+        classLoader = caller.getClassLoader();
+        if(classLoader instanceof URLClassLoader) {
+            filter.filter((URLClassLoader) classLoader);
+        }
+
+        return filter.getResourceList();
+    }
+
+    private static class ClasspathResourceFilter {
+
+        private List<String> resourceList = new ArrayList<String>();
+        private Pattern pattern;
+
+        private ClasspathResourceFilter(String regex) {
+            pattern = Pattern.compile(regex);
+        }
+
+        private void filter(URLClassLoader classLoader) {
+            URL[] cpUrls = classLoader.getURLs();
+
+            for (int i = 0; i < cpUrls.length; i++) {
+                try {
+                    File file = new File(cpUrls[i].toURI());
+                    if(file.isDirectory()) {
+                        searchClasspathDirTree(file, "");
+                    } else {
+                        searchArchive(file);
+                    }
+                } catch (URISyntaxException e) {
+                    logger.warn("Error searching classpath resource URL '" + cpUrls[i] + "' for resource '" + pattern.pattern() + "': " + e.getMessage());
+                } catch (IOException e) {
+                    logger.warn("Error searching classpath resource URL '" + cpUrls[i] + "' for resource '" + pattern.pattern() + "': " + e.getMessage());
+                }
+            }
+        }
+
+        private void searchClasspathDirTree(File rootDir, String subDir) {
+            File currentDir = new File(rootDir, subDir);
+            File[] contents = currentDir.listFiles();
+
+            for(File file: contents) {
+                if(file.isDirectory()) {
+                    String subSubDir = subDir + "/" + file.getName();
+                    searchClasspathDirTree(rootDir, subSubDir);
+                } else {
+                    String resClasspathPath = file.toURI().toString().substring(rootDir.toURI().toString().length() - 1);
+                    if(isToBeAdded(resClasspathPath)) {
+                        resourceList.add(resClasspathPath);
+                    }
+                }
+            }
+        }
+
+        private void searchArchive(File archiveFile) throws IOException {
+            ZipFile zip = new ZipFile(archiveFile);
+            Enumeration<? extends ZipEntry> entries = zip.entries();
+
+            while (entries.hasMoreElements()) {
+                ZipEntry entry = entries.nextElement();
+                String resClasspathPath = "/" + entry.getName();
+                if(isToBeAdded(resClasspathPath)) {
+                    resourceList.add(resClasspathPath);
+                }
+            }
+        }
+
+        private boolean isToBeAdded(String resClasspathPath) {
+            if(resourceList.contains(resClasspathPath)) {
+                // Already in the list e.g. same resource in different archives...
+                return false;
+            }
+
+            Matcher matcher = pattern.matcher(resClasspathPath);
+            return matcher.matches();
+        }
+
+        private List<String> getResourceList() {
+            return resourceList;
+        }
+    }
 }

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/util/Util.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/util/Util.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/util/Util.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -37,8 +37,10 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.ErrorListener;
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
@@ -272,17 +274,24 @@
 		{
 			Transformer transformer;
 
-			// There's a bug in Java 5 re this code (formatting).
-			// See http://forum.java.sun.com/thread.jspa?threadID=562510&start=0
-			// and it explains the
-			// whys of the following code.
+            try {
+                factory.setAttribute("indent-number", new Integer(4));
+            } catch(Exception e) {
+                // Ignore... Xalan may throw on this!!
+                // We handle Xalan indentation below (yeuckkk) ...
+            }
 			transformer = factory.newTransformer();
 			transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+            // There's a bug in Java 5 re this code (formatting).
+            // See http://forum.java.sun.com/thread.jspa?threadID=562510&start=0
+            // and it explains the
+            // whys of the following code.
 			transformer.setOutputProperty(
 					"{http://xml.apache.org/xalan}indent-amount", "4");
 			transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION,
 					"yes");
-			transformer.transform(source, new StreamResult(outStream));
+            transformer.setErrorListener(new NullErrorListener());
+            transformer.transform(source, new StreamResult(outStream));
 
 			return outStream.toString();
 		}
@@ -292,9 +301,17 @@
 		}
 	}
 
-	private static TransformerFactory factory = TransformerFactory.newInstance();
+    private static TransformerFactory factory = TransformerFactory.newInstance();
+    private static class NullErrorListener implements ErrorListener {
+        public void warning(TransformerException exception) throws TransformerException {
+        }
+        public void error(TransformerException exception) throws TransformerException {
+        }
+        public void fatalError(TransformerException exception) throws TransformerException {
+        }
+    }
 	
-	private static final SimpleDateFormat s_oTS = new SimpleDateFormat(
+    private static final SimpleDateFormat s_oTS = new SimpleDateFormat(
 			"yyyy/MM/dd hh:mm:ss.SSS");
 
 } // ____________________________________________________________________________

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/soap/OGNLUtilsUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/soap/OGNLUtilsUnitTest.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/soap/OGNLUtilsUnitTest.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -19,27 +19,27 @@
  */
 package org.jboss.internal.soa.esb.soap;
 
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.Element;
-import org.jboss.soa.esb.dom.YADOMUtil;
-import org.jboss.soa.esb.ConfigurationException;
-import org.xml.sax.SAXException;
-
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.HashMap;
-import java.util.ArrayList;
 
-import junit.framework.TestCase;
-
-import javax.xml.xpath.XPathFactory;
+import javax.xml.namespace.NamespaceContext;
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
-import javax.xml.namespace.NamespaceContext;
+import javax.xml.xpath.XPathFactory;
 
+import junit.framework.TestCase;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.dom.YADOMUtil;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.xml.sax.SAXException;
+
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  */
@@ -96,7 +96,7 @@
         }
 
         public Iterator getPrefixes(String namespaceURI) {
-            ArrayList list = new ArrayList();
+            ArrayList<String> list = new ArrayList<String>();
 
             if(prefixes.containsKey(namespaceURI)) {
                 list.add(prefixes.get(namespaceURI));

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/StreamUtils.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/StreamUtils.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/StreamUtils.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -25,10 +25,10 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+import junit.framework.TestCase;
+
 import org.apache.log4j.Logger;
 
-import junit.framework.TestCase;
-
 /**
  * Stream handling utilities for testing.
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/testutils/TestEnvironmentUtil.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/testutils/TestEnvironmentUtil.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/testutils/TestEnvironmentUtil.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -96,5 +96,21 @@
         reader.close();
         return sb.toString();
     }
+    
+    public static File findResourceDirectory(String dirPath)
+    {
+        String[] dirs = dirPath.split("/");
+        for (int i=1; i<dirs.length; i++) {
+            dirPath = ".";
+            for (int j=i; j<dirs.length; j++) {
+                dirPath += "/" + dirs[j];
+            }
+            File dir = new File(dirPath);
+            if (dir.exists()) {
+                return dir;
+            }
+        }
+        return null;
+    }
 	
 }

Copied: labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/util/ClassUtilUnitTest.java (from rev 12348, labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/util/ClassUtilUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/util/ClassUtilUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/util/ClassUtilUnitTest.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,39 @@
+/*
+ * 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, JBoss Inc.
+ */
+package org.jboss.soa.esb.util;
+
+import java.util.List;
+
+import junit.framework.TestCase;
+
+/**
+ * ClassUtil tests.
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class ClassUtilUnitTest extends TestCase {
+
+    public void test_getResourceList() {
+        List<String> resources;
+
+        resources = ClassUtil.getResourceList("/org/apache/log4j/jmx/Abstract.*", ClassUtilUnitTest.class);
+        assertEquals(1, resources.size());
+        assertTrue(resources.contains("/org/apache/log4j/jmx/AbstractDynamicMBean.class"));
+    }
+}

Copied: labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/internal/soa/esb/services/registry/MockRegistryImpl.java (from rev 12348, labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/registry/MockRegistryImpl.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/internal/soa/esb/services/registry/MockRegistryImpl.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/internal/soa/esb/services/registry/MockRegistryImpl.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,258 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.internal.soa.esb.services.registry;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jboss.soa.esb.addressing.EPR;
+import org.jboss.soa.esb.services.registry.Registry;
+import org.jboss.soa.esb.services.registry.RegistryException;
+/**
+ * Mock class for the Registry.
+ * If need be we can extract the interface from here, add a factory and have JAXR as a plugin, allowing
+ * for other RegistryAPIs.
+ *
+ * @author Kurt Stam
+ */
+public class MockRegistryImpl implements Registry
+{
+    private static Map<String,Category> categories = new HashMap<String,Category>();
+    
+	/** 
+	 * Publish an EPR to the Registry
+	 */
+	protected Service registerService(String categoryName, String serviceName, String serviceDescription)
+	{
+        Category category = categories.get(categoryName);
+		if (category==null) {
+            category = new Category();
+		    categories.put(categoryName, category);
+        }
+        Service service = new Service();
+        service.setName(serviceName);
+        service.setDescription(serviceDescription);
+        category.getServices().add(service);
+		return service;
+	}
+	/** 
+	 * Remove an EPR from the Registry
+	 */
+	@SuppressWarnings("unchecked")
+    public void unRegisterService(String categoryName, String serviceName) throws RegistryException
+    {
+        Category category = categories.get(categoryName);
+        if (category==null) {
+            throw new RegistryException("Service not found");
+        } else {
+            List<Service> services = category.getServices();
+            for (Service service : services) {
+                if (serviceName.equals(service.getName())) {
+                    services.remove(service);
+                }
+            }
+        }
+	}
+	/** 
+	 * Publish an EPR to the Registry
+	 */
+	public void registerEPR(String categoryName, String serviceName, String serviceDescription, EPR epr, String eprDescription) 
+		throws RegistryException
+	{
+		Service service = registerService(categoryName, serviceName, serviceDescription);
+        ServiceBinding serviceBinding = new ServiceBinding();
+        serviceBinding.setDescription(eprDescription);
+        serviceBinding.setEpr(epr);
+        service.getServiceBindings().add(serviceBinding);
+    }
+	/** 
+	 * Remove an EPR from the Registry
+	 */
+	public void unRegisterEPR(String category, String serviceName, EPR toBeDeletedEPR) throws RegistryException{
+		//first find the ServiceBindings for this service
+        Service service = findService(category, serviceName);
+        List<ServiceBinding> serviceBindings = service.getServiceBindings();
+        for (ServiceBinding binding : serviceBindings) {
+            if (toBeDeletedEPR.equals(binding.getEpr())) {
+                serviceBindings.remove(binding);
+            }
+        }
+	}
+	
+	/** 
+	 * {@inheritDoc}
+	 * @return collection services
+	 */
+	public Collection<String> findAllServices() throws RegistryException
+	{
+        Collection<String> serviceNames = new ArrayList<String>();
+        for (Category category : categories.values()) {
+            for (Service service : category.getServices()) {
+                serviceNames.add(service.name);
+            }
+        }
+        return serviceNames;
+	}
+	/**
+	 * Find Services based on a category ("transformation").
+	 * 
+	 * @param serviceType
+	 * @return collection services
+	 */
+	public Collection<String> findServices(String categoryName) throws RegistryException
+	{
+        Collection<String> serviceNames = new ArrayList<String>();
+		Category category = categories.get(categoryName);
+        if (category==null) {
+            throw new RegistryException("No category called " + categoryName + " exist");
+        }
+        for (Service service : category.getServices()) {
+            serviceNames.add(service.name);
+        }
+        return serviceNames;
+	}
+	/**
+	 * 
+	 * @param service
+	 * @return
+	 */
+	public Collection<EPR> findEPRs(String categoryName, String serviceName) throws RegistryException
+	{
+		Collection<EPR> eprs = new ArrayList<EPR>();
+        Service service = findService(categoryName, serviceName);
+        for (ServiceBinding serviceBinding : service.serviceBindings) {
+            eprs.add(serviceBinding.getEpr());
+        }
+        return eprs;
+	}
+	/**
+	 * 
+	 * @param service
+	 * @return
+	 */
+	public EPR findEPR(String categoryName, String serviceName) throws RegistryException
+	{
+        Service service = findService(categoryName, serviceName);
+        for (ServiceBinding serviceBinding : service.serviceBindings) {
+            //return the first one in the list
+            return serviceBinding.getEpr();
+        }
+        return null;
+	}
+	/**
+	 * 
+	 * @param category
+	 * @param serviceName
+	 * @return Service
+	 */
+	protected synchronized static Service findService(String categoryName, String serviceName) throws RegistryException
+	{
+        Category category = categories.get(categoryName);
+        for (Service service : category.getServices()) {
+            if (serviceName.equals(service.getName())) {
+                return service;
+            }
+        }
+        throw new RegistryException("No service called " + serviceName + " exists in category " + categoryName);
+	}
+	/**
+	 * Finds all services for a given category.
+	 * @param category
+	 * @param serviceName
+	 * @return Service
+	 */
+	protected synchronized static Collection<Service> findServicesForCategory(String categoryName)
+	{
+        Category category = categories.get(categoryName);
+        return category.getServices();
+	}
+    
+    class Category
+    {
+        List<Service> services = new ArrayList<Service>();
+        
+        public List<Service> getServices() {
+            return services;
+        }
+        public void setServices(List<Service> services) {
+            this.services = services;
+        }
+    }
+    
+    class Service
+    {
+        String name;
+        String description;
+        List<ServiceBinding> serviceBindings = new ArrayList<ServiceBinding>();
+        
+        public String getDescription() {
+            return description;
+        }
+        public void setDescription(String description) {
+            this.description = description;
+        }
+        public String getName() {
+            return name;
+        }
+        public void setName(String name) {
+            this.name = name;
+        }
+        public List<ServiceBinding> getServiceBindings() {
+            return serviceBindings;
+        }
+        public void setServiceBindings(List<ServiceBinding> serviceBindings) {
+            this.serviceBindings = serviceBindings;
+        }
+    }
+    
+    class ServiceBinding
+    {
+        String name;
+        String description;
+        EPR epr;
+        
+        public String getDescription() {
+            return description;
+        }
+        public void setDescription(String description) {
+            this.description = description;
+        }
+        public EPR getEpr() {
+            return epr;
+        }
+        public void setEpr(EPR epr) {
+            this.epr = epr;
+        }
+        public String getName() {
+            return name;
+        }
+        public void setName(String name) {
+            this.name = name;
+        }
+    }
+	
+}
+
+	

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

Modified: labs/jbossesb/workspace/dbevenius/product/etc/schemas/xml/jbossesb-1.0.1.xsd
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/etc/schemas/xml/jbossesb-1.0.1.xsd	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/etc/schemas/xml/jbossesb-1.0.1.xsd	2007-06-06 14:23:48 UTC (rev 12351)
@@ -6,494 +6,492 @@
         targetNamespace="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd"
         elementFormDefault="qualified">
 
-   <!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
-      Document root + some basic types.
-   88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->
+    <!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
+       Document root + some basic types.
+    88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->
 
-   <xsd:element name="jbossesb">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">The jbossesb configuration for a single instance.</xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:sequence>
-            <xsd:element ref="jesb:providers" minOccurs="0" maxOccurs="1"/>
-            <xsd:element ref="jesb:services" minOccurs="0" maxOccurs="1"/>
-         </xsd:sequence>
-         <xsd:attribute name="parameterReloadSecs" use="optional" default="180"/>
-      </xsd:complexType>
-   </xsd:element>
+    <xsd:element name="jbossesb">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">The jbossesb configuration for a single instance.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element ref="jesb:providers" minOccurs="0" maxOccurs="1"/>
+                <xsd:element ref="jesb:services" minOccurs="0" maxOccurs="1"/>
+            </xsd:sequence>
+            <xsd:attribute name="parameterReloadSecs" use="optional" default="180"/>
+        </xsd:complexType>
+    </xsd:element>
 
-   <xsd:element name="property">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A simple name-value pair.</xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:complexContent>
-            <xsd:extension base="xsd:anyType">
-               <xsd:attribute name="name" use="required" type="xsd:string"/>
-               <xsd:attribute name="value" type="xsd:string"/>
-            </xsd:extension>
-         </xsd:complexContent>
-      </xsd:complexType>
-   </xsd:element>
+    <xsd:element name="property">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A simple name-value pair.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="xsd:anyType">
+                    <xsd:attribute name="name" use="required" type="xsd:string"/>
+                    <xsd:attribute name="value" type="xsd:string"/>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
 
-   <!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
-      Provider and Bus base types.
-   88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->
+    <!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
+       Provider and Bus base types.
+    88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->
 
-   <xsd:element name="providers">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A container for the providers referenced in the jbossesb config file
-         </xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:sequence>
-            <xsd:element ref="jesb:provider" maxOccurs="unbounded" minOccurs="1"/>
-         </xsd:sequence>
-      </xsd:complexType>
-   </xsd:element>
-   <xsd:complexType name="provider">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A provider of a bus. So for instance you can have a jms-provider (JBossMQ)
-            or an ftp-provider.
-         </xsd:documentation>
-      </xsd:annotation>
-      <xsd:sequence>
-         <xsd:element ref="jesb:property" minOccurs="0" maxOccurs="unbounded"/>
-         <xsd:element ref="jesb:bus" maxOccurs="unbounded" minOccurs="1"/>
-      </xsd:sequence>
-      <xsd:attribute name="name" use="required" type="xsd:string"/>
-   </xsd:complexType>
-   <xsd:element name="provider" type="jesb:provider"/>
-
-   <xsd:complexType name="bus">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A bus (also called "channel" by others) is a means by which Services
-            communicate with each other (JMS, FTP, HTTP, etc).
-         </xsd:documentation>
-      </xsd:annotation>
-      <xsd:sequence>
-         <xsd:element ref="jesb:property" minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:attribute name="busid" use="required" type="xsd:string">
-         <xsd:annotation>
-            <xsd:documentation xml:lang="en">An id such that this bus can be referenced by Service listn.
+    <xsd:element name="providers">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A container for the providers referenced in the jbossesb config file
             </xsd:documentation>
-            <xsd:appinfo>
-            </xsd:appinfo>
-         </xsd:annotation>
-      </xsd:attribute>
-   </xsd:complexType>
-   <xsd:element name="bus" type="jesb:bus"/>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element ref="jesb:provider" maxOccurs="unbounded" minOccurs="1"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:complexType name="provider">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A provider of a bus. So for instance you can have a jms-provider (JBossMQ)
+                or an ftp-provider.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:sequence>
+            <xsd:element ref="jesb:property" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element ref="jesb:bus" maxOccurs="unbounded" minOccurs="1"/>
+        </xsd:sequence>
+        <xsd:attribute name="name" use="required" type="xsd:string"/>
+    </xsd:complexType>
+    <xsd:element name="provider" type="jesb:provider"/>
 
-   <!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
-      Service and Action types.
-   88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->
-
-   <xsd:element name="services">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A container for services.</xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:sequence>
-            <xsd:element ref="jesb:service" minOccurs="1" maxOccurs="unbounded"/>
-         </xsd:sequence>
-      </xsd:complexType>
-   </xsd:element>
-   <xsd:element name="service">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A service has listener or gateways and a list of actions.
-         </xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:sequence>
-            <xsd:element ref="jesb:listeners" minOccurs="1" maxOccurs="1"/>
-            <xsd:element ref="jesb:actions" minOccurs="0" maxOccurs="1"/>
-         </xsd:sequence>
-         <xsd:attribute name="category" use="required" type="xsd:string">
-            <xsd:annotation>
-               <xsd:documentation xml:lang="en">The service category which will be used to store a reference to
-                  this service in the registry.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:attribute>
-         <xsd:attribute name="name" use="required" type="xsd:string">
-            <xsd:annotation>
-               <xsd:documentation xml:lang="en">The service name which will be used to store a reference to this
-                  service in the registry.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:attribute>
-         <xsd:attribute name="description" use="required" type="xsd:string">
-            <xsd:annotation>
-               <xsd:documentation xml:lang="en">The service description which stored with this service in the
-                  registry, so that the purpose of this service can be understood by a human.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:attribute>
-      </xsd:complexType>
-   </xsd:element>
-
-   <xsd:element name="actions">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A container for actions belonging to this service.</xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:sequence>
-            <xsd:element ref="jesb:action" minOccurs="1" maxOccurs="unbounded"/>
-         </xsd:sequence>
-      </xsd:complexType>
-   </xsd:element>
-   <xsd:element name="action">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">An action which will act on the message when it is received by the service.
-            Actions can be chained. Hence you can specify a list of actions. Action are 'pluggable' and can be
-            custom code, however
-            JBossESB comes with a list of predefined actions.
-         </xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:sequence>
+    <xsd:complexType name="bus">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A bus (also called "channel" by others) is a means by which Services
+                communicate with each other (JMS, FTP, HTTP, etc).
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:sequence>
             <xsd:element ref="jesb:property" minOccurs="0" maxOccurs="unbounded"/>
-         </xsd:sequence>
-         <xsd:attribute name="name" use="required" type="xsd:string">
+        </xsd:sequence>
+        <xsd:attribute name="busid" use="required" type="xsd:string">
             <xsd:annotation>
-               <xsd:documentation xml:lang="en">The logical name of the action.</xsd:documentation>
+                <xsd:documentation xml:lang="en">An id such that this bus can be referenced by Service listn.
+                </xsd:documentation>
+                <xsd:appinfo>
+                </xsd:appinfo>
             </xsd:annotation>
-         </xsd:attribute>
-         <xsd:attribute name="class" use="required" type="xsd:string">
-            <xsd:annotation>
-               <xsd:documentation xml:lang="en">The full classname of the java class in which this action is
-                  defined.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:attribute>
-         <xsd:attribute name="process" type="xsd:string">
-            <xsd:annotation>
-               <xsd:documentation xml:lang="en">The name of the method on the action that needs to be called when
-                  the message is received.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:attribute>
-      </xsd:complexType>
-   </xsd:element>
+        </xsd:attribute>
+    </xsd:complexType>
+    <xsd:element name="bus" type="jesb:bus"/>
 
-   <!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
-      Listener base types.
-   88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->
+    <!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
+       Service and Action types.
+    88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->
 
-   <xsd:element name="listeners">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A container for all listener for a service.</xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:sequence>
-            <xsd:element ref="jesb:listener" maxOccurs="unbounded" minOccurs="1"/>
-         </xsd:sequence>
-      </xsd:complexType>
-   </xsd:element>
-   <xsd:complexType name="listener">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A listener is a listener or a gateway. The listener defines to which bus
-            the service is listening. The service can simultaneniously listen to multiple buses.
-         </xsd:documentation>
-      </xsd:annotation>
-      <xsd:sequence>
-         <xsd:element ref="jesb:property" minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:attribute name="name" use="required" type="xsd:string">
-         <xsd:annotation>
-            <xsd:documentation xml:lang="en">The logical name of the listener.</xsd:documentation>
-         </xsd:annotation>
-      </xsd:attribute>
-      <xsd:attribute name="busidref" use="optional" type="xsd:string" default="$not-defined$">
-         <xsd:annotation>
-            <xsd:documentation xml:lang="en">A reference to an existing bus, as defined in the 'buses' section of
-               this jbossesb config.
+    <xsd:element name="services">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A container for services.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element ref="jesb:service" minOccurs="1" maxOccurs="unbounded"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="service">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A service has listener or gateways and a list of actions.
             </xsd:documentation>
-         </xsd:annotation>
-      </xsd:attribute>
-      <xsd:attribute name="maxThreads" use="optional" type="xsd:int" default="1">
-         <xsd:annotation>
-            <xsd:documentation xml:lang="en">The number of threads which will be started for this listener.
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element ref="jesb:listeners" minOccurs="1" maxOccurs="1"/>
+                <xsd:element ref="jesb:actions" minOccurs="0" maxOccurs="1"/>
+            </xsd:sequence>
+            <xsd:attribute name="category" use="required" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">The service category which will be used to store a reference to
+                        this service in the registry.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="name" use="required" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">The service name which will be used to store a reference to this
+                        service in the registry.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="description" use="required" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">The service description which stored with this service in the
+                        registry, so that the purpose of this service can be understood by a human.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:element name="actions">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A container for actions belonging to this service.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element ref="jesb:action" minOccurs="1" maxOccurs="unbounded"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="action">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">An action which will act on the message when it is received by the service.
+                Actions can be chained. Hence you can specify a list of actions. Action are 'pluggable' and can be
+                custom code, however
+                JBossESB comes with a list of predefined actions.
             </xsd:documentation>
-         </xsd:annotation>
-      </xsd:attribute>
-      <xsd:attribute name="is-gateway" use="optional" type="xsd:boolean" default="false">
-         <xsd:annotation>
-            <xsd:documentation xml:lang="en">true if the listener is a gateway. A gateway is an ESB-Unware listener,
-               while a
-               listener is ESB-aware and as such expects jbossesb formatted messages.
-            </xsd:documentation>
-         </xsd:annotation>
-      </xsd:attribute>
-   </xsd:complexType>
-   <xsd:element name="listener" type="jesb:listener"/>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element ref="jesb:property" minOccurs="0" maxOccurs="unbounded"/>
+            </xsd:sequence>
+            <xsd:attribute name="name" use="required" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">The logical name of the action.</xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="class" use="required" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">The full classname of the java class in which this action is
+                        defined.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="process" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">The name of the method on the action that needs to be called when
+                        the message is received.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+        </xsd:complexType>
+    </xsd:element>
 
-   <!-- JCA Types -->
-   <xsd:element name="activation-config">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">Activation configuration for jca bus or listener.</xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:sequence>
-            <xsd:element ref="jesb:property" maxOccurs="unbounded" minOccurs="1"/>
-         </xsd:sequence>
-      </xsd:complexType>
-   </xsd:element>
-   <xsd:element name="jca-gateway" substitutionGroup="jesb:listener">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A specific gateway using JCA inflow.</xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:complexContent>
-            <xsd:extension base="jesb:listener">
-               <xsd:sequence>
-                  <xsd:element ref="jesb:activation-config" minOccurs="0" maxOccurs="1"/>
-               </xsd:sequence>
-               <xsd:attribute name="adapter" use="required" type="xsd:string"/>
-               <xsd:attribute name="endpointClass" use="required" type="xsd:string"/>
-               <xsd:attribute name="messagingType" use="optional" type="xsd:string"/>
-               <xsd:attribute name="jcaBridge" use="optional" type="xsd:string"/>
-               <xsd:attribute name="transacted" use="optional" type="xsd:string"/>
-            </xsd:extension>
-         </xsd:complexContent>
-      </xsd:complexType>
-   </xsd:element>
+    <!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
+       Listener base types.
+    88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->
 
-   <!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
-      JMS Type Implementations.
-   88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->
-
-   <xsd:element name="jms-message-filter">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A JMS filter can add information to a Queue, or Topic. For example you
-            can defined a message-selector. However, you can also push the queue name and type into this
-            filter given you did not already specify them in the jms-bus.
-         </xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:attribute name="dest-name" use="required" type="xsd:string">
+    <xsd:element name="listeners">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A container for all listener for a service.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element ref="jesb:listener" maxOccurs="unbounded" minOccurs="1"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:complexType name="listener">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A listener is a listener or a gateway. The listener defines to which bus
+                the service is listening. The service can simultaneniously listen to multiple buses.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:sequence>
+            <xsd:element ref="jesb:property" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+        <xsd:attribute name="name" use="required" type="xsd:string">
             <xsd:annotation>
-               <xsd:documentation xml:lang="en">Name of the Queue of Topic.</xsd:documentation>
+                <xsd:documentation xml:lang="en">The logical name of the listener.</xsd:documentation>
             </xsd:annotation>
-         </xsd:attribute>
-         <xsd:attribute name="dest-type" use="required">
+        </xsd:attribute>
+        <xsd:attribute name="busidref" use="optional" type="xsd:string" default="$not-defined$">
             <xsd:annotation>
-               <xsd:documentation xml:lang="en">A Queue delivers a message once, a topic broadcasts a message to
-                  all registered listeners.
-               </xsd:documentation>
+                <xsd:documentation xml:lang="en">A reference to an existing bus, as defined in the 'buses' section of
+                    this jbossesb config.
+                </xsd:documentation>
             </xsd:annotation>
-            <xsd:simpleType>
-               <xsd:restriction base="xsd:NMTOKEN">
-                  <xsd:enumeration value="QUEUE"/>
-                  <xsd:enumeration value="TOPIC"/>
-               </xsd:restriction>
-            </xsd:simpleType>
-         </xsd:attribute>
-         <xsd:attribute name="selector" type="xsd:string">
+        </xsd:attribute>
+        <xsd:attribute name="maxThreads" use="optional" type="xsd:int" default="1">
             <xsd:annotation>
-               <xsd:documentation xml:lang="en">A message-selector allows multiple listeners to register with the
-                  same queue/topic, but
-                  they will filter on this message-selector.
-               </xsd:documentation>
+                <xsd:documentation xml:lang="en">The number of threads which will be started for this listener.
+                </xsd:documentation>
             </xsd:annotation>
-         </xsd:attribute>
-      </xsd:complexType>
-   </xsd:element>
-   <xsd:element name="jms-bus" substitutionGroup="jesb:bus">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A JMS-Bus is a specific instance of a bus using the JMS protocol.
-         </xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:complexContent>
-            <xsd:extension base="jesb:bus">
-               <xsd:sequence>
-                  <xsd:element ref="jesb:jms-message-filter" maxOccurs="1" minOccurs="0"/>
-               </xsd:sequence>
-            </xsd:extension>
-         </xsd:complexContent>
-      </xsd:complexType>
-   </xsd:element>
-   <xsd:element name="jms-provider" substitutionGroup="jesb:provider">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A specific instance of a provider, providing JMS.</xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:complexContent>
-            <xsd:extension base="jesb:provider">
-               <xsd:attribute name="connection-factory" use="required" type="xsd:string">
-                  <xsd:annotation>
-                     <xsd:documentation xml:lang="en">The connection-factory used to lookup queues/topics in a
-                        naming directory (JNDI)
-                     </xsd:documentation>
-                  </xsd:annotation>
-               </xsd:attribute>
-               <xsd:attribute name="jndi-context-factory" type="xsd:string">
-                  <xsd:annotation>
-                     <xsd:documentation xml:lang="en">The context factory class the JBossESB will use to do
-                        naming lookups.
-                     </xsd:documentation>
-                  </xsd:annotation>
-               </xsd:attribute>
-               <xsd:attribute name="jndi-pkg-prefix" type="xsd:string">
-                  <xsd:annotation>
-                     <xsd:documentation xml:lang="en">The pkg-prefix which will be used to do naming lookups. It
-                        is left empty by default.
-                     </xsd:documentation>
-                  </xsd:annotation>
-               </xsd:attribute>
-               <xsd:attribute name="jndi-URL" type="xsd:anyURI">
-                  <xsd:annotation>
-                     <xsd:documentation xml:lang="en">The URL used to do naming lookups.</xsd:documentation>
-                  </xsd:annotation>
-               </xsd:attribute>
-            </xsd:extension>
-         </xsd:complexContent>
-      </xsd:complexType>
-   </xsd:element>
-   <xsd:element name="jms-listener" substitutionGroup="jesb:listener">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A specific listener using the jms protocol.</xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:complexContent>
-            <xsd:extension base="jesb:listener">
-               <xsd:sequence>
-                  <xsd:element ref="jesb:jms-message-filter" maxOccurs="1" minOccurs="0"/>
-               </xsd:sequence>
-            </xsd:extension>
-         </xsd:complexContent>
-      </xsd:complexType>
-   </xsd:element>
-
-   <!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
-      FS Type Implementations.
-   88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->
-   <xsd:element name="fs-message-filter">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A FS filter.</xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:attribute name="directory" use="required" type="xsd:string">
+        </xsd:attribute>
+        <xsd:attribute name="is-gateway" use="optional" type="xsd:boolean" default="false">
             <xsd:annotation>
-               <xsd:documentation xml:lang="en">The file share that is monitored for incoming new files.
-               </xsd:documentation>
+                <xsd:documentation xml:lang="en">true if the listener is a gateway. A gateway is an ESB-Unware listener,
+                    while a
+                    listener is ESB-aware and as such expects jbossesb formatted messages.
+                </xsd:documentation>
             </xsd:annotation>
-         </xsd:attribute>
-         <xsd:attribute name="input-suffix" use="required" type="xsd:string">
-            <xsd:annotation>
-               <xsd:documentation xml:lang="en">The file suffix used to filter files targeted for comsumption by
-                  the ESB (note: add the dot, so something like '.esbIn').
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:attribute>
-         <xsd:attribute name="work-suffix" use="optional" type="xsd:string" default=".esbInProcess">
-            <xsd:annotation>
-               <xsd:documentation xml:lang="en">The file suffix used while the file is being process, so that
-                  another thread or process won't pick it up too.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:attribute>
-         <xsd:attribute name="post-delete" use="optional" type="xsd:boolean" default="true">
-            <xsd:annotation>
-               <xsd:documentation xml:lang="en">If true, the file will be deleted after it is processed. Note that
-                  in that case post-directory and post-suffix have no effect.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:attribute>
-         <xsd:attribute name="post-directory" use="optional" type="xsd:string" default="processed">
-            <xsd:annotation>
-               <xsd:documentation xml:lang="en">The file share to which the file will be moved after it is
-                  processed by the ESB
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:attribute>
-         <xsd:attribute name="post-suffix" use="optional" type="xsd:string" default=".esbDone">
-            <xsd:annotation>
-               <xsd:documentation xml:lang="en">The file suffix which will be added to the file name after it is
-                  processed.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:attribute>
-         <xsd:attribute name="error-delete" use="optional" type="xsd:boolean" default="true">
-            <xsd:annotation>
-               <xsd:documentation xml:lang="en">If true, the file will be deleted if an error occurs during
-                  processing. Note that in that case error-directory and error-suffix have no effect.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:attribute>
-         <xsd:attribute name="error-directory" use="optional" type="xsd:string" default="processed">
-            <xsd:annotation>
-               <xsd:documentation xml:lang="en">The file share to which the file will be moved after when an error
-                  occurs during processing.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:attribute>
-         <xsd:attribute name="error-suffix" use="optional" type="xsd:string" default=".esbERROR">
-            <xsd:annotation>
-               <xsd:documentation xml:lang="en">The file suffix which will be added to the file name after an error
-                  occurs during processing.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:attribute>
-      </xsd:complexType>
-   </xsd:element>
-   <xsd:element name="fs-bus" substitutionGroup="jesb:bus">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A Fs-Bus is a specific instance of a bus using the File protocol.
-         </xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:complexContent>
-            <xsd:extension base="jesb:bus">
-               <xsd:sequence>
-                  <xsd:element ref="jesb:fs-message-filter" maxOccurs="1" minOccurs="0"/>
-               </xsd:sequence>
-            </xsd:extension>
-         </xsd:complexContent>
-      </xsd:complexType>
-   </xsd:element>
-   <xsd:element name="fs-provider" substitutionGroup="jesb:provider">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A specific instance of a provider, providing a file system (local fileshare
-            or NAS).
-         </xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:complexContent>
-            <xsd:extension base="jesb:provider"/>
-         </xsd:complexContent>
-      </xsd:complexType>
-   </xsd:element>
-   <xsd:element name="fs-listener" substitutionGroup="jesb:listener">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A specific listener using the file protocol.</xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:complexContent>
-            <xsd:extension base="jesb:listener">
-               <xsd:sequence>
-                  <xsd:element ref="jesb:fs-message-filter" maxOccurs="1" minOccurs="0"/>
-               </xsd:sequence>
-               <xsd:attribute name="poll-frequency-seconds" use="optional" default="10">
-                  <xsd:annotation>
-                     <xsd:documentation xml:lang="en">The frequency with which this listener polls fs in seconds.
-                        Defaults to 10 seconds.
-                     </xsd:documentation>
-                  </xsd:annotation>
-                  <xsd:simpleType>
-                     <xsd:restriction base="xsd:integer">
-                        <xsd:minExclusive value="0"/>
-                     </xsd:restriction>
-                  </xsd:simpleType>
-               </xsd:attribute>
-            </xsd:extension>
-         </xsd:complexContent>
-      </xsd:complexType>
-   </xsd:element>
+        </xsd:attribute>
+    </xsd:complexType>
+    <xsd:element name="listener" type="jesb:listener"/>
+    <!-- JCA Types -->
+    <xsd:element name="activation-config">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">Activation configuration for jca bus or listener.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element ref="jesb:property" maxOccurs="unbounded" minOccurs="1"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="jca-gateway" substitutionGroup="jesb:listener">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A specific gateway using JCA inflow.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="jesb:listener">
+                    <xsd:sequence>
+                        <xsd:element ref="jesb:activation-config" minOccurs="0" maxOccurs="1"/>
+                    </xsd:sequence>
+                    <xsd:attribute name="adapter" use="required" type="xsd:string"/>
+                    <xsd:attribute name="endpointClass" use="required" type="xsd:string"/>
+                    <xsd:attribute name="messagingType" use="optional" type="xsd:string"/>
+                    <xsd:attribute name="jcaBridge" use="optional" type="xsd:string"/>
+                    <xsd:attribute name="transacted" use="optional" type="xsd:string"/>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
 
+    <!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
+       JMS Type Implementations.
+    88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->
+
+    <xsd:element name="jms-message-filter">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A JMS filter can add information to a Queue, or Topic. For example you
+                can defined a message-selector. However, you can also push the queue name and type into this
+                filter given you did not already specify them in the jms-bus.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:attribute name="dest-name" use="required" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">Name of the Queue of Topic.</xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="dest-type" use="required">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">A Queue delivers a message once, a topic broadcasts a message to
+                        all registered listeners.
+                    </xsd:documentation>
+                </xsd:annotation>
+                <xsd:simpleType>
+                    <xsd:restriction base="xsd:NMTOKEN">
+                        <xsd:enumeration value="QUEUE"/>
+                        <xsd:enumeration value="TOPIC"/>
+                    </xsd:restriction>
+                </xsd:simpleType>
+            </xsd:attribute>
+            <xsd:attribute name="selector" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">A message-selector allows multiple listeners to register with the
+                        same queue/topic, but
+                        they will filter on this message-selector.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="jms-bus" substitutionGroup="jesb:bus">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A JMS-Bus is a specific instance of a bus using the JMS protocol.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="jesb:bus">
+                    <xsd:sequence>
+                        <xsd:element ref="jesb:jms-message-filter" maxOccurs="1" minOccurs="0"/>
+                    </xsd:sequence>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="jms-provider" substitutionGroup="jesb:provider">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A specific instance of a provider, providing JMS.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="jesb:provider">
+                    <xsd:attribute name="connection-factory" use="required" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation xml:lang="en">The connection-factory used to lookup queues/topics in a
+                                naming directory (JNDI)
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="jndi-context-factory" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation xml:lang="en">The context factory class the JBossESB will use to do
+                                naming lookups.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="jndi-pkg-prefix" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation xml:lang="en">The pkg-prefix which will be used to do naming lookups. It
+                                is left empty by default.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="jndi-URL" type="xsd:anyURI">
+                        <xsd:annotation>
+                            <xsd:documentation xml:lang="en">The URL used to do naming lookups.</xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="jms-listener" substitutionGroup="jesb:listener">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A specific listener using the jms protocol.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="jesb:listener">
+                    <xsd:sequence>
+                        <xsd:element ref="jesb:jms-message-filter" maxOccurs="1" minOccurs="0"/>
+                    </xsd:sequence>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+
+    <!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
+       FS Type Implementations.
+    88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->
+    <xsd:element name="fs-message-filter">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A FS filter.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:attribute name="directory" use="required" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">The file share that is monitored for incoming new files.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="input-suffix" use="required" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">The file suffix used to filter files targeted for comsumption by
+                        the ESB (note: add the dot, so something like '.esbIn').
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="work-suffix" use="optional" type="xsd:string" default=".esbInProcess">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">The file suffix used while the file is being process, so that
+                        another thread or process won't pick it up too.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="post-delete" use="optional" type="xsd:boolean" default="true">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">If true, the file will be deleted after it is processed. Note that
+                        in that case post-directory and post-suffix have no effect.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="post-directory" use="optional" type="xsd:string" default="processed">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">The file share to which the file will be moved after it is
+                        processed by the ESB
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="post-suffix" use="optional" type="xsd:string" default=".esbDone">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">The file suffix which will be added to the file name after it is
+                        processed.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="error-delete" use="optional" type="xsd:boolean" default="true">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">If true, the file will be deleted if an error occurs during
+                        processing. Note that in that case error-directory and error-suffix have no effect.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="error-directory" use="optional" type="xsd:string" default="processed">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">The file share to which the file will be moved after when an error
+                        occurs during processing.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="error-suffix" use="optional" type="xsd:string" default=".esbERROR">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">The file suffix which will be added to the file name after an error
+                        occurs during processing.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="fs-bus" substitutionGroup="jesb:bus">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A Fs-Bus is a specific instance of a bus using the File protocol.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="jesb:bus">
+                    <xsd:sequence>
+                        <xsd:element ref="jesb:fs-message-filter" maxOccurs="1" minOccurs="0"/>
+                    </xsd:sequence>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="fs-provider" substitutionGroup="jesb:provider">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A specific instance of a provider, providing a file system (local fileshare
+                or NAS).
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="jesb:provider"/>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="fs-listener" substitutionGroup="jesb:listener">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A specific listener using the file protocol.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="jesb:listener">
+                    <xsd:sequence>
+                        <xsd:element ref="jesb:fs-message-filter" maxOccurs="1" minOccurs="0"/>
+                    </xsd:sequence>
+                    <xsd:attribute name="poll-frequency-seconds" use="optional" default="10">
+                        <xsd:annotation>
+                            <xsd:documentation xml:lang="en">The frequency with which this listener polls fs in seconds.
+                                Defaults to 10 seconds.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                        <xsd:simpleType>
+                            <xsd:restriction base="xsd:integer">
+                                <xsd:minExclusive value="0"/>
+                            </xsd:restriction>
+                        </xsd:simpleType>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
    <!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
       FTP Type Implementations.
    88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->
@@ -611,275 +609,275 @@
 	        </xsd:attribute>
       </xsd:complexType>
    </xsd:element>
-   <xsd:element name="ftp-bus" substitutionGroup="jesb:bus">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A FTP-Bus is a specific instance of a bus using the FTP protocol.
-         </xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:complexContent>
-            <xsd:extension base="jesb:bus">
-               <xsd:sequence>
-                  <xsd:element ref="jesb:ftp-message-filter" maxOccurs="1" minOccurs="0"/>
-               </xsd:sequence>
-            </xsd:extension>
-         </xsd:complexContent>
-      </xsd:complexType>
-   </xsd:element>
-   <xsd:element name="ftp-provider" substitutionGroup="jesb:provider">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A specific instance of a provider, providing a ftp service.
-         </xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:complexContent>
-            <xsd:extension base="jesb:provider">
-               <xsd:attribute name="hostname" use="required" type="xsd:string">
-                  <xsd:annotation>
-                     <xsd:documentation xml:lang="en">The ftp hostname, as it can be resolved by DNS.
-                     </xsd:documentation>
-                  </xsd:annotation>
-               </xsd:attribute>
-            </xsd:extension>
-         </xsd:complexContent>
-      </xsd:complexType>
-   </xsd:element>
-   <xsd:element name="ftp-listener" substitutionGroup="jesb:listener">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A specific listener using the ftp protocol.</xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:complexContent>
-            <xsd:extension base="jesb:listener">
-               <xsd:sequence>
-                  <xsd:element ref="jesb:ftp-message-filter" maxOccurs="1" minOccurs="0"/>
-               </xsd:sequence>
-               <xsd:attribute name="poll-frequency-seconds" use="optional" default="10">
-                  <xsd:annotation>
-                     <xsd:documentation xml:lang="en">The frequency with which this listener polls ftp server in
-                        seconds. Defaults to 10 seconds.
-                     </xsd:documentation>
-                  </xsd:annotation>
-                  <xsd:simpleType>
-                     <xsd:restriction base="xsd:integer">
-                        <xsd:minExclusive value="0"/>
-                     </xsd:restriction>
-                  </xsd:simpleType>
-               </xsd:attribute>
-            </xsd:extension>
-         </xsd:complexContent>
-      </xsd:complexType>
-   </xsd:element>
+    <xsd:element name="ftp-bus" substitutionGroup="jesb:bus">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A FTP-Bus is a specific instance of a bus using the FTP protocol.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="jesb:bus">
+                    <xsd:sequence>
+                        <xsd:element ref="jesb:ftp-message-filter" maxOccurs="1" minOccurs="0"/>
+                    </xsd:sequence>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="ftp-provider" substitutionGroup="jesb:provider">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A specific instance of a provider, providing a ftp service.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="jesb:provider">
+                    <xsd:attribute name="hostname" use="required" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation xml:lang="en">The ftp hostname, as it can be resolved by DNS.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="ftp-listener" substitutionGroup="jesb:listener">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A specific listener using the ftp protocol.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="jesb:listener">
+                    <xsd:sequence>
+                        <xsd:element ref="jesb:ftp-message-filter" maxOccurs="1" minOccurs="0"/>
+                    </xsd:sequence>
+                    <xsd:attribute name="poll-frequency-seconds" use="optional" default="10">
+                        <xsd:annotation>
+                            <xsd:documentation xml:lang="en">The frequency with which this listener polls ftp server in
+                                seconds. Defaults to 10 seconds.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                        <xsd:simpleType>
+                            <xsd:restriction base="xsd:integer">
+                                <xsd:minExclusive value="0"/>
+                            </xsd:restriction>
+                        </xsd:simpleType>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
 
-   <!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
-      SQL Type Implementations.
-   88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->
-   <xsd:element name="sql-message-filter">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A SQL filter.</xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:attribute name="tablename" use="required" type="xsd:string">
-            <xsd:annotation>
-               <xsd:documentation xml:lang="en">The table in which esb message are stored.</xsd:documentation>
-            </xsd:annotation>
-         </xsd:attribute>
-         <xsd:attribute name="message-id-column" use="optional" type="xsd:string" default="message_id">
-            <xsd:annotation>
-               <xsd:documentation xml:lang="en">A unique key (PK) in the table.</xsd:documentation>
-            </xsd:annotation>
-         </xsd:attribute>
-         <xsd:attribute name="message-column" use="optional" type="xsd:string" default="message">
-            <xsd:annotation>
-               <xsd:documentation xml:lang="en">The field that holds the serialized message.</xsd:documentation>
-            </xsd:annotation>
-         </xsd:attribute>
-         <xsd:attribute name="status-column" use="optional" type="xsd:string" default="status">
-            <xsd:annotation>
-               <xsd:documentation xml:lang="en">This column contents ('P', 'W', 'E' or 'D') indicates if the row is
-                  pending (P), in process (W), in error(E) or done (D) if postDelete and/or errorDelete are 'true'
-                  rows might be deleted
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:attribute>
-         <xsd:attribute name="insert-timestamp-column" use="optional" type="xsd:string" default="insert_timestamp">
-            <xsd:annotation>
-               <xsd:documentation xml:lang="en">Holds the timestamp when the record was inserted.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:attribute>
-         <xsd:attribute name="post-delete" use="optional" type="xsd:boolean" default="true">
-            <xsd:annotation>
-               <xsd:documentation xml:lang="en">If true, records will be deleted after processing.((e.g. no rows
-                  with a 'D' for done, in column defined in 'status_column')
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:attribute>
-         <xsd:attribute name="error-delete" use="optional" type="xsd:boolean" default="true">
-            <xsd:annotation>
-               <xsd:documentation xml:lang="en">If true, records in error will be deleted after attempted picked up
-                  for processing.(e.g. no rows with a 'E' for error, in column defined in 'status_column')
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:attribute>
-      </xsd:complexType>
-   </xsd:element>
-   <xsd:element name="sql-bus" substitutionGroup="jesb:bus">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A SQL-Bus is a specific instance of a bus using the SQL protocol.
-         </xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:complexContent>
-            <xsd:extension base="jesb:bus">
-               <xsd:sequence>
-                  <xsd:element ref="jesb:sql-message-filter" maxOccurs="1" minOccurs="0"/>
-               </xsd:sequence>
-            </xsd:extension>
-         </xsd:complexContent>
-      </xsd:complexType>
-   </xsd:element>
-   <xsd:element name="sql-provider" substitutionGroup="jesb:provider">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A specific instance of a provider, providing a db service.
-         </xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:complexContent>
-            <xsd:extension base="jesb:provider">
-               <xsd:attribute name="url" use="required" type="xsd:string">
-                  <xsd:annotation>
-                     <xsd:documentation xml:lang="en">The url needed to connect to the db.</xsd:documentation>
-                  </xsd:annotation>
-               </xsd:attribute>
-               <xsd:attribute name="driver" use="required" type="xsd:string">
-                  <xsd:annotation>
-                     <xsd:documentation xml:lang="en">The driver needed to connect to the db.</xsd:documentation>
-                  </xsd:annotation>
-               </xsd:attribute>
-               <xsd:attribute name="username" use="required" type="xsd:string">
-                  <xsd:annotation>
-                     <xsd:documentation xml:lang="en">The username used to access the database.
-                     </xsd:documentation>
-                  </xsd:annotation>
-               </xsd:attribute>
-               <xsd:attribute name="password" use="optional" type="xsd:string">
-                  <xsd:annotation>
-                     <xsd:documentation xml:lang="en">The password used to access the database.
-                     </xsd:documentation>
-                  </xsd:annotation>
-               </xsd:attribute>
-            </xsd:extension>
-         </xsd:complexContent>
-      </xsd:complexType>
-   </xsd:element>
-   <xsd:element name="sql-listener" substitutionGroup="jesb:listener">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">A specific listener using the ftp protocol.</xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:complexContent>
-            <xsd:extension base="jesb:listener">
-               <xsd:sequence>
-                  <xsd:element ref="jesb:sql-message-filter" maxOccurs="1" minOccurs="0"/>
-               </xsd:sequence>
-               <xsd:attribute name="poll-frequency-seconds" use="optional" default="10">
-                  <xsd:annotation>
-                     <xsd:documentation xml:lang="en">The frequency with which this listener polls the db in
-                        seconds. Defaults to 10 seconds.
-                     </xsd:documentation>
-                  </xsd:annotation>
-                  <xsd:simpleType>
-                     <xsd:restriction base="xsd:integer">
-                        <xsd:minExclusive value="0"/>
-                     </xsd:restriction>
-                  </xsd:simpleType>
-               </xsd:attribute>
-            </xsd:extension>
-         </xsd:complexContent>
-      </xsd:complexType>
-   </xsd:element>
+    <!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
+       SQL Type Implementations.
+    88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->
+    <xsd:element name="sql-message-filter">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A SQL filter.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:attribute name="tablename" use="required" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">The table in which esb message are stored.</xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="message-id-column" use="optional" type="xsd:string" default="message_id">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">A unique key (PK) in the table.</xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="message-column" use="optional" type="xsd:string" default="message">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">The field that holds the serialized message.</xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="status-column" use="optional" type="xsd:string" default="status">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">This column contents ('P', 'W', 'E' or 'D') indicates if the row is
+                        pending (P), in process (W), in error(E) or done (D) if postDelete and/or errorDelete are 'true'
+                        rows might be deleted
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="insert-timestamp-column" use="optional" type="xsd:string" default="insert_timestamp">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">Holds the timestamp when the record was inserted.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="post-delete" use="optional" type="xsd:boolean" default="true">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">If true, records will be deleted after processing.((e.g. no rows
+                        with a 'D' for done, in column defined in 'status_column')
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="error-delete" use="optional" type="xsd:boolean" default="true">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">If true, records in error will be deleted after attempted picked up
+                        for processing.(e.g. no rows with a 'E' for error, in column defined in 'status_column')
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="sql-bus" substitutionGroup="jesb:bus">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A SQL-Bus is a specific instance of a bus using the SQL protocol.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="jesb:bus">
+                    <xsd:sequence>
+                        <xsd:element ref="jesb:sql-message-filter" maxOccurs="1" minOccurs="0"/>
+                    </xsd:sequence>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="sql-provider" substitutionGroup="jesb:provider">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A specific instance of a provider, providing a db service.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="jesb:provider">
+                    <xsd:attribute name="url" use="required" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation xml:lang="en">The url needed to connect to the db.</xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="driver" use="required" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation xml:lang="en">The driver needed to connect to the db.</xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="username" use="required" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation xml:lang="en">The username used to access the database.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="password" use="optional" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation xml:lang="en">The password used to access the database.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="sql-listener" substitutionGroup="jesb:listener">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">A specific listener using the ftp protocol.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="jesb:listener">
+                    <xsd:sequence>
+                        <xsd:element ref="jesb:sql-message-filter" maxOccurs="1" minOccurs="0"/>
+                    </xsd:sequence>
+                    <xsd:attribute name="poll-frequency-seconds" use="optional" default="10">
+                        <xsd:annotation>
+                            <xsd:documentation xml:lang="en">The frequency with which this listener polls the db in
+                                seconds. Defaults to 10 seconds.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                        <xsd:simpleType>
+                            <xsd:restriction base="xsd:integer">
+                                <xsd:minExclusive value="0"/>
+                            </xsd:restriction>
+                        </xsd:simpleType>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
 
-   <!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
-   JBoss Remoting Type Implementations.
-   88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->
-   <xsd:element name="jbr-bus" substitutionGroup="jesb:bus">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">JBoss Remoting Bus</xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:complexContent>
-            <xsd:extension base="jesb:bus">
-               <xsd:attribute name="port" use="required" type="xsd:int">
-                  <xsd:annotation>
-                     <xsd:documentation xml:lang="en">JBoss Remoting Server listen port.</xsd:documentation>
-                  </xsd:annotation>
-               </xsd:attribute>
-            </xsd:extension>
-         </xsd:complexContent>
-      </xsd:complexType>
-   </xsd:element>
-   <xsd:element name="jbr-provider" substitutionGroup="jesb:provider">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">JBoss Remoting Provider.</xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:complexContent>
-            <xsd:extension base="jesb:provider">
-               <xsd:attribute name="protocol" use="required">
-                  <xsd:annotation>
-                     <xsd:documentation xml:lang="en">Jboss Remoting Listener/Server protocol.
-                     </xsd:documentation>
-                  </xsd:annotation>
-                  <xsd:simpleType>
-                     <xsd:restriction base="xsd:NMTOKEN">
-                        <xsd:enumeration value="http"/>
-                        <xsd:enumeration value="socket"/>
-                     </xsd:restriction>
-                  </xsd:simpleType>
-               </xsd:attribute>
-               <xsd:attribute name="host" type="xsd:string">
-                  <xsd:annotation>
-                     <xsd:documentation xml:lang="en">JBoss Remoting Server bind address. When not specified,
-                        defaults to InetAddress.getLocalHost().getHostName().
-                     </xsd:documentation>
-                  </xsd:annotation>
-               </xsd:attribute>
-            </xsd:extension>
-         </xsd:complexContent>
-      </xsd:complexType>
-   </xsd:element>
-   <xsd:element name="jbr-listener" substitutionGroup="jesb:listener">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">JBoss Remoting Listener.</xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:complexContent>
-            <xsd:extension base="jesb:listener"/>
-         </xsd:complexContent>
-      </xsd:complexType>
-   </xsd:element>
+    <!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
+    JBoss Remoting Type Implementations.
+    88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->
+    <xsd:element name="jbr-bus" substitutionGroup="jesb:bus">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">JBoss Remoting Bus</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="jesb:bus">
+                    <xsd:attribute name="port" use="required" type="xsd:int">
+                        <xsd:annotation>
+                            <xsd:documentation xml:lang="en">JBoss Remoting Server listen port.</xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="jbr-provider" substitutionGroup="jesb:provider">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">JBoss Remoting Provider.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="jesb:provider">
+                    <xsd:attribute name="protocol" use="required">
+                        <xsd:annotation>
+                            <xsd:documentation xml:lang="en">Jboss Remoting Listener/Server protocol.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                        <xsd:simpleType>
+                            <xsd:restriction base="xsd:NMTOKEN">
+                                <xsd:enumeration value="http"/>
+                                <xsd:enumeration value="socket"/>
+                            </xsd:restriction>
+                        </xsd:simpleType>
+                    </xsd:attribute>
+                    <xsd:attribute name="host" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation xml:lang="en">JBoss Remoting Server bind address. When not specified,
+                                defaults to InetAddress.getLocalHost().getHostName().
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="jbr-listener" substitutionGroup="jesb:listener">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">JBoss Remoting Listener.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="jesb:listener"/>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
 
-   <!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
-   Groovy Gateway Type Implementations.
-   88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->
-   <xsd:element name="groovy-listener" substitutionGroup="jesb:listener">
-      <xsd:annotation>
-         <xsd:documentation xml:lang="en">Groovy Listener.</xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-         <xsd:complexContent>
-            <xsd:extension base="jesb:listener">
-               <xsd:attribute name="script" use="required" type="xsd:string">
-                  <xsd:annotation>
-                     <xsd:documentation xml:lang="en">The path (classpath) to the Groovy Gateway script. Or, the
-                        alias for the pre-packaged Groovy Gateway script.
-                     </xsd:documentation>
-                  </xsd:annotation>
-               </xsd:attribute>
-            </xsd:extension>
-         </xsd:complexContent>
-      </xsd:complexType>
-   </xsd:element>
+    <!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
+    Groovy Gateway Type Implementations.
+    88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->
+    <xsd:element name="groovy-listener" substitutionGroup="jesb:listener">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">Groovy Listener.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="jesb:listener">
+                    <xsd:attribute name="script" use="required" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation xml:lang="en">The path (classpath) to the Groovy Gateway script. Or, the
+                                alias for the pre-packaged Groovy Gateway script.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
 
 </xsd:schema>

Modified: labs/jbossesb/workspace/dbevenius/product/install/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/install/build.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/install/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -9,19 +9,54 @@
 	
         <property name="deploy.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
 
-	<target name="deploy"   depends="sar.deploy, internal.deploy"   description="Wrapper for jboss.sar.deploy"/>
+        <property name="product.dir" location=".."/>
+
+        <!-- Are we embedded in a source hierarchy? -->
+        <condition property="hierarchy.source">
+          <available file="${product.dir}/build-distr.xml"/>
+        </condition>
+        <!-- Are we embedded in a jbossesb distribution hierarchy? -->
+        <condition property="hierarchy.jbossesb">
+          <available file="${product.dir}/JBossORG-EULA.txt"/>
+        </condition>
+
+        <condition property="hierarchy.recognised">
+          <or>
+            <isset property="hierarchy.source"/>
+            <isset property="hierarchy.jbossesb"/>
+          </or>
+        </condition>
+
+        <fail unless="hierarchy.recognised" message="Cannot determine build hierarchy"/>
+
+        <target name="dependencies.jbossesb" if="hierarchy.jbossesb">
+            <property name="org.jboss.esb.dist.lib" location="${product.dir}/lib"/>
+        </target>
+
+        <target name="dependencies.source" if="hierarchy.source">
+            <available file="${product.dir}/build/jbossesb" property="dist.exists"/>
+            <fail unless="dist.exists"
+                  message="JBossESB must be built. Please run 'ant dist' in ${product.dir}"/>
+
+            <property name="org.jboss.esb.dist.lib" location="${product.dir}/build/jbossesb/lib"/>
+            
+        </target>
+
+        <target name="dependencies" depends="dependencies.source, dependencies.jbossesb"/>
+
+	<target name="deploy"   depends="internal.deploy"   description="Wrapper for internal.deploy"/>
+
 	<target name="tomcat"   depends="tomcat.compile, tomcat.war.all.deploy"  description="Wrapper for tomcat.war.all.deploy"/>
 	
-	<target name="sar.deploy" description="Deploys JBossESB to the server">
-      <copy  todir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy">
-         <fileset dir="${org.jboss.esb.dist.lib}" includes="jbossesb.sar/**"/></copy>
-	</target>
-	
         <target name="jms.config.check">
           <available property="jbm.present"
             file="${deploy.dir}/jboss-messaging"/>
+          <available property="jbm.scoped.present"
+            file="${deploy.dir}/jboss-messaging/META-INF/jboss-service.xml"/>
           <available property="jbm.present"
             file="${deploy.dir}/jboss-messaging.sar"/>
+          <available property="jbm.scoped.present"
+            file="${deploy.dir}/jboss-messaging.sar/META-INF/jboss-service.xml"/>
           <available property="jbmq.present"
             file="${deploy.dir}/jms/jbossmq-service.xml"/>
           <fail message="Could not determine JMS provider">
@@ -37,30 +72,48 @@
         </target>
 
         <target name="jbmq.config" if="jbmq.present">
-          <property name="messaging.config" location="DMQ/jbmq-queue-service.xml"/>
-          <property name="messaging.deployment" location="DMQ/jbmq-deployment.xml"/>
+          <property name="messaging.excludes" value="jbm-queue-service.xml"/>
         </target>
 
         <target name="jbm.config" if="jbm.present">
-          <property name="messaging.config" location="DMQ/jbm-queue-service.xml"/>
-          <property name="messaging.deployment" location="DMQ/jbm-deployment.xml"/>
+          <property name="messaging.excludes" value="jbmq-queue-service.xml"/>
         </target>
 
-        <target name="jms.config" depends="jms.config.check, jbmq.config, jbm.config"/>
+        <target name="jbm.scoped.config" if="jbm.scoped.present">
+          <fail message="Scoped JBoss Messaging not yet supported"/>
+        </target>
 
-        <target name="internal.deploy" depends="jms.config" description="Deploys Internal Services to the server">
+        <target name="jms.config" depends="jms.config.check, jbmq.config, jbm.config, jbm.scoped.config"/>
 
-          <property name="internal.services.deploy.dir" value="${deploy.dir}/jbossesb.esb"/>
-          <property name="internal.services.metainf.dir" value="${internal.services.deploy.dir}/META-INF"/>
-          <mkdir dir="${internal.services.metainf.dir}"/>
-			<echo message="dist.lib dir : ${org.jboss.esb.dist.lib}"/>
-          <copy todir="${internal.services.metainf.dir}"
-            file="${org.jboss.esb.dist.lib}/jbossesb/lib/jbossesb.esb/META-INF/jboss-esb.xml"/>
-          <copy todir="${internal.services.deploy.dir}"
-            file="${messaging.config}"/>
-          <copy tofile="${internal.services.metainf.dir}/deployment.xml"
-            file="${messaging.deployment}"/>
+        <target name="internal.deploy" depends="dependencies, jms.config" description="Deploys Internal Services to the server">
+          <!-- jbossesb.sar -->
+          <copy todir="${deploy.dir}/jbossesb.sar">
+            <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.sar"/>
+          </copy>
 
+          <!-- jbossesb.esb -->
+          <copy todir="${deploy.dir}/jbossesb.esb">
+            <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.esb"
+              excludes="${messaging.excludes}"/>
+          </copy>
+
+          <!-- jbpm.esb -->
+          <copy todir="${deploy.dir}/jbpm.esb">
+            <fileset dir="${org.jboss.esb.dist.lib}/jbpm.esb"
+              excludes="${messaging.excludes}"/>
+          </copy>
+
+          <!-- jbrules.esb -->
+          <copy todir="${deploy.dir}/jbrules.esb">
+            <fileset dir="${org.jboss.esb.dist.lib}/jbrules.esb"
+              excludes="${messaging.excludes}"/>
+          </copy>
+
+          <!-- smooks.esb -->
+          <copy todir="${deploy.dir}/smooks.esb">
+            <fileset dir="${org.jboss.esb.dist.lib}/smooks.esb"
+              excludes="${messaging.excludes}"/>
+          </copy>
         </target>
 
         <property name="org.jboss.esb.tomcat.55lib"
@@ -121,24 +174,4 @@
 				excludes="jbossesb-dependencies.jar" />
 		</copy>
 	</target>
-	
-	<target name="check.is.bundle">
-		<condition property="is.not.bundle" >
-			<not>
-	    		<available file="${org.jboss.esb.dist.lib}/../jboss-4.0.5.GA.zip" />
-			</not>
-		</condition>
-	</target>
-	
-	<target name="install" depends="install.jboss" description="Installs JBossAS-4.0.GA with ejb3 and deploys JBossESB to it">
-		<antcall target="deploy" />
-	</target>
-
-	<target name="install.jboss" unless="is.not.bundle" depends="check.is.bundle">
-		<echo>This task creates a ready-to-go JBossESB install deployed in /JBoss-4.0.5.GA (on the root
-		of your file system) if you have downloaded the bundle.</echo>
-		<unzip src="${org.jboss.esb.dist.lib}/../jboss-4.0.5.GA.zip" dest="${org.jboss.esb.server.home}/../" />
-	</target>
-	
-	
 </project>

Modified: labs/jbossesb/workspace/dbevenius/product/install/conf/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/install/conf/jbossesb-properties.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/install/conf/jbossesb-properties.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -63,11 +63,11 @@
     <properties name="dbstore">
     	
     	<!--  connection manager type -->
-	    <property name="org.jboss.soa.esb.persistence.db.conn.manager" 		value="org.jboss.soa.esb.persistence.manager.StandaloneConnectionManager"/>	    
-	    <!--  property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.soa.esb.persistence.manager.J2eeConnectionManager"/ -->
+	    <!-- <property name="org.jboss.soa.esb.persistence.db.conn.manager" 		value="org.jboss.soa.esb.persistence.manager.StandaloneConnectionManager"/>	 -->    
+	     <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.soa.esb.persistence.manager.J2eeConnectionManager"/>
 	    
 	    <!-- this property is only used if using the j2ee connection manager -->
-	    <property name="org.jboss.soa.esb.persistence.db.datasource.name" 	value="java:/JBossesbDS"/>
+	    <property name="org.jboss.soa.esb.persistence.db.datasource.name" 	value="java:/JBossESBDS"/>
 		
 		<!-- standalone connection pooling settings -->
 		<property name="org.jboss.soa.esb.persistence.db.connection.url" 	value="jdbc:hsqldb:hsql://localhost:9001/jbossesb"/>

Deleted: labs/jbossesb/workspace/dbevenius/product/install/conf/smooks-cdr.lst
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/install/conf/smooks-cdr.lst	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/install/conf/smooks-cdr.lst	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,9 +0,0 @@
-########################################################################################################
-# ESB Administration Console.
-#
-# You must "import" smooks-res.xml into the console in order to view and manipulate the
-# transformations in this sample.  You will also need to register the "Message Exchange Participants"
-# "A" and "B" as well as their supported message contracts "text/xml:messageAtA" and 
-# "text/xml:messageAtB" respectively.
-########################################################################################################
-http://localhost:8080/jboss-esb-console/transform/smooks-config.jsp

Modified: labs/jbossesb/workspace/dbevenius/product/install/deployment.properties-example
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/install/deployment.properties-example	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/install/deployment.properties-example	2007-06-06 14:23:48 UTC (rev 12351)
@@ -4,13 +4,6 @@
 # Copy the example file and replace with your values
 #
 ######################################################################
-#
-# Note: You should not need to change this entry unless you altered
-#       the jbossesb distribution directory structure, however if you check out from SVN you will 
-#       have to run the 'ant dist' target, and it that
-#       case use: org.jboss.esb.dist.lib=../build
-#
-org.jboss.esb.dist.lib=../lib
 
 ######################################################################
 # You can use three deployment options: deploy to JBossAS, Tomcat or

Modified: labs/jbossesb/workspace/dbevenius/product/install/jboss-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/install/jboss-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/install/jboss-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -14,15 +14,6 @@
       </attribute>
       <depends>jboss.jca:service=DataSourceBinding,name=juddiDB</depends>
    </mbean>
-   <mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
-       name="jboss.esb:service=MessageStoreDatabaseInitializer">
-      <attribute name="Datasource">java:/JBossESBDS</attribute>
-      <attribute name="ExistsSql">select * from message</attribute>
-      <attribute name="SqlFiles">
-         message-store-sql/hsqldb/create_database.sql
-      </attribute>
-      <depends>jboss.jca:service=DataSourceBinding,name=JBossESBDS</depends>
-   </mbean>
    <mbean code="org.jboss.internal.soa.esb.dependencies.JuddiRMIService"
        name="jboss.esb:service=JuddiRMI"
        description="Juddi RMI Service">
@@ -32,6 +23,5 @@
   	     name="jboss.esb:service=ESBDeployer">
     <depends>jboss.esb:service=ESBRegistry</depends>
     <depends>jboss.esb:service=JuddiRMI</depends>
-    <depends>jboss.jca:service=DataSourceBinding,name=JBossESBDS</depends>
   </mbean>
 </server>
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21 (from rev 12348, labs/jbossesb/trunk/product/jbossws21)

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/README.TXT
===================================================================
--- labs/jbossesb/trunk/product/jbossws21/README.TXT	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/jbossws21/README.TXT	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,3 +0,0 @@
-The JBossWS 2.1.0 binaries are only present here until there's an
-official build available for download.  Once that's available, we
-can remove this folder and it's contents.
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/README.TXT (from rev 12348, labs/jbossesb/trunk/product/jbossws21/README.TXT)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/jbossws21/README.TXT	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/jbossws21/README.TXT	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,3 @@
+The JBossWS 2.1.0 binaries are only present here until there's an
+official build available for download.  Once that's available, we
+can remove this folder and it's contents.
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/build.xml
===================================================================
--- labs/jbossesb/trunk/product/jbossws21/build.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/jbossws21/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,67 +0,0 @@
-<project name="JBossWS v2.1.0 (DEV) Deploy" default="deploy" basedir=".">
-
-    <target name="deploy" description="Deploy JBossWS v2.1.0 (DEV) to JBoss AS v4.2">
-
-        <echo />
-        <input message="Please enter the location of your JBoss Application Server:" addproperty="jboss42.home" />
-        <echo />
-
-        <available file="${jboss42.home}/server/default" type="dir" property="jboss42.home.available" />
-        <fail message="Directory '${jboss42.home}' does not appear to be a valid JBoss App Server v4.2 GA installation." unless="jboss42.home.available" />
-
-        <echo />
-        <input message="Stop target JBoss App Server and press 'enter' to continue..."/>
-        <echo />
-
-        <copy todir="${jboss42.home}/client" overwrite="true">
-            <fileset dir="spi">
-                <include name="jbossws-spi.jar"/>
-            </fileset>
-            <fileset dir="jbossas42">
-                <include name="jbossws-jboss42.jar"/>
-            </fileset>
-            <fileset dir="jbossws-core">
-                <include name="jboss-jaxrpc.jar"/>
-                <include name="jboss-jaxws.jar"/>
-                <include name="jboss-saaj.jar"/>
-                <include name="jbossws-client.jar"/>
-                <include name="jbossws-integration-tools.jar"/>
-            </fileset>
-            <fileset dir="thirdparty">
-                <include name="jaxb-api.jar"/>
-                <include name="jaxb-impl.jar"/>
-                <include name="jaxb-xjc.jar"/>
-                <include name="wsdl4j.jar"/>
-                <include name="jaxws-tools.jar"/>
-                <include name="jaxws-rt.jar"/>
-            </fileset>
-        </copy>
-        <copy todir="${jboss42.home}/server/default/lib" overwrite="true">
-            <fileset dir="spi">
-                <include name="jbossws-spi.jar"/>
-            </fileset>
-            <fileset dir="jbossas42">
-                <include name="jbossws-jboss42.jar"/>
-            </fileset>
-            <fileset dir="jbossws-core">
-                <include name="jboss-jaxrpc.jar"/>
-                <include name="jboss-jaxws.jar"/>
-                <include name="jboss-saaj.jar"/>
-            </fileset>
-        </copy>
-
-        <copy todir="${jboss42.home}/bin" overwrite="true">
-            <fileset dir="scripts">
-                <include name="*.bat"/>
-                <include name="*.sh"/>
-            </fileset>
-        </copy>
-
-        <mkdir dir="${jboss42.home}/server/default/deploy/jbossws.sar"/>
-        <unjar dest="${jboss42.home}/server/default/deploy/jbossws.sar" src="native/jbossws-native42.sar"/>
-        <!-- Deploy juddi-service.sar -->
-        <mkdir dir="${jboss42.home}/server/default/deploy/juddi-service.sar"/>
-        <unzip dest="${jboss42.home}/server/default/deploy/juddi-service.sar" src="thirdparty/juddi-service.sar"/>
-    </target>
-
-</project>

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/build.xml (from rev 12348, labs/jbossesb/trunk/product/jbossws21/build.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/jbossws21/build.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/jbossws21/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,67 @@
+<project name="JBossWS v2.1.0 (DEV) Deploy" default="deploy" basedir=".">
+
+    <target name="deploy" description="Deploy JBossWS v2.1.0 (DEV) to JBoss AS v4.2">
+
+        <echo />
+        <input message="Please enter the location of your JBoss Application Server:" addproperty="jboss42.home" />
+        <echo />
+
+        <available file="${jboss42.home}/server/default" type="dir" property="jboss42.home.available" />
+        <fail message="Directory '${jboss42.home}' does not appear to be a valid JBoss App Server v4.2 GA installation." unless="jboss42.home.available" />
+
+        <echo />
+        <input message="Stop target JBoss App Server and press 'enter' to continue..."/>
+        <echo />
+
+        <copy todir="${jboss42.home}/client" overwrite="true">
+            <fileset dir="spi">
+                <include name="jbossws-spi.jar"/>
+            </fileset>
+            <fileset dir="jbossas42">
+                <include name="jbossws-jboss42.jar"/>
+            </fileset>
+            <fileset dir="jbossws-core">
+                <include name="jboss-jaxrpc.jar"/>
+                <include name="jboss-jaxws.jar"/>
+                <include name="jboss-saaj.jar"/>
+                <include name="jbossws-client.jar"/>
+                <include name="jbossws-integration-tools.jar"/>
+            </fileset>
+            <fileset dir="thirdparty">
+                <include name="jaxb-api.jar"/>
+                <include name="jaxb-impl.jar"/>
+                <include name="jaxb-xjc.jar"/>
+                <include name="wsdl4j.jar"/>
+                <include name="jaxws-tools.jar"/>
+                <include name="jaxws-rt.jar"/>
+            </fileset>
+        </copy>
+        <copy todir="${jboss42.home}/server/default/lib" overwrite="true">
+            <fileset dir="spi">
+                <include name="jbossws-spi.jar"/>
+            </fileset>
+            <fileset dir="jbossas42">
+                <include name="jbossws-jboss42.jar"/>
+            </fileset>
+            <fileset dir="jbossws-core">
+                <include name="jboss-jaxrpc.jar"/>
+                <include name="jboss-jaxws.jar"/>
+                <include name="jboss-saaj.jar"/>
+            </fileset>
+        </copy>
+
+        <copy todir="${jboss42.home}/bin" overwrite="true">
+            <fileset dir="scripts">
+                <include name="*.bat"/>
+                <include name="*.sh"/>
+            </fileset>
+        </copy>
+
+        <mkdir dir="${jboss42.home}/server/default/deploy/jbossws.sar"/>
+        <unjar dest="${jboss42.home}/server/default/deploy/jbossws.sar" src="native/jbossws-native42.sar"/>
+        <!-- Deploy juddi-service.sar -->
+        <mkdir dir="${jboss42.home}/server/default/deploy/juddi-service.sar"/>
+        <unzip dest="${jboss42.home}/server/default/deploy/juddi-service.sar" src="thirdparty/juddi-service.sar"/>
+    </target>
+
+</project>

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossas42 (from rev 12348, labs/jbossesb/trunk/product/jbossws21/jbossas42)

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossas42/jbossws-jboss42.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossas42/jbossws-jboss42.jar (from rev 12348, labs/jbossesb/trunk/product/jbossws21/jbossas42/jbossws-jboss42.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossws-core (from rev 12348, labs/jbossesb/trunk/product/jbossws21/jbossws-core)

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossws-core/jboss-jaxrpc.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossws-core/jboss-jaxrpc.jar (from rev 12348, labs/jbossesb/trunk/product/jbossws21/jbossws-core/jboss-jaxrpc.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossws-core/jboss-jaxws.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossws-core/jboss-jaxws.jar (from rev 12348, labs/jbossesb/trunk/product/jbossws21/jbossws-core/jboss-jaxws.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossws-core/jboss-saaj.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossws-core/jboss-saaj.jar (from rev 12348, labs/jbossesb/trunk/product/jbossws21/jbossws-core/jboss-saaj.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossws-core/jbossws-client.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/jbossws-core/jbossws-client.jar (from rev 12348, labs/jbossesb/trunk/product/jbossws21/jbossws-core/jbossws-client.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/native (from rev 12348, labs/jbossesb/trunk/product/jbossws21/native)

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/native/jbossws-context.war
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/native/jbossws-context.war (from rev 12348, labs/jbossesb/trunk/product/jbossws21/native/jbossws-context.war)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/native/jbossws-native.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/native/jbossws-native.jar (from rev 12348, labs/jbossesb/trunk/product/jbossws21/native/jbossws-native.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/native/jbossws-native42.sar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/native/jbossws-native42.sar (from rev 12348, labs/jbossesb/trunk/product/jbossws21/native/jbossws-native42.sar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts (from rev 12348, labs/jbossesb/trunk/product/jbossws21/scripts)

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsconsume.bat
===================================================================
--- labs/jbossesb/trunk/product/jbossws21/scripts/wsconsume.bat	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsconsume.bat	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,55 +0,0 @@
- at echo off
-
-rem $Id: wsgen.bat 2158 2007-01-27 06:20:59Z jason.greene at jboss.com $
-
- at if not "%ECHO%" == ""  echo %ECHO%
- at if "%OS%" == "Windows_NT"  setlocal
-
-set DIRNAME=.\
-if "%OS%" == "Windows_NT" set DIRNAME=%~dp0%
-set PROGNAME=run.bat
-if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
-
-rem Read all command line arguments
-
-REM
-REM The %ARGS% env variable commented out in favor of using %* to include
-REM all args in java command line. See bug #840239. [jpl]
-REM
-REM set ARGS=
-REM :loop
-REM if [%1] == [] goto endloop
-REM         set ARGS=%ARGS% %1
-REM         shift
-REM         goto loop
-REM :endloop
-
-set JAVA=%JAVA_HOME%\bin\java
-set JBOSS_HOME=%DIRNAME%\..
-rem Setup the java endorsed dirs
-set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
-
-rem Setup the wstools classpath
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JAVA_HOME%/lib/tools.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/activation.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-xjc.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-rt.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-tools.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/mail.jar
-
-rem Execute the JVM
-"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSCONSUME_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSConsume %*

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsconsume.bat (from rev 12348, labs/jbossesb/trunk/product/jbossws21/scripts/wsconsume.bat)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsconsume.bat	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsconsume.bat	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,55 @@
+ at echo off
+
+rem $Id: wsgen.bat 2158 2007-01-27 06:20:59Z jason.greene at jboss.com $
+
+ at if not "%ECHO%" == ""  echo %ECHO%
+ at if "%OS%" == "Windows_NT"  setlocal
+
+set DIRNAME=.\
+if "%OS%" == "Windows_NT" set DIRNAME=%~dp0%
+set PROGNAME=run.bat
+if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
+
+rem Read all command line arguments
+
+REM
+REM The %ARGS% env variable commented out in favor of using %* to include
+REM all args in java command line. See bug #840239. [jpl]
+REM
+REM set ARGS=
+REM :loop
+REM if [%1] == [] goto endloop
+REM         set ARGS=%ARGS% %1
+REM         shift
+REM         goto loop
+REM :endloop
+
+set JAVA=%JAVA_HOME%\bin\java
+set JBOSS_HOME=%DIRNAME%\..
+rem Setup the java endorsed dirs
+set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
+
+rem Setup the wstools classpath
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JAVA_HOME%/lib/tools.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/activation.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-xjc.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-rt.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-tools.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/mail.jar
+
+rem Execute the JVM
+"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSCONSUME_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSConsume %*

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsconsume.sh
===================================================================
--- labs/jbossesb/trunk/product/jbossws21/scripts/wsconsume.sh	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsconsume.sh	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-# $Id: wsgen.sh 2158 2007-01-27 06:20:59Z jason.greene at jboss.com $
-
-DIRNAME=`dirname $0`
-PROGNAME=`basename $0`
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false;
-case "`uname`" in
-    CYGWIN*)
-        cygwin=true
-        ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-    [ -n "$JBOSS_HOME" ] &&
-        JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"`
-    [ -n "$JAVA_HOME" ] &&
-        JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Setup JBOSS_HOME
-if [ "x$JBOSS_HOME" = "x" ]; then
-    # get the full path (without any relative bits)
-    JBOSS_HOME=`cd $DIRNAME/..; pwd`
-fi
-export JBOSS_HOME
-
-# Setup the JVM
-if [ "x$JAVA" = "x" ]; then
-    if [ "x$JAVA_HOME" != "x" ]; then
-	JAVA="$JAVA_HOME/bin/java"
-    else
-	JAVA="java"
-    fi
-fi
-
-#JPDA options. Uncomment and modify as appropriate to enable remote debugging .
-#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS"
-
-# Setup JBoss sepecific properties
-JAVA_OPTS="$JAVA_OPTS"
-
-# Setup the java endorsed dirs
-JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
-
-# Setup the wstools classpath
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JAVA_HOME/lib/tools.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/wstx.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/activation.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/getopt.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/javassist.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/mail.jar"
-
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxws-rt.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxws-tools.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/stax-api.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-    JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-    WSCONSUME_CLASSPATH=`cygpath --path --windows "$WSCONSUME_CLASSPATH"`
-    JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
-fi
-
-# Execute the JVM
-"$JAVA" $JAVA_OPTS \
-   -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
-   -Dlog4j.configuration=wstools-log4j.xml \
-   -classpath "$WSCONSUME_CLASSPATH" \
-   org.jboss.wsf.spi.tools.cmd.WSConsume "$@"

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsconsume.sh (from rev 12348, labs/jbossesb/trunk/product/jbossws21/scripts/wsconsume.sh)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsconsume.sh	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsconsume.sh	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# $Id: wsgen.sh 2158 2007-01-27 06:20:59Z jason.greene at jboss.com $
+
+DIRNAME=`dirname $0`
+PROGNAME=`basename $0`
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false;
+case "`uname`" in
+    CYGWIN*)
+        cygwin=true
+        ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+    [ -n "$JBOSS_HOME" ] &&
+        JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"`
+    [ -n "$JAVA_HOME" ] &&
+        JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Setup JBOSS_HOME
+if [ "x$JBOSS_HOME" = "x" ]; then
+    # get the full path (without any relative bits)
+    JBOSS_HOME=`cd $DIRNAME/..; pwd`
+fi
+export JBOSS_HOME
+
+# Setup the JVM
+if [ "x$JAVA" = "x" ]; then
+    if [ "x$JAVA_HOME" != "x" ]; then
+	JAVA="$JAVA_HOME/bin/java"
+    else
+	JAVA="java"
+    fi
+fi
+
+#JPDA options. Uncomment and modify as appropriate to enable remote debugging .
+#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS"
+
+# Setup JBoss sepecific properties
+JAVA_OPTS="$JAVA_OPTS"
+
+# Setup the java endorsed dirs
+JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
+
+# Setup the wstools classpath
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JAVA_HOME/lib/tools.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/wstx.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/activation.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/getopt.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/javassist.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/mail.jar"
+
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxws-rt.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxws-tools.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/stax-api.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+    JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+    WSCONSUME_CLASSPATH=`cygpath --path --windows "$WSCONSUME_CLASSPATH"`
+    JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
+fi
+
+# Execute the JVM
+"$JAVA" $JAVA_OPTS \
+   -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
+   -Dlog4j.configuration=wstools-log4j.xml \
+   -classpath "$WSCONSUME_CLASSPATH" \
+   org.jboss.wsf.spi.tools.cmd.WSConsume "$@"

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsprovide.bat
===================================================================
--- labs/jbossesb/trunk/product/jbossws21/scripts/wsprovide.bat	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsprovide.bat	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,49 +0,0 @@
- at echo off
-
-rem $Id: wsprovide.bat 3101 2007-05-16 08:26:33Z heiko.braun at jboss.com $
-
- at if not "%ECHO%" == ""  echo %ECHO%
- at if "%OS%" == "Windows_NT"  setlocal
-
-set DIRNAME=.\
-if "%OS%" == "Windows_NT" set DIRNAME=%~dp0%
-set PROGNAME=run.bat
-if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
-
-rem Read all command line arguments
-
-REM
-REM The %ARGS% env variable commented out in favor of using %* to include
-REM all args in java command line. See bug #840239. [jpl]
-REM
-REM set ARGS=
-REM :loop
-REM if [%1] == [] goto endloop
-REM         set ARGS=%ARGS% %1
-REM         shift
-REM         goto loop
-REM :endloop
-
-set JAVA=%JAVA_HOME%\bin\java
-set JBOSS_HOME=%DIRNAME%\..
-rem Setup the java endorsed dirs
-set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
-
-rem Setup the wstools classpath
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/activation.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/mail.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar
-
-rem Execute the JVM
-"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSPROVIDE_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSProvide %*

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsprovide.bat (from rev 12348, labs/jbossesb/trunk/product/jbossws21/scripts/wsprovide.bat)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsprovide.bat	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsprovide.bat	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,49 @@
+ at echo off
+
+rem $Id: wsprovide.bat 3101 2007-05-16 08:26:33Z heiko.braun at jboss.com $
+
+ at if not "%ECHO%" == ""  echo %ECHO%
+ at if "%OS%" == "Windows_NT"  setlocal
+
+set DIRNAME=.\
+if "%OS%" == "Windows_NT" set DIRNAME=%~dp0%
+set PROGNAME=run.bat
+if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
+
+rem Read all command line arguments
+
+REM
+REM The %ARGS% env variable commented out in favor of using %* to include
+REM all args in java command line. See bug #840239. [jpl]
+REM
+REM set ARGS=
+REM :loop
+REM if [%1] == [] goto endloop
+REM         set ARGS=%ARGS% %1
+REM         shift
+REM         goto loop
+REM :endloop
+
+set JAVA=%JAVA_HOME%\bin\java
+set JBOSS_HOME=%DIRNAME%\..
+rem Setup the java endorsed dirs
+set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
+
+rem Setup the wstools classpath
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/activation.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/mail.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar
+
+rem Execute the JVM
+"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSPROVIDE_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSProvide %*

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsprovide.sh
===================================================================
--- labs/jbossesb/trunk/product/jbossws21/scripts/wsprovide.sh	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsprovide.sh	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,78 +0,0 @@
-#!/bin/sh
-
-# $Id: wsprovide.sh 3101 2007-05-16 08:26:33Z heiko.braun at jboss.com $
-
-DIRNAME=`dirname $0`
-PROGNAME=`basename $0`
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false;
-case "`uname`" in
-    CYGWIN*)
-        cygwin=true
-        ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-    [ -n "$JBOSS_HOME" ] &&
-        JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"`
-    [ -n "$JAVA_HOME" ] &&
-        JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Setup JBOSS_HOME
-if [ "x$JBOSS_HOME" = "x" ]; then
-    # get the full path (without any relative bits)
-    JBOSS_HOME=`cd $DIRNAME/..; pwd`
-fi
-export JBOSS_HOME
-
-# Setup the JVM
-if [ "x$JAVA" = "x" ]; then
-    if [ "x$JAVA_HOME" != "x" ]; then
-	JAVA="$JAVA_HOME/bin/java"
-    else
-	JAVA="java"
-    fi
-fi
-
-#JPDA options. Uncomment and modify as appropriate to enable remote debugging .
-#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS"
-
-# Setup JBoss sepecific properties
-JAVA_OPTS="$JAVA_OPTS"
-
-# Setup the java endorsed dirs
-JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
-
-# Setup the wstools classpath
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/activation.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/getopt.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/javassist.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/mail.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-    JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-    WSPROVIDE_CLASSPATH=`cygpath --path --windows "$WSPROVIDE_CLASSPATH"`
-    JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
-fi
-
-# Execute the JVM
-"$JAVA" $JAVA_OPTS \
-   -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
-   -Dlog4j.configuration=wstools-log4j.xml \
-   -classpath "$WSPROVIDE_CLASSPATH" \
-   org.jboss.wsf.spi.tools.cmd.WSProvide "$@"

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsprovide.sh (from rev 12348, labs/jbossesb/trunk/product/jbossws21/scripts/wsprovide.sh)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsprovide.sh	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsprovide.sh	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# $Id: wsprovide.sh 3101 2007-05-16 08:26:33Z heiko.braun at jboss.com $
+
+DIRNAME=`dirname $0`
+PROGNAME=`basename $0`
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false;
+case "`uname`" in
+    CYGWIN*)
+        cygwin=true
+        ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+    [ -n "$JBOSS_HOME" ] &&
+        JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"`
+    [ -n "$JAVA_HOME" ] &&
+        JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Setup JBOSS_HOME
+if [ "x$JBOSS_HOME" = "x" ]; then
+    # get the full path (without any relative bits)
+    JBOSS_HOME=`cd $DIRNAME/..; pwd`
+fi
+export JBOSS_HOME
+
+# Setup the JVM
+if [ "x$JAVA" = "x" ]; then
+    if [ "x$JAVA_HOME" != "x" ]; then
+	JAVA="$JAVA_HOME/bin/java"
+    else
+	JAVA="java"
+    fi
+fi
+
+#JPDA options. Uncomment and modify as appropriate to enable remote debugging .
+#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS"
+
+# Setup JBoss sepecific properties
+JAVA_OPTS="$JAVA_OPTS"
+
+# Setup the java endorsed dirs
+JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
+
+# Setup the wstools classpath
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/activation.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/getopt.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/javassist.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/mail.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+    JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+    WSPROVIDE_CLASSPATH=`cygpath --path --windows "$WSPROVIDE_CLASSPATH"`
+    JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
+fi
+
+# Execute the JVM
+"$JAVA" $JAVA_OPTS \
+   -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
+   -Dlog4j.configuration=wstools-log4j.xml \
+   -classpath "$WSPROVIDE_CLASSPATH" \
+   org.jboss.wsf.spi.tools.cmd.WSProvide "$@"

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wspublish.sh
===================================================================
--- labs/jbossesb/trunk/product/jbossws21/scripts/wspublish.sh	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wspublish.sh	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,74 +0,0 @@
-#!/bin/sh
-
-# $Id: wspublish.sh 3101 2007-05-16 08:26:33Z heiko.braun at jboss.com $
-
-DIRNAME=`dirname $0`
-PROGNAME=`basename $0`
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false;
-case "`uname`" in
-    CYGWIN*)
-        cygwin=true
-        ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-    [ -n "$TOMCAT_HOME" ] &&
-        TOMCAT_HOME=`cygpath --unix "$TOMCAT_HOME"`
-    [ -n "$JAVA_HOME" ] &&
-        JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-export TOMCAT_HOME
-
-# Setup the JVM
-if [ "x$JAVA" = "x" ]; then
-    if [ "x$JAVA_HOME" != "x" ]; then
-	JAVA="$JAVA_HOME/bin/java"
-    else
-	JAVA="java"
-    fi
-fi
-
-#JPDA options. Uncomment and modify as appropriate to enable remote debugging .
-#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS"
-
-# Setup JBoss sepecific properties
-JAVA_OPTS="$JAVA_OPTS"
-
-# Setup the WSPUBLISH classpath
-WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/jbossws-thirdparty.jar"
-WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/jbossws-core.jar"
-WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/log4j.jar"
-WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/servlet-api.jar"
-
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-    TOMCAT_HOME=`cygpath --path --windows "$TOMCAT_HOME"`
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-    WSPUBLISH_CLASSPATH=`cygpath --path --windows "$WSPUBLISH_CLASSPATH"`
-fi
-
-# Display our environment
-echo "========================================================================="
-echo ""
-echo "  WSPUBLISH Environment"
-echo ""
-echo "  TOMCAT_HOME: $TOMCAT_HOME"
-echo ""
-echo "  JAVA: $JAVA"
-echo ""
-echo "  JAVA_OPTS: $JAVA_OPTS"
-echo ""
-#echo "  CLASSPATH: $WSPUBLISH_CLASSPATH"
-#echo ""
-echo "========================================================================="
-echo ""
-
-# Execute the JVM
-"$JAVA" $JAVA_OPTS \
-   -classpath "$WSPUBLISH_CLASSPATH" \
-   org.jboss.ws.tools.wspublish -dest $TOMCAT_HOME/webapps "$@"
-

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wspublish.sh (from rev 12348, labs/jbossesb/trunk/product/jbossws21/scripts/wspublish.sh)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wspublish.sh	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wspublish.sh	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+# $Id: wspublish.sh 3101 2007-05-16 08:26:33Z heiko.braun at jboss.com $
+
+DIRNAME=`dirname $0`
+PROGNAME=`basename $0`
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false;
+case "`uname`" in
+    CYGWIN*)
+        cygwin=true
+        ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+    [ -n "$TOMCAT_HOME" ] &&
+        TOMCAT_HOME=`cygpath --unix "$TOMCAT_HOME"`
+    [ -n "$JAVA_HOME" ] &&
+        JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+export TOMCAT_HOME
+
+# Setup the JVM
+if [ "x$JAVA" = "x" ]; then
+    if [ "x$JAVA_HOME" != "x" ]; then
+	JAVA="$JAVA_HOME/bin/java"
+    else
+	JAVA="java"
+    fi
+fi
+
+#JPDA options. Uncomment and modify as appropriate to enable remote debugging .
+#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS"
+
+# Setup JBoss sepecific properties
+JAVA_OPTS="$JAVA_OPTS"
+
+# Setup the WSPUBLISH classpath
+WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/jbossws-thirdparty.jar"
+WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/jbossws-core.jar"
+WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/log4j.jar"
+WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/servlet-api.jar"
+
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+    TOMCAT_HOME=`cygpath --path --windows "$TOMCAT_HOME"`
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+    WSPUBLISH_CLASSPATH=`cygpath --path --windows "$WSPUBLISH_CLASSPATH"`
+fi
+
+# Display our environment
+echo "========================================================================="
+echo ""
+echo "  WSPUBLISH Environment"
+echo ""
+echo "  TOMCAT_HOME: $TOMCAT_HOME"
+echo ""
+echo "  JAVA: $JAVA"
+echo ""
+echo "  JAVA_OPTS: $JAVA_OPTS"
+echo ""
+#echo "  CLASSPATH: $WSPUBLISH_CLASSPATH"
+#echo ""
+echo "========================================================================="
+echo ""
+
+# Execute the JVM
+"$JAVA" $JAVA_OPTS \
+   -classpath "$WSPUBLISH_CLASSPATH" \
+   org.jboss.ws.tools.wspublish -dest $TOMCAT_HOME/webapps "$@"
+

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsrunclient.bat
===================================================================
--- labs/jbossesb/trunk/product/jbossws21/scripts/wsrunclient.bat	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsrunclient.bat	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,61 +0,0 @@
- at echo off
-
-rem $Id: wsprovide.bat 2325 2007-02-09 22:14:15Z jason.greene at jboss.com $
-
- at if not "%ECHO%" == ""  echo %ECHO%
- at if "%OS%" == "Windows_NT"  setlocal
-
-set DIRNAME=.\
-if "%OS%" == "Windows_NT" set DIRNAME=%~dp0%
-set PROGNAME=run.bat
-if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
-
-
-if not [%1] == [] goto start
-    echo %PROGNAME% is a command line tool that invokes a JBossWS JAX-WS Web Service client.
-    echo It builds the correct classpath and endorsed libs for you. Feel free to use
-    echo the code for this script to make your own shell scripts. It is open source
-    echo after all.
-    echo.
-    echo usage: %PROGNAME% [-classpath ^<additional class path^>] ^<java-main-class^> [arguments...]
-    goto EOF 
-:start 
-set ARGS=
-:loop
-if [%1] == [] goto endloop
-    if not %1 == -classpath goto argset 
-      set WSRUNCLIENT_CLASSPATH=%2
-      shift 
-      shift
-      goto loop
-    :argset
-      set ARGS=%ARGS% %1 
-      shift
-      goto loop
-:endloop
-
-set JAVA=%JAVA_HOME%\bin\java
-set JBOSS_HOME=%DIRNAME%\..
-rem Setup the java endorsed dirs
-set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
-
-rem Setup the wstools classpath
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/activation.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-j2ee.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/mail.jar
-rem Execute the JVM
-"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSRUNCLIENT_CLASSPATH%" %ARGS%
-:EOF

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsrunclient.bat (from rev 12348, labs/jbossesb/trunk/product/jbossws21/scripts/wsrunclient.bat)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsrunclient.bat	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsrunclient.bat	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,61 @@
+ at echo off
+
+rem $Id: wsprovide.bat 2325 2007-02-09 22:14:15Z jason.greene at jboss.com $
+
+ at if not "%ECHO%" == ""  echo %ECHO%
+ at if "%OS%" == "Windows_NT"  setlocal
+
+set DIRNAME=.\
+if "%OS%" == "Windows_NT" set DIRNAME=%~dp0%
+set PROGNAME=run.bat
+if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
+
+
+if not [%1] == [] goto start
+    echo %PROGNAME% is a command line tool that invokes a JBossWS JAX-WS Web Service client.
+    echo It builds the correct classpath and endorsed libs for you. Feel free to use
+    echo the code for this script to make your own shell scripts. It is open source
+    echo after all.
+    echo.
+    echo usage: %PROGNAME% [-classpath ^<additional class path^>] ^<java-main-class^> [arguments...]
+    goto EOF 
+:start 
+set ARGS=
+:loop
+if [%1] == [] goto endloop
+    if not %1 == -classpath goto argset 
+      set WSRUNCLIENT_CLASSPATH=%2
+      shift 
+      shift
+      goto loop
+    :argset
+      set ARGS=%ARGS% %1 
+      shift
+      goto loop
+:endloop
+
+set JAVA=%JAVA_HOME%\bin\java
+set JBOSS_HOME=%DIRNAME%\..
+rem Setup the java endorsed dirs
+set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
+
+rem Setup the wstools classpath
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/activation.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-j2ee.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/mail.jar
+rem Execute the JVM
+"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSRUNCLIENT_CLASSPATH%" %ARGS%
+:EOF

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsrunclient.sh
===================================================================
--- labs/jbossesb/trunk/product/jbossws21/scripts/wsrunclient.sh	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsrunclient.sh	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# $Id: wsprovide 2325 2007-02-09 22:14:15Z jason.greene at jboss.com $
-DIRNAME=`dirname $0`
-PROGNAME=`basename $0`
-
-if [ $# -eq 0 ]; then
-    echo "$PROGNAME is a command line tool that invokes a JBossWS JAX-WS Web Service client."
-    echo "It builds the correct classpath and endorsed libs for you. Feel free to use"
-    echo "the code for this script to make your own shell scripts. It is open source"
-    echo "after all."
-    echo 
-    echo "usage: $PROGNAME [-classpath <additional class path>] <java-main-class> [arguments...]"
-    exit 1;
-fi
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false;
-case "`uname`" in
-    CYGWIN*)
-        cygwin=true
-        ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-    [ -n "$JBOSS_HOME" ] &&
-        JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"`
-    [ -n "$JAVA_HOME" ] &&
-        JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Setup JBOSS_HOME
-if [ "x$JBOSS_HOME" = "x" ]; then
-    # get the full path (without any relative bits)
-    JBOSS_HOME=`cd $DIRNAME/..; pwd`
-fi
-export JBOSS_HOME
-
-# Setup the JVM
-if [ "x$JAVA" = "x" ]; then
-    if [ "x$JAVA_HOME" != "x" ]; then
-	JAVA="$JAVA_HOME/bin/java"
-    else
-	JAVA="java"
-    fi
-fi
-
-#JPDA options. Uncomment and modify as appropriate to enable remote debugging .
-#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS"
-
-# Setup JBoss sepecific properties
-JAVA_OPTS="$JAVA_OPTS"
-
-# Setup the java endorsed dirs
-JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
-
-# Setup the wstools classpath
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/activation.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/getopt.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/javassist.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-j2ee.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-ejb3x.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/mail.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/stax-api.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wstx.jar"
-
-while [ $# -ge 1 ]; do
-   case $1 in
-       "-classpath") WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$2"; shift;;
-       *) args="$args \"$1\"";;
-   esac
-   shift
-done
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-    JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-    WSRUNCLIENT_CLASSPATH=`cygpath --path --windows "$WSRUNCLIENT_CLASSPATH"`
-    JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
-fi
-
-# Execute the JVM
-eval "$JAVA" $JAVA_OPTS \
-   -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
-   -Dlog4j.configuration=wstools-log4j.xml \
-   -classpath "$WSRUNCLIENT_CLASSPATH" \
-   "$args"

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsrunclient.sh (from rev 12348, labs/jbossesb/trunk/product/jbossws21/scripts/wsrunclient.sh)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsrunclient.sh	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wsrunclient.sh	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# $Id: wsprovide 2325 2007-02-09 22:14:15Z jason.greene at jboss.com $
+DIRNAME=`dirname $0`
+PROGNAME=`basename $0`
+
+if [ $# -eq 0 ]; then
+    echo "$PROGNAME is a command line tool that invokes a JBossWS JAX-WS Web Service client."
+    echo "It builds the correct classpath and endorsed libs for you. Feel free to use"
+    echo "the code for this script to make your own shell scripts. It is open source"
+    echo "after all."
+    echo 
+    echo "usage: $PROGNAME [-classpath <additional class path>] <java-main-class> [arguments...]"
+    exit 1;
+fi
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false;
+case "`uname`" in
+    CYGWIN*)
+        cygwin=true
+        ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+    [ -n "$JBOSS_HOME" ] &&
+        JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"`
+    [ -n "$JAVA_HOME" ] &&
+        JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Setup JBOSS_HOME
+if [ "x$JBOSS_HOME" = "x" ]; then
+    # get the full path (without any relative bits)
+    JBOSS_HOME=`cd $DIRNAME/..; pwd`
+fi
+export JBOSS_HOME
+
+# Setup the JVM
+if [ "x$JAVA" = "x" ]; then
+    if [ "x$JAVA_HOME" != "x" ]; then
+	JAVA="$JAVA_HOME/bin/java"
+    else
+	JAVA="java"
+    fi
+fi
+
+#JPDA options. Uncomment and modify as appropriate to enable remote debugging .
+#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS"
+
+# Setup JBoss sepecific properties
+JAVA_OPTS="$JAVA_OPTS"
+
+# Setup the java endorsed dirs
+JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
+
+# Setup the wstools classpath
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/activation.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/getopt.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/javassist.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-j2ee.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-ejb3x.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/mail.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/stax-api.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wstx.jar"
+
+while [ $# -ge 1 ]; do
+   case $1 in
+       "-classpath") WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$2"; shift;;
+       *) args="$args \"$1\"";;
+   esac
+   shift
+done
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+    JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+    WSRUNCLIENT_CLASSPATH=`cygpath --path --windows "$WSRUNCLIENT_CLASSPATH"`
+    JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
+fi
+
+# Execute the JVM
+eval "$JAVA" $JAVA_OPTS \
+   -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
+   -Dlog4j.configuration=wstools-log4j.xml \
+   -classpath "$WSRUNCLIENT_CLASSPATH" \
+   "$args"

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wstools.bat
===================================================================
--- labs/jbossesb/trunk/product/jbossws21/scripts/wstools.bat	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wstools.bat	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,62 +0,0 @@
- at echo off
-
-rem $Id: wstools.bat 2156 2007-01-27 05:59:35Z jason.greene at jboss.com $
-
- at if not "%ECHO%" == ""  echo %ECHO%
- at if "%OS%" == "Windows_NT"  setlocal
-
-set DIRNAME=.\
-if "%OS%" == "Windows_NT" set DIRNAME=%~dp0%
-set PROGNAME=run.bat
-if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
-
-rem Read all command line arguments
-
-REM
-REM The %ARGS% env variable commented out in favor of using %* to include
-REM all args in java command line. See bug #840239. [jpl]
-REM
-REM set ARGS=
-REM :loop
-REM if [%1] == [] goto endloop
-REM         set ARGS=%ARGS% %1
-REM         shift
-REM         goto loop
-REM :endloop
-
-set JAVA=%JAVA_HOME%\bin\java
-set JBOSS_HOME=%DIRNAME%\..
-rem Setup the java endorsed dirs
-set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
-
-rem Setup the wstools classpath
-set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar
-set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/activation.jar
-set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar
-set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar
-set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossretro-rt.jar
-set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-backport-concurrent.jar
-set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar
-set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws14-client.jar
-set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar
-set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/mail.jar
-
-rem Display our environment
-echo ========================================================================="
-echo . 
-echo   WSTools Environment
-echo .
-echo   JBOSS_HOME: %JBOSS_HOME%
-echo .
-echo   JAVA: %JAVA%
-echo .
-echo   JAVA_OPTS: %JAVA_OPTS%
-echo .
-rem echo   CLASSPATH: %WSTOOLS_CLASSPATH%
-rem echo .
-echo ========================================================================="
-echo .
-
-rem Execute the JVM
-"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSTOOLS_CLASSPATH%" org.jboss.ws.tools.WSTools %*
-

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wstools.bat (from rev 12348, labs/jbossesb/trunk/product/jbossws21/scripts/wstools.bat)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wstools.bat	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wstools.bat	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,62 @@
+ at echo off
+
+rem $Id: wstools.bat 2156 2007-01-27 05:59:35Z jason.greene at jboss.com $
+
+ at if not "%ECHO%" == ""  echo %ECHO%
+ at if "%OS%" == "Windows_NT"  setlocal
+
+set DIRNAME=.\
+if "%OS%" == "Windows_NT" set DIRNAME=%~dp0%
+set PROGNAME=run.bat
+if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
+
+rem Read all command line arguments
+
+REM
+REM The %ARGS% env variable commented out in favor of using %* to include
+REM all args in java command line. See bug #840239. [jpl]
+REM
+REM set ARGS=
+REM :loop
+REM if [%1] == [] goto endloop
+REM         set ARGS=%ARGS% %1
+REM         shift
+REM         goto loop
+REM :endloop
+
+set JAVA=%JAVA_HOME%\bin\java
+set JBOSS_HOME=%DIRNAME%\..
+rem Setup the java endorsed dirs
+set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
+
+rem Setup the wstools classpath
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/activation.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossretro-rt.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-backport-concurrent.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws14-client.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/mail.jar
+
+rem Display our environment
+echo ========================================================================="
+echo . 
+echo   WSTools Environment
+echo .
+echo   JBOSS_HOME: %JBOSS_HOME%
+echo .
+echo   JAVA: %JAVA%
+echo .
+echo   JAVA_OPTS: %JAVA_OPTS%
+echo .
+rem echo   CLASSPATH: %WSTOOLS_CLASSPATH%
+rem echo .
+echo ========================================================================="
+echo .
+
+rem Execute the JVM
+"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSTOOLS_CLASSPATH%" org.jboss.ws.tools.WSTools %*
+

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wstools.sh
===================================================================
--- labs/jbossesb/trunk/product/jbossws21/scripts/wstools.sh	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wstools.sh	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# $Id: wstools.sh 2157 2007-01-27 06:03:58Z jason.greene at jboss.com $
-
-DIRNAME=`dirname $0`
-PROGNAME=`basename $0`
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false;
-case "`uname`" in
-    CYGWIN*)
-        cygwin=true
-        ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-    [ -n "$JBOSS_HOME" ] &&
-        JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"`
-    [ -n "$JAVA_HOME" ] &&
-        JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Setup JBOSS_HOME
-if [ "x$JBOSS_HOME" = "x" ]; then
-    # get the full path (without any relative bits)
-    JBOSS_HOME=`cd $DIRNAME/..; pwd`
-fi
-export JBOSS_HOME
-
-# Setup the JVM
-if [ "x$JAVA" = "x" ]; then
-    if [ "x$JAVA_HOME" != "x" ]; then
-	JAVA="$JAVA_HOME/bin/java"
-    else
-	JAVA="java"
-    fi
-fi
-
-#JPDA options. Uncomment and modify as appropriate to enable remote debugging .
-#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS"
-
-# Setup JBoss sepecific properties
-JAVA_OPTS="$JAVA_OPTS"
-
-# Setup the java endorsed dirs
-JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
-
-# Setup the wstools classpath
-WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
-WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/activation.jar"
-WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/javassist.jar"
-WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
-WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossretro-rt.jar"
-WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-backport-concurrent.jar"
-WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws14-client.jar"
-WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
-WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
-WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/mail.jar"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-    JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-    WSTOOLS_CLASSPATH=`cygpath --path --windows "$WSTOOLS_CLASSPATH"`
-    JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
-fi
-
-# Display our environment
-echo "========================================================================="
-echo ""
-echo "  WSTools Environment"
-echo ""
-echo "  JBOSS_HOME: $JBOSS_HOME"
-echo ""
-echo "  JAVA: $JAVA"
-echo ""
-echo "  JAVA_OPTS: $JAVA_OPTS"
-echo ""
-#echo "  CLASSPATH: $WSTOOLS_CLASSPATH"
-#echo ""
-echo "========================================================================="
-echo ""
-
-# Execute the JVM
-"$JAVA" $JAVA_OPTS \
-   -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
-   -Dlog4j.configuration=wstools-log4j.xml \
-   -classpath "$WSTOOLS_CLASSPATH" \
-   org.jboss.ws.tools.WSTools "$@"

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wstools.sh (from rev 12348, labs/jbossesb/trunk/product/jbossws21/scripts/wstools.sh)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wstools.sh	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/jbossws21/scripts/wstools.sh	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# $Id: wstools.sh 2157 2007-01-27 06:03:58Z jason.greene at jboss.com $
+
+DIRNAME=`dirname $0`
+PROGNAME=`basename $0`
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false;
+case "`uname`" in
+    CYGWIN*)
+        cygwin=true
+        ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+    [ -n "$JBOSS_HOME" ] &&
+        JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"`
+    [ -n "$JAVA_HOME" ] &&
+        JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Setup JBOSS_HOME
+if [ "x$JBOSS_HOME" = "x" ]; then
+    # get the full path (without any relative bits)
+    JBOSS_HOME=`cd $DIRNAME/..; pwd`
+fi
+export JBOSS_HOME
+
+# Setup the JVM
+if [ "x$JAVA" = "x" ]; then
+    if [ "x$JAVA_HOME" != "x" ]; then
+	JAVA="$JAVA_HOME/bin/java"
+    else
+	JAVA="java"
+    fi
+fi
+
+#JPDA options. Uncomment and modify as appropriate to enable remote debugging .
+#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS"
+
+# Setup JBoss sepecific properties
+JAVA_OPTS="$JAVA_OPTS"
+
+# Setup the java endorsed dirs
+JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
+
+# Setup the wstools classpath
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/activation.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/javassist.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossretro-rt.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-backport-concurrent.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws14-client.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/mail.jar"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+    JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+    WSTOOLS_CLASSPATH=`cygpath --path --windows "$WSTOOLS_CLASSPATH"`
+    JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
+fi
+
+# Display our environment
+echo "========================================================================="
+echo ""
+echo "  WSTools Environment"
+echo ""
+echo "  JBOSS_HOME: $JBOSS_HOME"
+echo ""
+echo "  JAVA: $JAVA"
+echo ""
+echo "  JAVA_OPTS: $JAVA_OPTS"
+echo ""
+#echo "  CLASSPATH: $WSTOOLS_CLASSPATH"
+#echo ""
+echo "========================================================================="
+echo ""
+
+# Execute the JVM
+"$JAVA" $JAVA_OPTS \
+   -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
+   -Dlog4j.configuration=wstools-log4j.xml \
+   -classpath "$WSTOOLS_CLASSPATH" \
+   org.jboss.ws.tools.WSTools "$@"

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/spi (from rev 12348, labs/jbossesb/trunk/product/jbossws21/spi)

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/spi/jbossws-spi.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/spi/jbossws-spi.jar (from rev 12348, labs/jbossesb/trunk/product/jbossws21/spi/jbossws-spi.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty (from rev 12348, labs/jbossesb/trunk/product/jbossws21/thirdparty)

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/jaxb-api.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/jaxb-api.jar (from rev 12348, labs/jbossesb/trunk/product/jbossws21/thirdparty/jaxb-api.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/jaxb-impl.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/jaxb-impl.jar (from rev 12348, labs/jbossesb/trunk/product/jbossws21/thirdparty/jaxb-impl.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/jaxb-xjc.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/jaxb-xjc.jar (from rev 12348, labs/jbossesb/trunk/product/jbossws21/thirdparty/jaxb-xjc.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/jaxws-rt.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/jaxws-rt.jar (from rev 12348, labs/jbossesb/trunk/product/jbossws21/thirdparty/jaxws-rt.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/jaxws-tools.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/jaxws-tools.jar (from rev 12348, labs/jbossesb/trunk/product/jbossws21/thirdparty/jaxws-tools.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/juddi-service.sar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/juddi-service.sar (from rev 12348, labs/jbossesb/trunk/product/jbossws21/thirdparty/juddi-service.sar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/wsdl4j.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/jbossws21/thirdparty/wsdl4j.jar (from rev 12348, labs/jbossesb/trunk/product/jbossws21/thirdparty/wsdl4j.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/lib/ext/aspectjrt.jar (from rev 12348, labs/jbossesb/trunk/product/lib/ext/aspectjrt.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/lib/ext/aspectjweaver.jar (from rev 12348, labs/jbossesb/trunk/product/lib/ext/aspectjweaver.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/lib/ext/c3p0-0.9.1-pre9.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/lib/ext/commons-logging.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/lib/ext/jackrabbit-api-1.2.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/lib/ext/jackrabbit-core-1.2.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/lib/ext/jackrabbit-jcr-commons-1.2.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/lib/ext/jbossws-core.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/lib/ext/jcr-1.0.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/lib/ext/lucene-core-2.0.0.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/lib/ext/milyn-commons-0.9-SNAPSHOT.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/lib/ext/milyn-edisax-0.2-SNAPSHOT.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/lib/ext/milyn-smooks-core-0.9-SNAPSHOT.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/lib/ext/milyn-smooks-csv-0.1.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/lib/ext/milyn-smooks-edi-0.2-SNAPSHOT.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/lib/ext/milyn-smooks-javabean-0.3-SNAPSHOT.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/lib/ext/milyn-smooks-misc-0.2.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/lib/ext/milyn-smooks-scripting-0.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/lib/ext/milyn-smooks-templating-0.2.1.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/lib/ext/spring-aspects.jar (from rev 12348, labs/jbossesb/trunk/product/lib/ext/spring-aspects.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/lib/ext/spring-mock.jar (from rev 12348, labs/jbossesb/trunk/product/lib/ext/spring-mock.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/lib/ext/spring.jar (from rev 12348, labs/jbossesb/trunk/product/lib/ext/spring.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/lib/ext/standalone (from rev 12348, labs/jbossesb/trunk/product/lib/ext/standalone)

Deleted: labs/jbossesb/workspace/dbevenius/product/lib/ext/standalone/c3p0-0.9.1-pre9.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/lib/ext/standalone/c3p0-0.9.1-pre9.jar (from rev 12348, labs/jbossesb/trunk/product/lib/ext/standalone/c3p0-0.9.1-pre9.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/aggregator/jbm-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/aggregator/jbm-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/aggregator/jbm-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/aggregator/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Blue_Alert"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Green_Alert"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Red_Alert"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Request_ESB"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Request_GW"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_ToBlue"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_ToGreen"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_ToRed"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+</server>
+

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/aggregator/jbmq-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/aggregator/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/aggregator/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/aggregator/jbmq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Blue_Alert">
+    <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_Aggregator_Green_Alert">
+    <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_Aggregator_Red_Alert">
+    <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_Aggregator_Request_ESB">
+    <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_Aggregator_Request_GW">
+    <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_Aggregator_ToBlue">
+    <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_Aggregator_ToGreen">
+    <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_Aggregator_ToRed">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>
+

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/samples/quickstart/aggregator/test/ReceiveJMSMessage.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/samples/quickstart/aggregator/test/ReceiveJMSMessage.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/aggregator/src/org/jboss/soa/esb/samples/quickstart/aggregator/test/ReceiveJMSMessage.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -18,58 +18,106 @@
  * (C) 2005-2006,
  * @author JBoss Inc.
  */
-package org.jboss.soa.esb.samples.quickstart.aggregator.test;
-
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueReceiver;
-import javax.jms.QueueSession;
-import javax.jms.TextMessage;
-import javax.naming.InitialContext;
-
-public class ReceiveJMSMessage {
-	   QueueConnection conn = null;	   
-	   QueueSession receiverSession = null;	   
-	   Queue receiverQueue = null;	   
-	   QueueReceiver queueReceiver = null;
-	   InitialContext iniCtx = null;
-	   QueueConnectionFactory qcf = null;
-	   String receiveQueueName = "queue/D"; // Default to queue/D
-	   
-	   public ReceiveJMSMessage() {
-		   
-	   }
-	   public void receiveOne() {
-		   try {
-		   if (iniCtx == null) iniCtx = new InitialContext();
-	          if (qcf == null) qcf = (QueueConnectionFactory) iniCtx.lookup("ConnectionFactory");
-	          if (conn == null) {
-	              conn = qcf.createQueueConnection();
-	              conn.start();
-	          }	        
-	          receiverQueue = (Queue) iniCtx.lookup(receiveQueueName);
-	          receiverSession = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-	    	  queueReceiver = receiverSession.createReceiver(receiverQueue); 
-	    	  TextMessage msg = (TextMessage) queueReceiver.receive(2000);
-	    	  if (msg != null) {
-	    		  System.out.println("*********************************************************");
-	    		  System.out.println(msg);
-	    		  System.out.println("*********************************************************");
-	    	  }	
-		   } catch (Exception e) {
-			   System.out.println(e);
-		   }
-	   }
-	   public static void main(String[] args) {
-		      ReceiveJMSMessage receiver = new ReceiveJMSMessage();
-		      
-		      if(args[0] != null) {
-		    	  receiver.receiveQueueName = args[0];
-		    	  System.out.println("Receiving on: " + receiver.receiveQueueName );		    	 
-		      }		    	  
-		      while (true) { // loop until I'm killed
-		    	  receiver.receiveOne();
-		      }
-	   }
-}
+package org.jboss.soa.esb.samples.quickstart.aggregator.test;
+
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueReceiver;
+import javax.jms.QueueSession;
+import javax.jms.TextMessage;
+import javax.naming.InitialContext;
+
+public class ReceiveJMSMessage {
+	   QueueConnection conn = null;	   
+	   QueueSession receiverSession = null;	   
+	   Queue receiverQueue = null;	   
+	   QueueReceiver queueReceiver = null;
+	   InitialContext iniCtx = null;
+	   QueueConnectionFactory qcf = null;
+	   String receiveQueueName = "queue/D"; // Default to queue/D
+           private boolean initialised ;
+	   
+	   public ReceiveJMSMessage() {
+		   
+	   }
+	   public void receiveOne() {
+               if (!initialised) {
+                   initialise() ;
+               }
+               
+               if (receiverQueue != null) {
+                  try {
+                      TextMessage msg = (TextMessage) queueReceiver.receive();
+                      if (msg != null) {
+	    		  System.out.println("*********************************************************");
+	    		  System.out.println(msg.getText());
+	    		  System.out.println("*********************************************************");
+                      }
+                  } catch (final Exception ex) {
+                      cleanup() ;
+                      System.out.println(ex.getMessage()) ;
+                  }
+               }
+               
+               if (!initialised) {
+                   System.out.println("Pausing before reinitialising") ;
+                   try {
+                       Thread.sleep(5000) ;
+                   } catch (final InterruptedException ie) {
+                       // do nothing
+                   }
+               }
+	   }
+           
+           private void initialise()
+           {
+               try {
+                  if (iniCtx == null) iniCtx = new InitialContext();
+                  if (qcf == null) qcf = (QueueConnectionFactory) iniCtx.lookup("ConnectionFactory");
+                  if (conn == null) {
+                      conn = qcf.createQueueConnection();
+                      conn.start();
+                  }             
+                  receiverQueue = (Queue) iniCtx.lookup(receiveQueueName);
+                  receiverSession = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+                  queueReceiver = receiverSession.createReceiver(receiverQueue);
+                  initialised = true ;
+                  System.out.println("Initialised") ;
+               } catch (final Exception ex) {
+                   cleanup() ;
+               }
+           }
+           
+           public void cleanup() {
+               queueReceiver = null ;
+               receiverSession = null ;
+               receiverQueue = null ;
+               try {
+                   conn.stop() ;
+               } catch (final Exception ex) {
+                   // Do nothing ;
+               }
+               conn = null ;
+               qcf = null ;
+               iniCtx = null ;
+               initialised = false ;
+           }
+           
+	   public static void main(String[] args) {
+		      final ReceiveJMSMessage receiver = new ReceiveJMSMessage();
+		      
+		      if ((args.length > 0) && (args[0] != null)) {
+		    	  receiver.receiveQueueName = args[0];
+		    	  System.out.println("Receiving on: " + receiver.receiveQueueName );		    	 
+		      }
+                      Runtime.getRuntime().addShutdownHook(new Thread() {
+                          public void run() {
+                              receiver.cleanup() ;
+                          }
+                      }) ;
+		      while (true) { // loop until I'm killed
+		    	  receiver.receiveOne();
+		      }
+	   }
+}

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/bpm_orchestration1/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/bpm_orchestration1/build.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/bpm_orchestration1/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,86 +1,73 @@
-<project name="Quickstart_bpm_orchestration1" default="esb" basedir=".">
-
-	<description>
-		${ant.project.name}
-		${line.separator}
-	</description>
-
-  <!-- Import the base Ant build script... -->
-  <import file="../conf/base-build.xml"/>
-
-  <!--property name="jbpm.services.build.dir" value="${product.dir}/build/services/jbpm.esb" /-->
-  <property name="jbpm.services.build.dir" value="${product.dir}/build/jbossesb/lib/jbpm.esb" />
-  <property name="jbossesb.inputdir" location="/tmp"/>
-  <property name="project.process.dir" value="processDefinition1"/>
-	
-  <!-- note: this overrides the one from base-build.xml -->
-  <!-- we need to reset the base-build.xml so that it allows for the BPM feature -->
-
-  <path id="quickstart-dependencies-classpath">
-      <fileset dir="${basedir}" includes="build/**/*.jar"/>
-      <fileset dir="${basedir}" includes="build/**/*.xml"/>
-      <fileset dir="${jbpm.services.build.dir}" includes="*jar"/>
-    </path>
-
-	<target name="prepare" depends="clean">
-    	<copy todir="build/${ant.project.name}.esb">
-			<fileset dir="${jbpm.services.build.dir}" />
-		</copy>
-		<mkdir dir="build/classes" />
-	</target>
-	
-  <target name="esb" depends="prepare,compile">
-    <copy overwrite="true" file="jboss-esb.xml" todir="build/${ant.project.name}.esb/META-INF" />
-    <copy overwrite="true" file="${project.process.dir}/processdefinition.xml" todir="build/${ant.project.name}.esb" />
-    <copy todir="build/${ant.project.name}.esb">
-      <fileset dir="build/classes" includes="**/*" />
-    </copy>
-    <mkdir dir="build/${ant.project.name}.esb/scripts"/>
-    <copy todir="build/${ant.project.name}.esb/scripts">
-      <fileset dir="scripts" includes="**/*" />
-    </copy>
-  </target>
-	
-	<!-- override as we deploy in exploded view -->
-	<target name="package-deployment"/>	
-	
-	<target name="run">
-		<echo message="This target is not implemented for this quickstart. Please run 'ant deploy' and the 'ant runtest'"/>
-	</target>
-
-    <target name="deploy" depends="esb">
-		<delete quiet="true" dir="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb" />
-		<delete quiet="true" file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb" />
-		<copy todir="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb" >
-			<fileset dir="build/${ant.project.name}.esb" includes="**/*" />
-		</copy>
-    </target>
+<project name="Quickstart_bpm_orchestration1" default="esb" basedir=".">
 
-  <target name="refreshProcess" description="Moves the changed process definition to the server without restarting all the services">
-    <echo>Moves the changed process definition to the server without restarting all the services</echo>
-    <copy overwrite="true" 
-        file="${project.process.dir}/processdefinition.xml"
-	    tofile="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb/processdefinition.xml"/>
-  </target>
-	
-  <target name="deployProcess" depends="compile" description="Sends a message to deploy the process definition">
-    <echo>Sends a message to deploy the process definition</echo>
-	<java fork="yes" classname="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.test.SendTestMessage" failonerror="true">
-		<arg value="${jbossesb.inputdir}"/>
-		<arg value=".deployProcessGW"/> <!-- file ext -->
-		<arg value="Go Deploy It"/> <!-- the file contents -->
-		<classpath refid="exec-classpath"/>
-	</java>
-  </target>
-      
-  <target name="startProcess" depends="compile" description="Sends a message to start the process instance">
-	<echo>Sends a message to start the process instance</echo>
-	<java fork="yes" classname="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.test.SendTestMessage" failonerror="true">
-	  <arg value="${jbossesb.inputdir}"/>
-	  <arg value=".startProcessGW"/> <!-- file ext -->
-	  <arg value="Start It Up"/> <!-- the file contents -->
-	  <classpath refid="exec-classpath"/>
-	</java>
-  </target>	
-
-</project>
+	<description>
+		${ant.project.name}
+		${line.separator}
+	</description>
+
+  <!-- Import the base Ant build script... -->
+  <import file="../conf/base-build.xml"/>
+
+  <property name="jbossesb.inputdir" location="${build.dir}/inputdir"/>
+
+  <property name="project.process.dir" value="processDefinition1"/>
+
+  <target name="config">
+    <delete dir="${jbossesb.inputdir}" quiet="true"/>
+    <mkdir dir="${jbossesb.inputdir}"/>
+    <copy file="${basedir}/jboss-esb-unfiltered.xml" tofile="${basedir}/jboss-esb.xml" overwrite="true" filtering="true">
+      <filterset>
+        <filter token="INPUT_DIR" value="${jbossesb.inputdir}"/>
+      </filterset>
+    </copy>
+  </target>
+
+  <target name="quickstart-specific-assemblies">
+    <copy overwrite="true" file="${project.process.dir}/processdefinition.xml" todir="${classes}" />
+    <copy todir="${classes}">
+      <fileset dir="${basedir}" includes="scripts/**/*"/>
+    </copy>
+  </target>
+	
+  <target name="run">
+		<echo message="This target is not implemented for this quickstart. Please run 'ant deploy' and the 'ant runtest'"/>
+	</target>
+
+  <target name="deploy-esb-archive-before"/>
+  <target name="deploy-esb-archive-after"/>
+
+  <target name="quickstart-specific-deploys">
+    <property name="dest" location="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb"/>
+    <delete quiet="true" dir="${dest}"/>
+    <mkdir dir="${dest}"/>
+    <unjar src="${build.dir}/${ant.project.name}.esb" dest="${dest}"/>
+  </target>
+
+  <target name="refreshProcess" description="Moves the changed process definition to the server without restarting all the services">
+    <echo>Moves the changed process definition to the server without restarting all the services</echo>
+    <copy overwrite="true" 
+        file="${project.process.dir}/processdefinition.xml"
+	    tofile="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb/processdefinition.xml"/>
+  </target>
+	
+  <target name="deployProcess" depends="compile" description="Sends a message to deploy the process definition">
+    <echo>Sends a message to deploy the process definition</echo>
+	<java fork="yes" classname="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.test.SendTestMessage" failonerror="true">
+		<arg value="${jbossesb.inputdir}"/>
+		<arg value=".deployProcessGW"/> <!-- file ext -->
+		<arg value="Go Deploy It"/> <!-- the file contents -->
+		<classpath refid="exec-classpath"/>
+	</java>
+  </target>
+      
+  <target name="startProcess" depends="compile" description="Sends a message to start the process instance">
+	<echo>Sends a message to start the process instance</echo>
+	<java fork="yes" classname="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.test.SendTestMessage" failonerror="true">
+	  <arg value="${jbossesb.inputdir}"/>
+	  <arg value=".startProcessGW"/> <!-- file ext -->
+	  <arg value="Start It Up"/> <!-- the file contents -->
+	  <classpath refid="exec-classpath"/>
+	</java>
+  </target>	
+
+</project>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,196 @@
+<?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>        
+         <fs-provider name="FSprovider1">
+         
+          	<fs-bus busid="deployGwChannel" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".deployProcessGW"          			
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus>    
+          	<fs-bus busid="deployEsbChannel" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".deployProcessESB"
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus> 
+          	
+          	<fs-bus busid="startGwChannel" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".startProcessGW"
+          			work-suffix=".startProcessGWWorking"
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus>   
+          	<fs-bus busid="startEsbChannel" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".startProcessESB"          			
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus>    
+          	<fs-bus busid="service1EsbChannel" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".service1ESB"
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus>   
+          	<fs-bus busid="service2EsbChannel" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".service2ESB"
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus> 
+          	<fs-bus busid="service3EsbChannel" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".service3ESB"
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus>    
+          	<fs-bus busid="resultsService" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".resultsServiceESB"
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus>       	          	        	   	
+         </fs-provider>
+      </providers>
+
+      <services>
+        <service category="BPM_Orchestration_Deploy_Service" name="Deploy_Service"
+                 description="BPM Orchestration Sample 1: Use this service to deploy a process instance">
+            <listeners>
+                <fs-listener name="Gateway" busidref="deployGwChannel"
+                    maxThreads="1"
+                    is-gateway="true" />
+                <fs-listener name="ESB-Listener" busidref="deployEsbChannel"
+                maxThreads="1"/>
+            </listeners>
+              <actions>
+                <action name="DeployFromFile" 
+                  class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
+                  <property name="command" value="DeployProcessDefinition" />
+                  <property name="process-definition-file" value="/processdefinition.xml" />
+                </action>
+              </actions>
+        </service>
+        
+        <service category="BPM_Orchestration_Starter_Service" name="Starter_Service"
+                 description="BPM Orchestration Sample 1: Use this service to start a process instance">
+            <listeners>
+                <fs-listener name="Gateway" busidref="startGwChannel"
+                    maxThreads="4"
+                    is-gateway="true" />
+                <fs-listener name="ESB-Listener" busidref="startEsbChannel"
+                maxThreads="1"/>
+            </listeners>
+            <actions>
+                <action name="spy" 
+                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.MessageSpy"/>
+                    
+                <!-- move the body.getContents() into jBPM -->    
+                <action name="create_new_process_instance" 
+                    class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
+                    <property name="command" value="NewProcessInstanceCommand" />
+                    <property name="process-definition-name" value="processDefinition1"/>   
+                    <property name="actor" value="FrankSinatra"/>                                                 
+                    <property name="esb-to-jbpm">
+                      <!-- esb-name maps to getBody().get("eVar1") -->
+                      <variables>
+                        <variable esb-name="eVar1" jbpm-name="counter"  value="45" />
+                        <variable esb-name="BODY_CONTENT" jbpm-name="theBody" />
+                      </variables>
+                    </property>                    
+                 </action>  
+
+                <action name="displayProcessInfo" 
+                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.ProcessInfo"/>
+
+                <action name="spy" 
+                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.MessageSpy"/>
+                 
+                 <action  name="signal_the_new_process_instance" 
+                   class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
+                    <property name="command" value="SignalCommand" />
+                    <property name="esb-to-jbpm">
+                      <!-- esb-name maps to getBody().get("eVar1") -->
+                      <variables>
+                        <variable esb-name="eVar1" jbpm-name="counter"  value="45" />
+                        <variable esb-name="BODY_CONTENT" jbpm-name="theBody" />
+                      </variables>
+                    </property>                    
+                 </action>
+
+                <action name="spy" 
+                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.MessageSpy"/>
+                            
+            </actions>
+        </service>
+        
+        <service category="BPM_Orchestration_Service1" name="Service1"
+                 description="BPM Orchestration Sample 1: this is a service invoked within the process">
+            <listeners>
+                <fs-listener name="ESB-Listener" busidref="service1EsbChannel"
+                maxThreads="1"/>
+            </listeners>
+            <actions>
+                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+                  <property name="script" value="/scripts/service1.groovy" />
+                </action>                                
+            </actions>
+        </service>
+        <service category="BPM_Orchestration_Service2" name="Service2"
+                 description="BPM Orchestration Sample 1: this is a service invoked within the process">
+            <listeners>
+                <fs-listener name="ESB-Listener" busidref="service2EsbChannel"
+                maxThreads="1"/>
+            </listeners>
+            <actions>
+                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+                  <property name="script" value="/scripts/service2.groovy" />
+                </action>                
+            </actions>
+        </service>
+        <service category="BPM_Orchestration_Service3" name="Service3"
+                 description="BPM Orchestration Sample 1: this is a service invoked within the process">
+            <listeners>
+                <fs-listener name="ESB-Listener" busidref="service3EsbChannel"
+                maxThreads="1"/>
+            </listeners>
+            <actions>
+                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+                  <property name="script" value="/scripts/service3.groovy" />
+                </action>
+            </actions>
+        </service>
+        <service category="BPM_Orchestration_ResultsService" name="ResultsService"
+                 description="BPM Orchestration Sample 1: Sends outbound results of the process flow">
+            <listeners>
+                <fs-listener name="ESB-Listener" busidref="resultsService"
+                maxThreads="1"/>
+            </listeners>
+            <actions>
+                <action name="spy" 
+                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.MessageSpy"/>                 
+            </actions>
+        </service>
+      </services>
+</jbossesb>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/bpm_orchestration1/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/bpm_orchestration1/jboss-esb.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/bpm_orchestration1/jboss-esb.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,196 +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>        
-         <fs-provider name="FSprovider1">
-         
-          	<fs-bus busid="deployGwChannel" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".deployProcessGW"          			
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus>    
-          	<fs-bus busid="deployEsbChannel" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".deployProcessESB"
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus> 
-          	
-          	<fs-bus busid="startGwChannel" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".startProcessGW"
-          			work-suffix=".startProcessGWWorking"
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus>   
-          	<fs-bus busid="startEsbChannel" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".startProcessESB"          			
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus>    
-          	<fs-bus busid="service1EsbChannel" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".service1ESB"
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus>   
-          	<fs-bus busid="service2EsbChannel" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".service2ESB"
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus> 
-          	<fs-bus busid="service3EsbChannel" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".service3ESB"
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus>    
-          	<fs-bus busid="resultsService" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".resultsServiceESB"
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus>       	          	        	   	
-         </fs-provider>
-      </providers>
-
-      <services>
-        <service category="BPM_Orchestration_Deploy_Service" name="Deploy_Service"
-                 description="BPM Orchestration Sample 1: Use this service to deploy a process instance">
-            <listeners>
-                <fs-listener name="Gateway" busidref="deployGwChannel"
-                    maxThreads="1"
-                    is-gateway="true" />
-                <fs-listener name="ESB-Listener" busidref="deployEsbChannel"
-                maxThreads="1"/>
-            </listeners>
-              <actions>
-                <action name="DeployFromFile" 
-                  class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
-                  <property name="command" value="DeployProcessDefinition" />
-                  <property name="process-definition-file" value="/processdefinition.xml" />
-                </action>
-              </actions>
-        </service>
-        
-        <service category="BPM_Orchestration_Starter_Service" name="Starter_Service"
-                 description="BPM Orchestration Sample 1: Use this service to start a process instance">
-            <listeners>
-                <fs-listener name="Gateway" busidref="startGwChannel"
-                    maxThreads="4"
-                    is-gateway="true" />
-                <fs-listener name="ESB-Listener" busidref="startEsbChannel"
-                maxThreads="1"/>
-            </listeners>
-            <actions>
-                <action name="spy" 
-                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.MessageSpy"/>
-                    
-                <!-- move the body.getContents() into jBPM -->    
-                <action name="create_new_process_instance" 
-                    class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
-                    <property name="command" value="NewProcessInstanceCommand" />
-                    <property name="process-definition-name" value="processDefinition1"/>   
-                    <property name="actor" value="FrankSinatra"/>                                                 
-                    <property name="esb-to-jbpm">
-                      <!-- esb-name maps to getBody().get("eVar1") -->
-                      <variables>
-                        <variable esb-name="eVar1" jbpm-name="counter"  value="45" />
-                        <variable esb-name="BODY_CONTENT" jbpm-name="theBody" />
-                      </variables>
-                    </property>                    
-                 </action>  
-
-                <action name="displayProcessInfo" 
-                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.ProcessInfo"/>
-
-                <action name="spy" 
-                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.MessageSpy"/>
-                 
-                 <action  name="signal_the_new_process_instance" 
-                   class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
-                    <property name="command" value="SignalCommand" />
-                    <property name="esb-to-jbpm">
-                      <!-- esb-name maps to getBody().get("eVar1") -->
-                      <variables>
-                        <variable esb-name="eVar1" jbpm-name="counter"  value="45" />
-                        <variable esb-name="BODY_CONTENT" jbpm-name="theBody" />
-                      </variables>
-                    </property>                    
-                 </action>
-
-                <action name="spy" 
-                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.MessageSpy"/>
-                            
-            </actions>
-        </service>
-        
-        <service category="BPM_Orchestration_Service1" name="Service1"
-                 description="BPM Orchestration Sample 1: this is a service invoked within the process">
-            <listeners>
-                <fs-listener name="ESB-Listener" busidref="service1EsbChannel"
-                maxThreads="1"/>
-            </listeners>
-            <actions>
-                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-                  <property name="script" value="/scripts/service1.groovy" />
-                </action>                                
-            </actions>
-        </service>
-        <service category="BPM_Orchestration_Service2" name="Service2"
-                 description="BPM Orchestration Sample 1: this is a service invoked within the process">
-            <listeners>
-                <fs-listener name="ESB-Listener" busidref="service2EsbChannel"
-                maxThreads="1"/>
-            </listeners>
-            <actions>
-                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-                  <property name="script" value="/scripts/service2.groovy" />
-                </action>                
-            </actions>
-        </service>
-        <service category="BPM_Orchestration_Service3" name="Service3"
-                 description="BPM Orchestration Sample 1: this is a service invoked within the process">
-            <listeners>
-                <fs-listener name="ESB-Listener" busidref="service3EsbChannel"
-                maxThreads="1"/>
-            </listeners>
-            <actions>
-                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-                  <property name="script" value="/scripts/service3.groovy" />
-                </action>
-            </actions>
-        </service>
-        <service category="BPM_Orchestration_ResultsService" name="ResultsService"
-                 description="BPM Orchestration Sample 1: Sends outbound results of the process flow">
-            <listeners>
-                <fs-listener name="ESB-Listener" busidref="resultsService"
-                maxThreads="1"/>
-            </listeners>
-            <actions>
-                <action name="spy" 
-                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.MessageSpy"/>                 
-            </actions>
-        </service>
-      </services>
-</jbossesb>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/build.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -10,12 +10,13 @@
 	<!-- Import the base Ant build script... -->
 	<import file="../conf/base-build.xml"/>
 
-	<property name="ejb.jar.name" value="${basedir}/build/helloworld-ejb.jar"/>
+	<property name="ejb.jar.name" value="${basedir}/build/business_service-ejb.jar"/>
 	<property name="additional.deploys" value="${ejb.jar.name}"/>
 
    <property name="classes" value="build/classes"/>
 	
-	<path id="quickstart.classpath">
+	<target name="config">
+		<path id="quickstart-dependencies-classpath">
 			<fileset dir="${org.jboss.esb.server.home}/client" >
 				<include name="jbossmq-client.jar"/>
 				<include name="jboss-ejb3-client.jar"/>
@@ -26,24 +27,16 @@
 				<include name="jbossmq-client.jar"/>
 				<include name="jboss-messaging-client.jar"/>
 			</fileset>
-			<fileset dir="${product.dir}/lib/ext">
-				<include name="*.jar"/>		
-				<exclude name="jboss.jar"/>
-				<exclude name="jbossall.jar"/>
-				<exclude name="jboss-messaging-client.jar"/>
-			</fileset>
-			<pathelement location="."/>
-			<pathelement location="build/classes"/>
-			<pathelement location="src"/>
-			<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib" includes="jboss-remoting.jar"/>
-			<fileset dir="${esb.product.lib.dir}" includes="*.jar" excludes="jboss-remoting.jar"/>
 		</path>
+	</target>
 	
+	<target name="quickstart-specific-dependencies" depends="assert-ejb3-available"/>
+
 	<target name="run" depends="compile,config">
 			<echo>Launching Quickstart in standalone mode...</echo>
 			<java fork="yes" classname="org.jboss.soa.esb.listeners.StandAloneBootStrapper" failonerror="true">
 				<arg value="${basedir}/jboss-esb.xml" />
-				<classpath refid="quickstart.classpath" />
+				<classpath refid="exec-classpath" />
 			</java>
 	</target>
 
@@ -57,7 +50,7 @@
 	description="tests a pojo">
       <java classname="org.jboss.tutorial.stateless.client.Client" fork="yes" dir=".">
          <arg value="-pojo"/>
-			<classpath refid="quickstart.classpath" />
+			<classpath refid="exec-classpath" />
       </java>
    </target>
 
@@ -65,7 +58,7 @@
 	description="tests an EJB">
       <java classname="org.jboss.tutorial.stateless.client.Client" fork="yes" dir=".">
          <arg value="-ejb"/>
-			<classpath refid="quickstart.classpath" />
+			<classpath refid="exec-classpath" />
       </java>
    </target>
 
@@ -74,7 +67,7 @@
       <echo>Runs Test JMS Sender</echo>
       <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.businessservice.test.SendJMSMessage" failonerror="true">
          <arg value="Your Name"/>
-			<classpath refid="quickstart.classpath" />
+			<classpath refid="exec-classpath" />
       </java>
    </target>
 	

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/deployment.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/business_service/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/deployment.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,3 @@
+<jbossesb-deployment>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_business_service_Request</depends>
+</jbossesb-deployment>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/jbm-queue-service-scoped.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/jbm-queue-service-scoped.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -5,8 +5,8 @@
   </loader-repository>
 
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_Request"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_business_service_Request"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
   </mbean>
-</server>
\ No newline at end of file
+</server>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/jbm-queue-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_Request"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_business_service_Request"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
   </mbean>
-</server>
\ No newline at end of file
+</server>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/jbmq-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/business_service/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/jbmq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+     name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_business_service_Request">
+     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+</server>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/jboss-esb.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/jboss-esb.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -10,7 +10,7 @@
               <jms-bus busid="quickstartGwChannel">
                   <jms-message-filter
                       dest-type="QUEUE"
-                      dest-name="queue/quickstart_helloworld_Request"
+                      dest-name="queue/quickstart_business_service_Request"
                   />
               </jms-bus>
               <jms-bus busid="quickstartEsbChannel">

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/jboss-mq-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/jboss-mq-queue-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/jboss-mq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,7 +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_helloworld_Request">
-     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-</server>
\ No newline at end of file

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/src/org/jboss/soa/esb/samples/quickstart/businessservice/test/SendJMSMessage.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/src/org/jboss/soa/esb/samples/quickstart/businessservice/test/SendJMSMessage.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_service/src/org/jboss/soa/esb/samples/quickstart/businessservice/test/SendJMSMessage.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -42,7 +42,7 @@
     	Object tmp = iniCtx.lookup("ConnectionFactory");
     	QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
     	conn = qcf.createQueueConnection();
-    	que = (Queue) iniCtx.lookup("queue/quickstart_helloworld_Request");
+    	que = (Queue) iniCtx.lookup("queue/quickstart_business_service_Request");
     	session = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
     	conn.start();
     	System.out.println("Connection Started");
@@ -73,4 +73,4 @@
     	
     }
     
-}
\ No newline at end of file
+}

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf/base-build.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf/base-build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,87 +1,115 @@
 <project name="base-build" basedir=".">
-	
 	<!-- get the name of the directory where this file exists -->
 	<dirname property="pwd" file="${ant.file.base-build}"/>
 	
 	<dirname property="quickstarts.dir" file="${pwd}/"/>
 	<dirname property="product.dir" file="${quickstarts.dir}/.."/>
-	<property name="install.dir" value="${product.dir}/install"/>
 
-	<!-- load properties file: quickstarts.properties, with prefix quickstart. -->
 	<property file="${pwd}/quickstarts.properties" prefix="quickstart" />
-	
-	<!-- load properties file: install/deployment.properties, with prefix install.  -->
-	<property file="${install.dir}/deployment.properties" prefix="install" />
-	
+
     <property name="build.dir" value="${basedir}/build" />
     <property name="classes" value="${build.dir}/classes" />
-
-	<!-- 
-		check if org.jboss.esb.jboss.server.home has been specified in quickstarts.properites 
-	-->
-	<condition
-		property="org.jboss.esb.server.home"  
-		value="${quickstart.org.jboss.esb.server.home}" 
-		else="${install.org.jboss.esb.server.home}"> 
-		<isset property="quickstart.org.jboss.esb.server.home"/>
-	</condition>
 	
-	<!-- 
-		check if org.jboss.esb.jboss.server.config has been specified in quickstarts.properites 
-		default = "default"
-	-->
-	<condition 
-		property="org.jboss.esb.server.config" 
-		value="${quickstart.org.jboss.esb.server.config}"
-		else="default"> 
-		<isset property="quickstart.org.jboss.esb.server.config"/>
+	<!-- Are we embedded in a source hierarchy? -->
+	<condition property="hierarchy.source">
+		<available file="${product.dir}/build-distr.xml"/>
 	</condition>
-	
-	<!-- JBoss Application server deploy directory -->
-	<property name="org.jboss.esb.server.deploy.dir" 
-		value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
-	
-
-	<!-- lib directory for jbossesb jar files.  
-		 src distribution 		= ${product.dir}/build/jbossesb/lib
-		 bundled distribution	= ${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib
-		 ga 					= ${product.dir}/lib ? Need to verify all possible distributions. Daniel 20070525
-	-->
-	<condition property="esb.product.lib.dir.src.or.ga" 
-		value="${product.dir}/build/jbossesb/lib" else="${product.dir}/lib/ext">
-		<available file="${product.dir}/build/jbossesb/lib/jbossesb-rosetta.jar"/>
+	<!-- Are we embedded in a jbossesb distribution hierarchy? -->
+	<condition property="hierarchy.jbossesb">
+		<and>
+			<available file="${product.dir}/JBossORG-EULA.txt"/>
+			<not>
+				<available file="${product.dir}/server/default"/>
+			</not>
+		</and>
 	</condition>
+	<!-- Are we embedded in a jbossesb-server distribution hierarchy? -->
+	<condition property="hierarchy.jbossesb-server">
+		<and>
+			<available file="${product.dir}/JBossORG-EULA.txt"/>
+			<available file="${product.dir}/server/default"/>
+		</and>
+	</condition>
+	<!-- Do we build against a jbossesb distribution? -->
+	<condition property="build.jbossesb">
+		<or>
+			<isset property="hierarchy.source"/>
+			<isset property="hierarchy.jbossesb"/>
+		</or>
+	</condition>
 
-	<condition property="esb.product.lib.dir" 
-		value="${esb.product.lib.dir.src.or.ga}" else="${product.dir}/server/default/deploy/jbossesb.sar/lib">
-		<available file="${esb.product.lib.dir.src.or.ga}/jbossesb-rosetta.jar"/>
+	<condition property="build.recognised">
+		<or>
+			<isset property="build.jbossesb"/>
+			<isset property="hierarchy.jbossesb-server"/>
+		</or>
 	</condition>
 
-	<!-- fail if this is not a GA release distribution and the project has not yet been built -->	
-	<available file="${esb.product.lib.dir}/jbossesb-rosetta.jar" property="lib.exists" />
+	<fail unless="build.recognised" message="Cannot determine build hierarchy"/>
 
-	<!-- ext lib directory 
-		 src distribution 		= product/lib/ext
-		 bundled distribution	= ${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib
-		 ga 					= ${product.dir}/lib ? Need to verify all possible distributions. Daniel 20070525
-	-->
-    <condition property="esb.ext.lib.dir.src.or.bundled"
-        value="${product.dir}/lib/ext" else="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib">
-        <available file="${product.dir}/lib/ext" type="dir"/>
-    </condition>
-    <condition property="esb.ext.lib.dir"
-        value="${esb.ext.lib.dir.src.or.bundled}" else="${product.dir}/lib">
-		<isset property="esb.ext.lib.dir.src.or.bundled"/>
-    </condition>
+	<target name="check-jbossesb-dist" if="hierarchy.source">
+		<available file="${product.dir}/build/jbossesb" property="dist.exists"/>
+		<fail unless="dist.exists"
+			message="JBossESB must be built. Please run 'ant dist' in ${product.dir}"/>
+	</target>
 
-	<fail unless="lib.exists" message="JBossESB must be built. Please run 'ant' in ${product.dir}"/>
+	<target name="jbossesb-dependencies" if="build.jbossesb">
+		<condition property="base.jbossesb"
+			value="${product.dir}/build/jbossesb"
+			else="${product.dir}">
+			<isset property="hierarchy.source"/>
+		</condition>
+
+		<condition 
+			property="org.jboss.esb.server.config" 
+			value="${quickstart.org.jboss.esb.server.config}"
+			else="default"> 
+			<isset property="quickstart.org.jboss.esb.server.config"/>
+		</condition>
+
+		<property name="install.dir" value="${product.dir}/install"/>
+		<property file="${install.dir}/deployment.properties" prefix="install" />
+		<condition
+			property="org.jboss.esb.server.home"  
+			value="${quickstart.org.jboss.esb.server.home}" 
+			else="${install.org.jboss.esb.server.home}"> 
+			<isset property="quickstart.org.jboss.esb.server.home"/>
+		</condition>
+
+		<path id="deployment-classpath">
+			<fileset dir="${base.jbossesb}/lib" includes="*.jar"/>
+			<fileset dir="${base.jbossesb}/lib/ext" includes="*.jar"/>
+			<!-- 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"/>
+		</path>
+	</target>
+
+	<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"/>
+			<!-- 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"/>
+		</path>
+	</target>
 	
-	<!-- check if the application server support JBoss Messaging or JBossMQ -->
-	<condition property="jms.destinations.file" 
-			value="esb-quickstart-jbm-service.xml" else="esb-quickstart-jbmq-service.xml">
-			<available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging"/>
-	</condition>
-	
 	<property name="additional.deploys" value="none" />
 
     <available property="quickstart.lib.exists" file="${basedir}/lib"/>
@@ -100,30 +128,69 @@
         <path id="quickstart-lib-classpath"/>
     </target>
 
-    <target name="dependencies" depends="qslib-dependencies, non-qslib-dependencies">
-	<path id="compile-classpath">
+    <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"/>
 
-        <path refid="quickstart-dependencies-classpath" />
-        <path refid="quickstart-lib-classpath" />
-        <fileset dir="${esb.ext.lib.dir}" includes="*.jar" /> <!-- Product Dependencies. -->
-        <fileset dir="${product.dir}/lib" includes="*.jar" /> <!-- Product Dependencies. -->
-		<fileset dir="${esb.product.lib.dir}" includes="**/*.jar" /> <!-- Product Jars. -->
-		<fileset dir="${org.jboss.esb.server.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. -->
-	</path>
+        <condition property="messaging.present">
+            <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging"/>
+        </condition>
+        <condition property="messaging.present">
+            <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging.sar"/>
+        </condition>
 
-	<path id="exec-classpath">
-		<pathelement location="." />
-        <pathelement location="${basedir}/src" />
-		<pathelement location="${classes}" />
-		<fileset dir="${org.jboss.esb.server.home}/server/default/lib" includes="jboss-remoting.jar" /> <!-- Required for JMS Client Code. -->
-		<fileset dir="${org.jboss.esb.server.home}/server/default/lib" includes="jboss-j2ee.jar" /> <!-- Required for JMS Client Code. -->
-		<fileset dir="${esb.product.lib.dir}" includes="*.jar" /> <!-- Product Jars. -->
-		<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. -->
-		<path refid="compile-classpath" />
-	</path>
+        <condition property="messaging.scoped.present">
+            <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging/META-INF/jboss-service.xml"/>
+        </condition>
+        <condition property="messaging.scoped.present">
+            <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging.sar/META-INF/jboss-service.xml"/>
+        </condition>
+
+        <condition property="jbossmq.present">
+            <not>
+                <isset property="messaging.present"/>
+            </not>
+        </condition>
     </target>
 
+    <target name="messaging-dependencies" if="messaging.present">
+        <property name="jms.service.file" value="jbm-queue-service.xml"/>
+        <property name="jms.description" value="JBoss Messaging"/>
+    </target>
+
+    <target name="messaging-scoped-dependencies" if="messaging.scoped.present">
+
+        <fail message="Scoped JBoss Messaging not yet supported"/>
+        <property name="jms.service.file" value=""/>
+        <property name="jms.description" value="JBoss Messaging (scoped)"/>
+    </target>
+
+    <target name="jbossmq-dependencies" if="jbossmq.present">
+        <property name="jms.service.file" value="jbmq-queue-service.xml"/>
+        <property name="jms.description" value="JBoss MQ"/>
+    </target>
+
+	<target name="dependencies" depends="check-jbossesb-dist, qslib-dependencies, non-qslib-dependencies, jbossesb-dependencies, jbossesb-server-dependencies, messaging-config, messaging-dependencies, messaging-scoped-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. -->
+			<path refid="deployment-classpath" />
+			<fileset dir="${org.jboss.esb.server.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. -->
+		</path>
+
+		<path id="exec-classpath">
+			<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}/lib/endorsed" includes="*.jar" /> <!-- Required for JMS Client Code. -->
+			<!--fileset dir="${org.jboss.esb.server.home}/client" includes="*.jar" /--> <!-- Required for JMS Client Code. -->
+			<path refid="compile-classpath" />
+		</path>
+	</target>
+
     <target name="compile" depends="dependencies">
 		<mkdir dir="${classes}" />
 		<javac srcdir="${basedir}/src" destdir="${classes}" debug="true">
@@ -156,7 +223,15 @@
         <fail />
     </target>
 
-    <target name="deploy" depends="config">
+	<target name="deploy-messaging" unless="messaging.scoped.present">
+        <copy file="${jms.service.file}" overwrite="true" tofile="${org.jboss.esb.server.deploy.dir}/${ant.project.name}-queue-service.xml" failonerror="false"/>
+	</target>
+
+	<target name="undeploy-messaging">
+        <delete file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}-queue-service.xml" quiet="true"/>
+	</target>
+
+    <target name="deploy" depends="compile, config">
 		<description>deploy				will deploy the Quickstart .esb archive to JBoss ESB Server
     	</description>
 		<echo>Deploying Quickstart to JBoss ESB/App Server...</echo>
@@ -195,7 +270,7 @@
         </jar>
     </target>
 
-    <target name="package-deployment" depends="compile">
+    <target name="package-deployment">
 	<mkdir dir="lib"/>
         <jar destfile="${build.dir}/${ant.project.name}.esb">
                    <fileset dir="${build.dir}/classes" />
@@ -203,24 +278,27 @@
                    <fileset dir="${build.dir}" includes="deployment.xml"/>
                    <fileset dir="${build.dir}" includes="META-INF/**" />
                    <fileset dir="${basedir}/src" excludes="**/*.java" /> <!-- Please leave the src dir in here! -->
-                   <fileset dir="${basedir}" includes="jbm-queue-service.xml"/>
-                   <fileset dir="${basedir}" includes="${additional.deploys}" excludes="build/**" />
+                   <fileset dir="${basedir}" includes="${jms.service.file} ${additional.deploys}" excludes="build/**" />
                    <fileset dir="${basedir}/lib" includes="*.jar"/>
         </jar>
     </target>
 	
-    <target name="undeploy">
+    <target name="undeploy" depends="dependencies, undeploy-messaging">
 		<description>	undeploy			will undeploy the Quickstart .esb archive from JBoss ESB Server
 		</description>
         <!--delete file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb"  quiet="false"/-->        
     	
-    	<delete verbose="true" includeemptydirs="true">
-    		<fileset dir="${org.jboss.esb.server.deploy.dir}">
-    			<include name="${ant.project.name}.esb"/>        
-    		</fileset>
-    	</delete>
+    	<delete verbose="true" includeemptydirs="true" quiet="true"
+    	  dir="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb"/>
+    	<delete verbose="true" includeemptydirs="true" quiet="true"
+    	  file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb"/>
+
+        <antcall target="quickstart-specific-undeploys" />
 	</target>
 
+    <!-- Override this target in the Quickstart in order to make Quickstart specific dependencies. -->
+    <target name="quickstart-specific-dependencies"/>
+
     <target name="quickstart-specific-assemblies">
         <!-- Override this target in the Quickstart in order to make Quickstart specific assemblies. -->
         <echo message="No Quickstart specific assembly tasks." />
@@ -231,12 +309,23 @@
         <echo message="No Quickstart specific deployments being made." />
     </target>
 
+    <target name="quickstart-specific-undeploys">
+        <!-- Override this target in the Quickstart in order to make Quickstart specific undeployments. -->
+        <echo message="No Quickstart specific undeployments being made." />
+    </target>
+
     <target name="assert-ws-available">
         <available property="ws-available" file="${org.jboss.esb.server.deploy.dir}/jbossws.sar" type="dir" />
-        <fail unless="ws-available">**** DEPLOYMENT FAILED... Sorry, this Quickstart requires a JBoss Webservice container.  '${org.jboss.server.dir}' does not have a Webservice container.  Check the 'org.jboss.esb.server.home' property in ../quickstarts.properties"</fail>
+        <fail unless="ws-available">**** DEPLOYMENT FAILED... Sorry, this Quickstart requires a JBoss Webservice container.  '${org.jboss.esb.server.home}' does not have a Webservice container.  Check the 'org.jboss.esb.server.home' property in ../quickstarts.properties"</fail>
         <echo message="JBoss Webservice container found on target '${org.jboss.esb.server.deploy.dir}'." />
     </target>
 
+    <target name="assert-ejb3-available">
+        <available property="ejb3-available" file="${org.jboss.esb.server.deploy.dir}/ejb3.deployer" type="dir" />
+        <fail unless="ejb3-available">**** DEPLOYMENT FAILED... Sorry, this Quickstart requires a JBoss EJB3 container.  '${org.jboss.esb.server.home}' does not have an EJB3 container.  Check the 'org.jboss.esb.server.home' property in ../quickstarts.properties"</fail>
+        <echo message="JBoss EJB3 container found on target '${org.jboss.esb.server.deploy.dir}'." />
+    </target>
+
     <target name="deploy-esb-archive-before" unless="deploy-after">
         <!--copy file="${build.dir}/${ant.project.name}.esb" overwrite="true" todir="${org.jboss.esb.server.deploy.dir}" /-->
     	<copy todir="${org.jboss.esb.server.deploy.dir}">
@@ -254,19 +343,15 @@
     		</fileset>
 		</copy>
     </target>
-	
-	<target name="deploy-jms-dests">
+
+	<target name="deploy-jms-dests" depends="dependencies, deploy-messaging">
 		<description>deploy-jms-dests		will deploy the jms destinations for application server
 		</description>
-		
-        <copy file="${pwd}/jms/${jms.destinations.file}" overwrite="true" todir="${org.jboss.esb.server.deploy.dir}" />
 	</target>
 
-	<target name="undeploy-jms-dests">
+	<target name="undeploy-jms-dests" depends="dependencies, undeploy-messaging">
 		<description>undeploy-jms-dests		will undeploy the jms destination for application server
 		</description>
-		
-        <delete file="${org.jboss.esb.server.deploy.dir}/${jms.destinations.file}"/>
 	</target>
 	
     <target name="echoCP" depends="dependencies">
@@ -274,18 +359,16 @@
 		<echo message="Classpath is ${cp}" />
 	</target>
 	
-	<target name="echoPaths">
+	<target name="echoPaths" depends="dependencies">
 		<echo>
 			pwd : ${pwd}
 			quickstarts.dir : ${quickstarts.dir}
 			product.dir : ${product.dir}
-			install.dir : ${install.dir}
-			esb.product.lib.dir : ${esb.product.lib.dir}
-			esb.ext.lib.dir : ${esb.ext.lib.dir}
 			org.jboss.esb.server.home : ${org.jboss.esb.server.home}
 			org.jboss.esb.server.config : ${org.jboss.esb.server.config}
 			org.jboss.esb.jboss.server.deploy.dir : ${org.jboss.esb.server.deploy.dir}
-			jms.destinations.file : ${jms.destinations.file}
+			jms.service.file : ${jms.service.file}
+			jms.description : ${jms.description}
 		</echo>
 	</target>
 

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf/jms/esb-quickstart-jbm-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf/jms/esb-quickstart-jbm-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf/jms/esb-quickstart-jbm-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -6,320 +6,320 @@
 	</loader-repository>
   
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-		name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_Request"
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request"
 		xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
 	</mbean>
 	
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-		name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_Request_gw"
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_gw"
 		xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
 	</mbean>
 
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-		name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_Request_esb"
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_esb"
 		xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
 	</mbean>
 
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-		name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_action_Request"
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_action_Request"
 		xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
 	</mbean>
 
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-		name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_action_Response"
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_action_Response"
 		xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
 	</mbean>
 
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-		name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_db_registration"
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_db_registration"
 		xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
 	</mbean>
 
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-		name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_file_esb"
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_file_esb"
 		xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
 	</mbean>
 
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-		name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_ftp_esb"
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_ftp_esb"
 		xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
 	</mbean>
 
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-	   name="jboss.messaging.destination:service=Queue,name=quickstart_scripting_groovy_gw"
+	   name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_gw"
 	   xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-	   name="jboss.messaging.destination:service=Queue,name=quickstart_scripting_groovy_esb"
+	   name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_esb"
 	   xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-	   name="jboss.messaging.destination:service=Queue,name=quickstart_edi_groovy_xslt_gw"
+	   name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_gw"
 	   xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_edi_groovy_xslt_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_pojo_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_pojo_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_date_manipulation_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_date_manipulation_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_simple_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_simple_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb_reply"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb_reply"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_webservice_war1_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_war1_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_webservice_war1_reply"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_war1_reply"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_simple_transformation_Request"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_transformation_Request"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_simple_transformation_Response"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_transformation_Response"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_simple_cbr_Request"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_cbr_Request"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRExpressFreeShipping"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShipping"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRNormalShipping"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRNormalShipping"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRExpressFreeShippingAlert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShippingAlert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRNormalShippingAlert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRNormalShippingAlert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_more_action_Request"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Request"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_more_action_Response"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Response"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <!-- Fun CBR Demo -->
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_Request_GW"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Request_GW"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_Request_ESB"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Request_ESB"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_ToBlue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToBlue"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_Blue_Alert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Blue_Alert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_ToRed"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToRed"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_Red_Alert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Red_Alert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_ToGreenTransformer"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToGreenTransformer"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_ToGreen"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToGreen"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_Green_Alert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Green_Alert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <!-- Aggregator Demo -->
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Aggregator_Request_GW"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Request_GW"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Aggregator_Request_ESB"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Request_ESB"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Aggregator_ToBlue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_ToBlue"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Aggregator_Blue_Alert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Blue_Alert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Aggregator_ToRed"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_ToRed"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Aggregator_Red_Alert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Red_Alert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Aggregator_ToGreen"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_ToGreen"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Aggregator_Green_Alert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Green_Alert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
@@ -327,16 +327,21 @@
 
 	<!--	transform_CSV2XML quickstart queues		-->
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_CSV2XML_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_CSV2XML_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
-
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.messaging.destination:service=Queue,name=quickstart_spring_jpetstore_Request"
+           xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+		<depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
 </server>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf/jms/esb-quickstart-jbmq-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf/jms/esb-quickstart-jbmq-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf/jms/esb-quickstart-jbmq-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -2,35 +2,35 @@
 <server>
 
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_helloworld_Request">
+		 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request">
 	  <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_helloworld_Request_gw">
+		 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_gw">
 	  <depends optional-attribute-name="DestinationManager">
 		jboss.mq:service=DestinationManager
 	  </depends>
 	</mbean>
 
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_helloworld_Request_esb">
+		 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_esb">
 	  <depends optional-attribute-name="DestinationManager">
 		jboss.mq:service=DestinationManager
 	  </depends>
 	</mbean>
                       
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_helloworld_action_Request">
+		 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_action_Request">
 	  <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_helloworld_action_Response">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_action_Response">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
@@ -51,111 +51,111 @@
 	</mbean>
 
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		name="jboss.mq.destination:service=Queue,name=quickstart_helloworld_ftp_esb">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_ftp_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_scripting_groovy_gw">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_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_scripting_groovy_esb">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_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_edi_groovy_xslt_gw">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_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_edi_groovy_xslt_esb">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_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_transform_pojo_gw">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_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_transform_pojo_esb">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_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_date_manipulation_gw">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_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_date_manipulation_esb">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_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_transform_simple_gw">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_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_transform_simple_esb">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_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_webservice_jbossws_adapter_01_gw">
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_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_webservice_jbossws_adapter_01_esb">
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_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_webservice_jbossws_adapter_01_esb_reply">
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_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_webservice_war1_esb">
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_war1_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_webservice_war1_esb_reply">
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_war1_esb_reply">
         <depends optional-attribute-name="DestinationManager">
             jboss.mq:service=DestinationManager
         </depends>
@@ -163,137 +163,143 @@
 
 
 <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_simple_transformation_Request">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_transformation_Request">
   <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_simple_transformation_Response">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_transformation_Response">
   <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_simple_cbr_Request">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_cbr_Request">
   <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=CBRExpressFreeShipping">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShipping">
     <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=CBRNormalShipping">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=CBRNormalShipping">
     <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=CBRExpressFreeShippingAlert">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShippingAlert">
     <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=CBRNormalShippingAlert">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=CBRNormalShippingAlert">
     <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_more_action_Request">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Request">
   <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_more_action_Response">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Response">
   <depends optional-attribute-name="DestinationManager">
   	jboss.mq:service=DestinationManager
   </depends>
    </mbean>
   <!-- Fun CBR Demo -->
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Fun_CBR_Request_GW">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Request_GW">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Fun_CBR_Request_ESB">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Request_ESB">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Fun_CBR_ToBlue">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToBlue">
     <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_Fun_CBR_Blue_Alert">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Blue_Alert">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Fun_CBR_ToRed">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToRed">
     <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_Fun_CBR_Red_Alert">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Red_Alert">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Fun_CBR_ToGreenTransformer">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToGreenTransformer">
     <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_Fun_CBR_ToGreen">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToGreen">
     <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_Fun_CBR_Green_Alert">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Green_Alert">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   
     <!-- Aggregator Demo -->
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Aggregator_Request_GW">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Request_GW">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Aggregator_Request_ESB">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Request_ESB">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Aggregator_ToBlue">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_ToBlue">
     <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_Aggregator_Blue_Alert">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Blue_Alert">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Aggregator_ToRed">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_ToRed">
     <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_Aggregator_Red_Alert">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Red_Alert">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Aggregator_ToGreen">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_ToGreen">
     <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_Aggregator_Green_Alert">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Green_Alert">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
 
 	<!--	transform_CSV2XML quickstart queues		-->
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_transform_CSV2XML_gw">
+		 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_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_transform_CSV2XML_esb">
+		 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_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_spring_jpetstore_Request">
+	  <depends optional-attribute-name="DestinationManager">
+		jboss.mq:service=DestinationManager
+	  </depends>
+	</mbean>
 </server>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/build.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -8,7 +8,7 @@
 	<!-- Import the base Ant build script... -->
 	<import file="../conf/base-build.xml"/>
 	
-	<property name="myrules.drl" value="MyESBRules-XPath.drl"/>
+	<property name="myrules.drl" value="FunCBRRules-XPath.drl"/>
 	<property name="myrules.xpath.drl" value="XPathLanguage.dsl"/>
 	<property name="rules.jar.name" value="${build.dir}/${ant.project.name}_rules.jar"/>
 	

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/deployment.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/deployment.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/deployment.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jbossesb-deployment>
   <depends>jboss.esb:deployment=jbrules.esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Request_GW</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Request_ESB</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToBlue</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Blue_Alert</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToRed</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Red_Alert</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToGreenTransformer</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToGreen</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Green_Alert</depends>
 </jbossesb-deployment>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/jbm-queue-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -3,55 +3,55 @@
   
   <!-- Fun CBR Demo -->
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_Request_GW"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Request_GW"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_Request_ESB"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Request_ESB"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_ToBlue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToBlue"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_Blue_Alert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Blue_Alert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_ToRed"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToRed"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_Red_Alert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Red_Alert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_ToGreenTransformer"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToGreenTransformer"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_ToGreen"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToGreen"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_Green_Alert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Green_Alert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/jbmq-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/jbmq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  
+  <!-- Fun CBR Demo -->
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Request_GW">
+    <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_Fun_CBR_Request_ESB">
+    <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_Fun_CBR_ToBlue">
+    <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_Fun_CBR_Blue_Alert">
+    <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_Fun_CBR_ToRed">
+    <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_Fun_CBR_Red_Alert">
+    <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_Fun_CBR_ToGreenTransformer">
+    <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_Fun_CBR_ToGreen">
+    <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_Fun_CBR_Green_Alert">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/jboss-esb.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/jboss-esb.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -46,7 +46,7 @@
              </listeners>
         	<actions>
         		<action class="org.jboss.soa.esb.actions.ContentBasedRouter" name="ContentBasedRouter">
-        			<property name="ruleSet" value="MyESBRules-XPath.drl"/>
+        			<property name="ruleSet" value="FunCBRRules-XPath.drl"/>
         			<property name="ruleLanguage" value="XPathLanguage.dsl"/>
         			<property name="ruleReload" value="true"/> 
         			<property name="destinations">

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/readme.txt
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/readme.txt	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/readme.txt	2007-06-06 14:23:48 UTC (rev 12351)
@@ -31,7 +31,7 @@
 		rules logic that sets the status code of the message prior to sending it on to the CBR.
 	5.	In the fifth command window execute "ant runtest".  This will take a copy of SampleOrder.xml and shoot it into the primary JMS 
 		queue for this sample - quickstart_Fun_CBR_Request_GW. 
-		Open the MyESBRules-XPath.drl file and review the actual routing rules:
+		Open the FunCBRRules-XPath.drl file and review the actual routing rules:
 		rule "Red Routing Rule using XPATH"	
 		when
 			xpathEquals "/Order/@statusCode", "1"
@@ -41,7 +41,7 @@
 		end
 	6.	Open the SampleOrder.xml file and modify the statusCode to equal 0 or 2 and re-execute "ant runtest" to see that it properly 
 		routes to the correct endpoint.
-	7.	Open MyESBRules-XPath.drl and change the routes to the following:
+	7.	Open FunCBRRules-XPath.drl and change the routes to the following:
 		Blue for statusCode="1"
 		Red for statusCode="2"
 		Green for statusCode="0"

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/test/ReceiveJMSMessage.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/test/ReceiveJMSMessage.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/test/ReceiveJMSMessage.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -36,38 +36,86 @@
 	   InitialContext iniCtx = null;
 	   QueueConnectionFactory qcf = null;
 	   String receiveQueueName = "queue/D"; // Default to queue/D
+           private boolean initialised ;
 	   
 	   public ReceiveJMSMessage() {
 		   
 	   }
 	   public void receiveOne() {
-		   try {
-		   if (iniCtx == null) iniCtx = new InitialContext();
-	          if (qcf == null) qcf = (QueueConnectionFactory) iniCtx.lookup("ConnectionFactory");
-	          if (conn == null) {
-	              conn = qcf.createQueueConnection();
-	              conn.start();
-	          }	        
-	          receiverQueue = (Queue) iniCtx.lookup(receiveQueueName);
-	          receiverSession = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-	    	  queueReceiver = receiverSession.createReceiver(receiverQueue); 
-	    	  TextMessage msg = (TextMessage) queueReceiver.receive(2000);
-	    	  if (msg != null) {
+               if (!initialised) {
+                   initialise() ;
+               }
+               
+               if (receiverQueue != null) {
+                  try {
+                      TextMessage msg = (TextMessage) queueReceiver.receive();
+                      if (msg != null) {
 	    		  System.out.println("*********************************************************");
-	    		  System.out.println(msg);
+	    		  System.out.println(msg.getText());
 	    		  System.out.println("*********************************************************");
-	    	  }	
-		   } catch (Exception e) {
-			   System.out.println(e);
-		   }
+                      }
+                  } catch (final Exception ex) {
+                      cleanup() ;
+                      System.out.println(ex.getMessage()) ;
+                  }
+               }
+               
+               if (!initialised) {
+                   System.out.println("Pausing before reinitialising") ;
+                   try {
+                       Thread.sleep(5000) ;
+                   } catch (final InterruptedException ie) {
+                       // do nothing
+                   }
+               }
 	   }
+           
+           private void initialise()
+           {
+               try {
+                  if (iniCtx == null) iniCtx = new InitialContext();
+                  if (qcf == null) qcf = (QueueConnectionFactory) iniCtx.lookup("ConnectionFactory");
+                  if (conn == null) {
+                      conn = qcf.createQueueConnection();
+                      conn.start();
+                  }             
+                  receiverQueue = (Queue) iniCtx.lookup(receiveQueueName);
+                  receiverSession = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+                  queueReceiver = receiverSession.createReceiver(receiverQueue);
+                  initialised = true ;
+                  System.out.println("Initialised") ;
+               } catch (final Exception ex) {
+                   cleanup() ;
+               }
+           }
+           
+           public void cleanup() {
+               queueReceiver = null ;
+               receiverSession = null ;
+               receiverQueue = null ;
+               try {
+                   conn.stop() ;
+               } catch (final Exception ex) {
+                   // Do nothing ;
+               }
+               conn = null ;
+               qcf = null ;
+               iniCtx = null ;
+               initialised = false ;
+           }
+           
 	   public static void main(String[] args) {
-		      ReceiveJMSMessage receiver = new ReceiveJMSMessage();
+		      final ReceiveJMSMessage receiver = new ReceiveJMSMessage();
 		      
-		      if(args[0] != null) {
+		      if ((args.length > 0) && (args[0] != null)) {
 		    	  receiver.receiveQueueName = args[0];
 		    	  System.out.println("Receiving on: " + receiver.receiveQueueName );		    	 
-		      }		    	  
+		      }
+                      Runtime.getRuntime().addShutdownHook(new Thread() {
+                          public void run() {
+                              receiver.cleanup() ;
+                          }
+                      }) ;
 		      while (true) { // loop until I'm killed
 		    	  receiver.receiveOne();
 		      }

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/src/services/rules/FunCBRRules-XPath.drl (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/services/rules/FunCBRRules-XPath.drl)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/src/services/rules/FunCBRRules-XPath.drl	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/src/services/rules/FunCBRRules-XPath.drl	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,34 @@
+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;
+
+expander XPathLanguage.dsl
+
+#declare any global variables here
+global java.util.List destinations;
+
+rule "Blue Routing Rule using XPATH"	
+	when
+		xpathEquals "/Order/@statusCode", "0"
+	then 
+	    Log : "Blue Team";
+		Destination : "blue";		
+end
+
+rule "Red Routing Rule using XPATH"	
+	when
+		xpathEquals "/Order/@statusCode", "1"
+	then 
+	    Log : "Red Team";
+		Destination : "red";		
+end
+
+rule "Green Routing Rule using XPATH"	
+	when
+		xpathEquals "/Order/@statusCode", "2"
+	then 
+	    Log : "Green Team";
+		Destination : "green";		
+end
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/src/services/rules/MyESBRules-XPath.drl
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/src/services/rules/MyESBRules-XPath.drl	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/src/services/rules/MyESBRules-XPath.drl	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,34 +0,0 @@
-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;
-
-expander XPathLanguage.dsl
-
-#declare any global variables here
-global java.util.List destinations;
-
-rule "Blue Routing Rule using XPATH"	
-	when
-		xpathEquals "/Order/@statusCode", "0"
-	then 
-	    Log : "Blue Team";
-		Destination : "blue";		
-end
-
-rule "Red Routing Rule using XPATH"	
-	when
-		xpathEquals "/Order/@statusCode", "1"
-	then 
-	    Log : "Red Team";
-		Destination : "red";		
-end
-
-rule "Green Routing Rule using XPATH"	
-	when
-		xpathEquals "/Order/@statusCode", "2"
-	then 
-	    Log : "Green Team";
-		Destination : "green";		
-end
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/src/services/rules/XPathLanguage.dsl
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/src/services/rules/XPathLanguage.dsl	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/src/services/rules/XPathLanguage.dsl	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,7 +0,0 @@
-#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}") )
-[then]Log : "{message}"=System.out.println("{message}");
-[then]Destination : "{message}"=destinations.add("{message}");

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld/deployment.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld/deployment.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld/deployment.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,4 +1,4 @@
 <jbossesb-deployment>
-  <depends>jboss.messaging.destination:service=Queue,name=quickstart_helloworld_Request_esb</depends>
-  <depends>jboss.messaging.destination:service=Queue,name=quickstart_helloworld_Request_gw</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_gw</depends>
 </jbossesb-deployment>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld/jbm-queue-service-scoped.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld/jbm-queue-service-scoped.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -6,13 +6,13 @@
   </loader-repository>
   
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_Request_esb"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_esb"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_Request_gw"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_gw"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld/jbm-queue-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_Request_esb"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_esb"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_Request_gw"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_gw"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld/jbmq-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/helloworld/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld/jbmq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_esb">
+    <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_helloworld_Request_gw">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_action/deployment.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_action/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_action/deployment.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,5 @@
+<jbossesb-deployment>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_action_Request</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_action_Response</depends>
+</jbossesb-deployment>
+

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_action/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_action/jbm-queue-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_action/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_action_Request"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_action_Request"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
 
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_action_Response"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_action_Response"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_action/jbmq-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_action/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_action/jbmq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_action_Request">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_action_Response">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_db_registration/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_db_registration/build.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_db_registration/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -8,7 +8,7 @@
 	<!-- Import the base Ant build script... -->
 	<import file="../conf/base-build.xml"/>
 	
-  <target name="runtest" 
+  <target name="runtest" depends="compile"
 	  description="will send a JMS message to the ESB">
      <echo>Runs Test JMS Sender</echo>
      <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.helloworlddbregistration.test.SendJMSMessage" failonerror="true">

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_db_registration/deployment.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_db_registration/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_db_registration/deployment.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,3 @@
+<jbossesb-deployment>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_db_registration</depends>
+</jbossesb-deployment>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_db_registration/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_db_registration/jbm-queue-service-scoped.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_db_registration/jbm-queue-service-scoped.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -6,7 +6,7 @@
   </loader-repository>
 
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_db_registration"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_db_registration"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_db_registration/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_db_registration/jbm-queue-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_db_registration/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -2,7 +2,7 @@
 <server>
   
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_db_registration"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_db_registration"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_db_registration/jbmq-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_db_registration/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_db_registration/jbmq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_db_registration">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_file_action/deployment.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_file_action/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_file_action/deployment.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,4 @@
+<jbossesb-deployment>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_file_esb</depends>
+</jbossesb-deployment>
+

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_file_action/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_file_action/jbm-queue-service-scoped.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_file_action/jbm-queue-service-scoped.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -6,7 +6,7 @@
   </loader-repository>
 
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_file_esb"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_file_esb"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
   </mbean>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_file_action/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_file_action/jbm-queue-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_file_action/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_file_esb"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_file_esb"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
   </mbean>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_file_action/jbmq-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_file_action/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_file_action/jbmq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_file_esb">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_ftp_action/deployment.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_ftp_action/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_ftp_action/deployment.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,3 @@
+<jbossesb-deployment>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_ftp_esb</depends>
+</jbossesb-deployment>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_ftp_action/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_ftp_action/jbm-queue-service-scoped.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_ftp_action/jbm-queue-service-scoped.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -6,7 +6,7 @@
   </loader-repository>
 
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_ftp_esb"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_ftp_esb"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_ftp_action/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_ftp_action/jbm-queue-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_ftp_action/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_ftp_esb"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_ftp_esb"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_ftp_action/jbmq-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_ftp_action/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_ftp_action/jbmq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_ftp_esb">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/jbpm_simple1/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/jbpm_simple1/build.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/jbpm_simple1/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -5,48 +5,33 @@
 		${line.separator}
 	</description>
 	
+  <property name="additional.deploys" value="simpleProcessDefinition.xml"/>
+
 	<!-- Import the base Ant build script... -->
-	<import file="../conf/base-build.xml"/>
-	
-	<property name="jbpm.services.build.dir" value="${product.dir}/build/services/jbpm.esb" />
-	
-	<available file="${jbpm.services.build.dir}" type="dir" property="jbpm.isBuilt"/>
-	<fail unless="jbpm.isBuilt"
-		message="services/jbpm has not been built. Please build and re-run this target"  />	
-  
-	<path id="quickstart-dependencies-classpath">
-      <fileset dir="${basedir}" includes="build/**/*.jar"/>
-      <fileset dir="${basedir}" includes="build/**/*.xml"/>
-      <fileset dir="${jbpm.services.build.dir}" includes="*jar"/>
-    </path>
+  <import file="../conf/base-build.xml"/>
 
-	<target name="clean">
-		<delete dir="build" />
-	</target>
-	
-	<target name="prepare" depends="clean">
-    	<copy todir="build/${ant.project.name}.esb">
-			<fileset dir="${jbpm.services.build.dir}" />
-		</copy>
-		<mkdir dir="build/classes" />
-	</target>
-	
-    <target name="esb" depends="prepare,compile">
-	    <copy overwrite="true" file="jboss-esb.xml" todir="build/${ant.project.name}.esb/META-INF" />
-	    <copy file="simpleProcessDefinition.xml" todir="build/${ant.project.name}.esb" />
-		<copy todir="build/${ant.project.name}.esb">
-			<fileset dir="build/classes" includes="**/*" />
-		</copy>
-    </target>
+  <property name="jbossesb.inputdir" location="${build.dir}/inputdir"/>
 
-    <target name="deploy" depends="esb">
-		<delete quiet="true" dir="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb" />
-		<delete quiet="true" file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb" />
-		<copy todir="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb" >
-			<fileset dir="build/${ant.project.name}.esb" includes="**/*" />
-		</copy>
-    </target>
+  <target name="config">
+    <delete dir="${jbossesb.inputdir}" quiet="true"/>
+    <mkdir dir="${jbossesb.inputdir}"/>
+    <copy file="${basedir}/jboss-esb-unfiltered.xml" tofile="${basedir}/jboss-esb.xml" overwrite="true" filtering="true">
+      <filterset>
+        <filter token="INPUT_DIR" value="${jbossesb.inputdir}"/>
+      </filterset>
+    </copy>
+  </target>
 
+  <target name="deployesb-archive-after"/>
+  <target name="deployesb-archive-before"/>
+
+  <target name="quickstart-specific-deploys">
+    <property name="dest" location="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb"/>
+    <delete quiet="true" dir="${dest}"/>
+    <mkdir dir="${dest}"/>
+    <unjar src="${build.dir}/${ant.project.name}.esb" dest="${dest}"/>
+  </target>
+
 	<target name="runtest" depends="compile"
 		description="run full jBPM process lifecycle test">
 		<echo>Configure and invoke several jbpm processors</echo>
@@ -56,7 +41,7 @@
 				<pathelement location="." />
 			    <pathelement location="${basedir}/src" />
 				<pathelement location="${classes}" />
-				<path refid="compile-classpath" />
+				<path refid="exec-classpath" />
 			</classpath>
 			<sysproperty key="log4j.configuration" value="log4j.xml" />
 	     </java>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/jbpm_simple1/jboss-esb-unfiltered.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/jboss-esb-unfiltered.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/jbpm_simple1/jboss-esb-unfiltered.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/jbpm_simple1/jboss-esb-unfiltered.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,150 @@
+<?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>
+          <fs-provider name="FSprovider1">
+          	<fs-bus busid="jbpmProcessDeployerChannel" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".deployProcess"
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus>
+
+          	<fs-bus busid="jbpmProcessInstantiatorChannel" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".newProcessInstance"
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus>
+
+          	<fs-bus busid="jbpmSignalChannel" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".signalProcess"
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus>
+
+          	<fs-bus busid="jbpmProcessGetterChannel" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".getProcessInstance"
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus>
+          </fs-provider>
+      </providers>
+      
+      <services>         
+        <service 
+			category="jbpmQsCat1"
+			name="deployer"
+        	description="Deploys a process definition" >
+            <listeners>
+            	<fs-listener name="OrderProcessDeployer"
+            		busidref="jbpmProcessDeployerChannel"
+            		maxThreads="1"
+            		poll-frequency-seconds="3"
+            	/>
+            </listeners>
+            <actions>
+				<action	name="DeployFromFile" 
+						class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
+				>
+						<property name="command" value="DeployProcessDefinition" />
+						<property name="process-definition-file" value="/simpleProcessDefinition.xml" />
+				</action>
+			
+            </actions>
+        </service>
+
+        <service 
+			category="jbpmQsCat2"
+			name="instantiator"
+        	description="New Instance of 'simple' process" >
+            <listeners>
+            	<fs-listener name="ProcessInstantiator"
+            		busidref="jbpmProcessInstantiatorChannel"
+            		maxThreads="1"
+            		poll-frequency-seconds="3"
+            	/>
+            </listeners>
+
+            <actions>
+				<action	name="aNewInstance" 
+						class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
+				>
+						<property name="command" value="NewProcessInstanceCommand" />
+						<property name="process-definition-name" value="simple"/>
+						<property name="actor" value="FrankSinatra"/>
+						<property name="esb-to-jbpm">
+						  <variables>
+							<variable esb-name="eVar1" jbpm-name="counter"  value="45" />
+						  </variables>
+						</property>
+				</action>
+			
+            </actions>
+
+        </service>
+
+        <service 
+			category="jbpmQsCat3"
+			name="signalCommand"
+        	description="Signal a token or process" >
+            <listeners>
+            	<fs-listener name="Advancer"
+            		busidref="jbpmSignalChannel"
+            		maxThreads="1"
+            		poll-frequency-seconds="3"
+            	/>
+            </listeners>
+
+            <actions>
+				<action	name="aSignal" 
+						class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
+				>
+						<property name="command" value="SignalCommand" />
+				</action>
+			
+            </actions>
+
+        </service>
+
+        <service 
+			category="jbpmQsCat4"
+			name="retriever"
+        	description="Retrieve process instance" >
+            <listeners>
+            	<fs-listener name="ProcessInterrogator"
+            		busidref="jbpmProcessGetterChannel"
+            		maxThreads="1"
+            		poll-frequency-seconds="3"
+            	/>
+            </listeners>
+
+            <actions>
+				<action	name="aInterrogate" 
+						class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
+				>
+						<property name="command" value="GetProcessInstanceCommand" />
+						<property name="jbpm-to-esb">
+						  <variables>
+							<variable name="counter" />
+						  </variables>
+						</property>
+				</action>
+			
+            </actions>
+
+        </service>
+
+      </services>
+     
+</jbossesb>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/jbpm_simple1/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/jbpm_simple1/jboss-esb.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/jbpm_simple1/jboss-esb.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,150 +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>
-          <fs-provider name="FSprovider1">
-          	<fs-bus busid="jbpmProcessDeployerChannel" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".deployProcess"
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus>
-
-          	<fs-bus busid="jbpmProcessInstantiatorChannel" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".newProcessInstance"
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus>
-
-          	<fs-bus busid="jbpmSignalChannel" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".signalProcess"
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus>
-
-          	<fs-bus busid="jbpmProcessGetterChannel" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".getProcessInstance"
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus>
-          </fs-provider>
-      </providers>
-      
-      <services>         
-        <service 
-			category="jbpmQsCat1"
-			name="deployer"
-        	description="Deploys a process definition" >
-            <listeners>
-            	<fs-listener name="OrderProcessDeployer"
-            		busidref="jbpmProcessDeployerChannel"
-            		maxThreads="1"
-            		poll-frequency-seconds="3"
-            	/>
-            </listeners>
-            <actions>
-				<action	name="DeployFromFile" 
-						class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
-				>
-						<property name="command" value="DeployProcessDefinition" />
-						<property name="process-definition-file" value="/simpleProcessDefinition.xml" />
-				</action>
-			
-            </actions>
-        </service>
-
-        <service 
-			category="jbpmQsCat2"
-			name="instantiator"
-        	description="New Instance of 'simple' process" >
-            <listeners>
-            	<fs-listener name="ProcessInstantiator"
-            		busidref="jbpmProcessInstantiatorChannel"
-            		maxThreads="1"
-            		poll-frequency-seconds="3"
-            	/>
-            </listeners>
-
-            <actions>
-				<action	name="aNewInstance" 
-						class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
-				>
-						<property name="command" value="NewProcessInstanceCommand" />
-						<property name="process-definition-name" value="simple"/>
-						<property name="actor" value="FrankSinatra"/>
-						<property name="esb-to-jbpm">
-						  <variables>
-							<variable esb-name="eVar1" jbpm-name="counter"  value="45" />
-						  </variables>
-						</property>
-				</action>
-			
-            </actions>
-
-        </service>
-
-        <service 
-			category="jbpmQsCat3"
-			name="signalCommand"
-        	description="Signal a token or process" >
-            <listeners>
-            	<fs-listener name="Advancer"
-            		busidref="jbpmSignalChannel"
-            		maxThreads="1"
-            		poll-frequency-seconds="3"
-            	/>
-            </listeners>
-
-            <actions>
-				<action	name="aSignal" 
-						class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
-				>
-						<property name="command" value="SignalCommand" />
-				</action>
-			
-            </actions>
-
-        </service>
-
-        <service 
-			category="jbpmQsCat4"
-			name="retriever"
-        	description="Retrieve process instance" >
-            <listeners>
-            	<fs-listener name="ProcessInterrogator"
-            		busidref="jbpmProcessGetterChannel"
-            		maxThreads="1"
-            		poll-frequency-seconds="3"
-            	/>
-            </listeners>
-
-            <actions>
-				<action	name="aInterrogate" 
-						class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
-				>
-						<property name="command" value="GetProcessInstanceCommand" />
-						<property name="jbpm-to-esb">
-						  <variables>
-							<variable name="counter" />
-						  </variables>
-						</property>
-				</action>
-			
-            </actions>
-
-        </service>
-
-      </services>
-     
-</jbossesb>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/jbpm_simple1/src/org/jboss/soa/esb/samples/quickstart/jbpmsimple1/test/TestBpmProcessor.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/jbpm_simple1/src/org/jboss/soa/esb/samples/quickstart/jbpmsimple1/test/TestBpmProcessor.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/jbpm_simple1/src/org/jboss/soa/esb/samples/quickstart/jbpmsimple1/test/TestBpmProcessor.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -22,8 +22,6 @@
 
 package org.jboss.soa.esb.samples.quickstart.jbpmsimple1.test;
 
-import static org.junit.Assert.assertTrue;
-
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.PrintStream;
@@ -55,7 +53,7 @@
     	String os = System.getProperty("os.name","").toLowerCase();
     	String dflt = (os.indexOf("win")>=0) ? "/temp": "/tmp";
     	WORKDIR	= new File(System.getProperty("java.io.tmpdir",dflt));
-    };
+    }
 
 	public void run() throws Exception 
 	{
@@ -97,7 +95,6 @@
 	     catch (Exception _ex)
 	     {
 	         _ex.printStackTrace();
-	         assertTrue(false);
 	     }
 	}
 	

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/more_action/deployment.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/more_action/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/more_action/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/more_action/deployment.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,4 @@
+<jbossesb-deployment>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Request</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Response</depends>
+</jbossesb-deployment>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/more_action/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/more_action/jbm-queue-service-scoped.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/more_action/jbm-queue-service-scoped.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -6,14 +6,14 @@
   </loader-repository>
 
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_more_action_Request"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Request"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
 
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_more_action_Response"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Response"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/more_action/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/more_action/jbm-queue-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/more_action/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -2,14 +2,14 @@
 <server>
   
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_more_action_Request"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Request"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
 
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_more_action_Response"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Response"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/more_action/jbmq-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/more_action/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/more_action/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/more_action/jbmq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Request">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Response">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  
+</server>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/scripting_groovy/deployment.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/scripting_groovy/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/scripting_groovy/deployment.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,4 @@
+<jbossesb-deployment>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_gw</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_esb</depends>
+</jbossesb-deployment>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/scripting_groovy/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/scripting_groovy/jbm-queue-service-scoped.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/scripting_groovy/jbm-queue-service-scoped.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -5,13 +5,13 @@
   </loader-repository>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_scripting_groovy_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_scripting_groovy_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/scripting_groovy/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/scripting_groovy/jbm-queue-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/scripting_groovy/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_scripting_groovy_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_scripting_groovy_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/scripting_groovy/jbmq-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/scripting_groovy/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/scripting_groovy/jbmq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_gw">
+    <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_scripting_groovy_esb">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/build.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -9,8 +9,8 @@
 	<import file="../conf/base-build.xml"/>
 		
 	<property name="rules.jar.name" value="${ant.project.name}_rules.jar"/>
-	<property name="myrules.drl" value="MyESBRules.drl"/>
-	<property name="myrules.xpath.drl" value="MyESBRules-XPath.drl"/>
+	<property name="myrules.drl" value="SimpleCBRRules.drl"/>
+	<property name="myrules.xpath.drl" value="SimpleCBRRules-XPath.drl"/>
 	
     <property name="additional.deploys" value=" build/classes/${myrules.drl}, build/classes/${myrules.xpath.drl}" />
 	

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/deployment.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/deployment.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/deployment.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,4 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <jbossesb-deployment>
   <depends>jboss.esb:deployment=jbrules.esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_cbr_Request</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShipping</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=CBRNormalShipping</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShippingAlert</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=CBRNormalShippingAlert</depends>
 </jbossesb-deployment>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/jbm-queue-service-scoped.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/jbm-queue-service-scoped.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -5,32 +5,32 @@
   </loader-repository>
   
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_simple_cbr_Request"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_cbr_Request"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
 
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRExpressFreeShipping"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShipping"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRNormalShipping"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRNormalShipping"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRExpressFreeShippingAlert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShippingAlert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRNormalShippingAlert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRNormalShippingAlert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/jbm-queue-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -2,32 +2,32 @@
 <server>
   
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_simple_cbr_Request"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_cbr_Request"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
 
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRExpressFreeShipping"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShipping"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRNormalShipping"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRNormalShipping"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRExpressFreeShippingAlert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShippingAlert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRNormalShippingAlert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRNormalShippingAlert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/jbmq-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/jbmq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_cbr_Request">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShipping">
+    <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=CBRNormalShipping">
+    <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=CBRExpressFreeShippingAlert">
+    <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=CBRNormalShippingAlert">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/jboss-esb.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/jboss-esb.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -55,7 +55,7 @@
              </listeners>
             <actions>
                 <action class="org.jboss.soa.esb.actions.ContentBasedRouter" name="ContentBasedRouter">
-                    <property name="ruleSet" value="MyESBRules-XPath.drl"/>
+                    <property name="ruleSet" value="SimpleCBRRules-XPath.drl"/>
                     <property name="ruleLanguage" value="XPathLanguage.dsl"/>
                     <property name="ruleReload" value="true"/>
                     <property name="destinations">

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/readme.txt
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/readme.txt	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/readme.txt	2007-06-06 14:23:48 UTC (rev 12351)
@@ -43,13 +43,13 @@
 		netAmount="59.97" totalAmount="64.92" tax="4.95">
 
 	What follows are the highlights that uncover some of the magic associated with CBR:
-	*	src\services\rules\MyESBRules-XPath.drl is a JBoss Rules ruleset that has simple logic that evaluates
+	*	src\services\rules\SimpleCBRRules-XPath.drl is a JBoss Rules ruleset that has simple logic that evaluates
 		the totalAmount attribute of the SampleOrder.xml.  Over $50 means Free Express shipping, Under $50 means
 		Normal shipping. 
 
 Project file descriptions:
 ==========================
-	src\services\rules\MyESBRules.drl:
+	src\services\rules\SimpleCBRRules.drl:
 	Can be used for selecting a path based upon a piece of meta-data as opposed to the message content.  
 	It is not used in the example but provided anyway.
 
@@ -69,11 +69,11 @@
 		
 	jbossesb.xml 
 	Establishes 3 services.  The first is the perform the CBR evaluation and has this action:
-	  ruleSet="MyESBRules-XPath.drl" 
+	  ruleSet="SimpleCBRRules-XPath.drl" 
 	  ruleLanguage="XPathLanguage.dsl"
 	 XPathLanguage.dsl lives in core\services\rules\XPathLanguage.dsl and ships as jbossesb-rules.jar
 
-	 MyESBRules-XPath.drl:
+	 SimpleCBRRules-XPath.drl:
 	 routes to the appropriate destination service via this command Destination : "express";
  
 	 In the jbossesb.xml the "express" destination is related to:

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/test/ReceiveJMSMessage.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/test/ReceiveJMSMessage.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/test/ReceiveJMSMessage.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -36,38 +36,86 @@
 	   InitialContext iniCtx = null;
 	   QueueConnectionFactory qcf = null;
 	   String receiveQueueName = "queue/D"; // Default to queue/D
+           private boolean initialised ;
 	   
 	   public ReceiveJMSMessage() {
 		   
 	   }
 	   public void receiveOne() {
-		   try {
-		   if (iniCtx == null) iniCtx = new InitialContext();
-	          if (qcf == null) qcf = (QueueConnectionFactory) iniCtx.lookup("ConnectionFactory");
-	          if (conn == null) {
-	              conn = qcf.createQueueConnection();
-	              conn.start();
-	          }	        
-	          receiverQueue = (Queue) iniCtx.lookup(receiveQueueName);
-	          receiverSession = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-	    	  queueReceiver = receiverSession.createReceiver(receiverQueue); 
-	    	  TextMessage msg = (TextMessage) queueReceiver.receive(2000);
-	    	  if (msg != null) {
+               if (!initialised) {
+                   initialise() ;
+               }
+               
+               if (receiverQueue != null) {
+                  try {
+                      TextMessage msg = (TextMessage) queueReceiver.receive();
+                      if (msg != null) {
 	    		  System.out.println("*********************************************************");
-	    		  System.out.println(msg);
+	    		  System.out.println(msg.getText());
 	    		  System.out.println("*********************************************************");
-	    	  }	
-		   } catch (Exception e) {
-			   System.out.println(e);
-		   }
+                      }
+                  } catch (final Exception ex) {
+                      cleanup() ;
+                      System.out.println(ex.getMessage()) ;
+                  }
+               }
+               
+               if (!initialised) {
+                   System.out.println("Pausing before reinitialising") ;
+                   try {
+                       Thread.sleep(5000) ;
+                   } catch (final InterruptedException ie) {
+                       // do nothing
+                   }
+               }
 	   }
+           
+           private void initialise()
+           {
+               try {
+                  if (iniCtx == null) iniCtx = new InitialContext();
+                  if (qcf == null) qcf = (QueueConnectionFactory) iniCtx.lookup("ConnectionFactory");
+                  if (conn == null) {
+                      conn = qcf.createQueueConnection();
+                      conn.start();
+                  }             
+                  receiverQueue = (Queue) iniCtx.lookup(receiveQueueName);
+                  receiverSession = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+                  queueReceiver = receiverSession.createReceiver(receiverQueue);
+                  initialised = true ;
+                  System.out.println("Initialised") ;
+               } catch (final Exception ex) {
+                   cleanup() ;
+               }
+           }
+           
+           public void cleanup() {
+               queueReceiver = null ;
+               receiverSession = null ;
+               receiverQueue = null ;
+               try {
+                   conn.stop() ;
+               } catch (final Exception ex) {
+                   // Do nothing ;
+               }
+               conn = null ;
+               qcf = null ;
+               iniCtx = null ;
+               initialised = false ;
+           }
+           
 	   public static void main(String[] args) {
-		      ReceiveJMSMessage receiver = new ReceiveJMSMessage();
+		      final ReceiveJMSMessage receiver = new ReceiveJMSMessage();
 		      
-		      if(args[0] != null) {
+		      if ((args.length > 0) && (args[0] != null)) {
 		    	  receiver.receiveQueueName = args[0];
 		    	  System.out.println("Receiving on: " + receiver.receiveQueueName );		    	 
-		      }		    	  
+		      }
+                      Runtime.getRuntime().addShutdownHook(new Thread() {
+                          public void run() {
+                              receiver.cleanup() ;
+                          }
+                      }) ;
 		      while (true) { // loop until I'm killed
 		    	  receiver.receiveOne();
 		      }

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/src/services/rules/MyESBRules-XPath.drl
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/src/services/rules/MyESBRules-XPath.drl	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/src/services/rules/MyESBRules-XPath.drl	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,33 +0,0 @@
-#created on: Nov 8, 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;
-
-expander XPathLanguage.dsl
-
-#declare any global variables here
-global java.util.List destinations;
-
-rule "Routing Rule using XPATH"
-	
-	when
-		xpathGreaterThan "/Order/@totalAmount", "50.0"
-	then 
-	    Log : "EXPRESS";
-		Log : "EXPRESS";
-		Log : "Really It's EXPRESS Shipping";
-		Destination : "express";
-		
-end
-
-rule "Routing Rule using XPATH less"
-    when
-        xpathLessThan "/Order/@totalAmount", "50.0"
-    then
-	    Log : "NORMAL";
-		Log : "NORMAL";
-		Log : "Really It's NORMAL Shipping";
-		Destination : "normal";
-end
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/src/services/rules/MyESBRules.drl
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/src/services/rules/MyESBRules.drl	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/src/services/rules/MyESBRules.drl	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,29 +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;
-
-#declare any global variables here
-global java.util.List destinations;
-
-
-rule "Routing Rule - Serialized based message"
-	
-	when
-		Message( type == MessageType.JAVA_SERIALIZED)
-	then
-		System.out.println("Serialized");
-		destinations.add("serialized");
-		
-end
-
-rule "Routing Rule - XML based message"
-	
-	when
-		Message( type == MessageType.JBOSS_XML)
-	then 
-		System.out.println("JBoss_XML");
-		destinations.add("xml");
-end
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/src/services/rules/SimpleCBRRules-XPath.drl (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/services/rules/SimpleCBRRules-XPath.drl)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/src/services/rules/SimpleCBRRules-XPath.drl	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/src/services/rules/SimpleCBRRules-XPath.drl	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,33 @@
+#created on: Nov 8, 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;
+
+expander XPathLanguage.dsl
+
+#declare any global variables here
+global java.util.List destinations;
+
+rule "Routing Rule using XPATH"
+	
+	when
+		xpathGreaterThan "/Order/@totalAmount", "50.0"
+	then 
+	    Log : "EXPRESS";
+		Log : "EXPRESS";
+		Log : "Really It's EXPRESS Shipping";
+		Destination : "express";
+		
+end
+
+rule "Routing Rule using XPATH less"
+    when
+        xpathLessThan "/Order/@totalAmount", "50.0"
+    then
+	    Log : "NORMAL";
+		Log : "NORMAL";
+		Log : "Really It's NORMAL Shipping";
+		Destination : "normal";
+end
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/src/services/rules/SimpleCBRRules.drl (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/services/rules/SimpleCBRRules.drl)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/src/services/rules/SimpleCBRRules.drl	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/src/services/rules/SimpleCBRRules.drl	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,29 @@
+#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;
+
+#declare any global variables here
+global java.util.List destinations;
+
+
+rule "Routing Rule - Serialized based message"
+	
+	when
+		Message( type == MessageType.JAVA_SERIALIZED)
+	then
+		System.out.println("Serialized");
+		destinations.add("serialized");
+		
+end
+
+rule "Routing Rule - XML based message"
+	
+	when
+		Message( type == MessageType.JBOSS_XML)
+	then 
+		System.out.println("JBoss_XML");
+		destinations.add("xml");
+end
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/build.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,22 +0,0 @@
-<project name="Quickstart_helloworld_action" default="runtest" basedir=".">
-
-	<description> 
-		${ant.project.name}
-		${line.separator}
-	</description>
-
-	<!-- Import the base Ant build script... -->
-	<import file="../conf/base-build.xml" />
-	
-	<target name="runtest" depends="compile" description="sends a JMS message to the ESB">
-		<echo>Runs Test JMS Sender</echo>
-		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.helloworldaction.test.SendJMSMessage" failonerror="true">
-			<arg value="Hello World From JMS" />
-			<classpath refid="exec-classpath" />
-		</java>
-	</target>
-
-	<target name="spring-hotdeploy">
-		<touch file="jboss-esb.xml" />
-	</target>
-</project>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/build.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/build.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/build.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,22 @@
+<project name="Quickstart_helloworld_action" default="runtest" basedir=".">
+
+	<description> 
+		${ant.project.name}
+		${line.separator}
+	</description>
+
+	<!-- Import the base Ant build script... -->
+	<import file="../conf/base-build.xml" />
+	
+	<target name="runtest" depends="compile" description="sends a JMS message to the ESB">
+		<echo>Runs Test JMS Sender</echo>
+		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.helloworldaction.test.SendJMSMessage" failonerror="true">
+			<arg value="Hello World From JMS" />
+			<classpath refid="exec-classpath" />
+		</java>
+	</target>
+
+	<target name="spring-hotdeploy">
+		<touch file="jboss-esb.xml" />
+	</target>
+</project>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/jbm-queue-service.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,16 +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_helloworld_action_Request"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-
-  </mbean>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_action_Response"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-</server>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbm-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/jbm-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbm-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_action_Request"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_action_Response"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+</server>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/jboss-esb.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jboss-esb.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,50 +0,0 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
-
-    <providers>
-          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
-                      
-              <jms-bus busid="quickstartGwChannel">
-                  <jms-message-filter
-                      dest-type="QUEUE"
-                      dest-name="queue/quickstart_helloworld_action_Request"
-                  />
-              </jms-bus>
-              <jms-bus busid="quickstartEsbChannel">
-                  <jms-message-filter
-                      dest-type="QUEUE"
-                      dest-name="queue/B"
-                  />
-              </jms-bus>
-
-          </jms-provider>
-      </providers>
-      
-      <services>
-          
-        <service category="HelloWorld_ActionESB" 
-                 name="SimpleListener" 
-                 description="Hello World" >
-            <listeners>
-                <jms-listener name="JMS-Gateway"
-                    busidref="quickstartGwChannel"                         
-                    maxThreads="1"
-                    is-gateway="true"
-                />
-                <jms-listener name="JMS-ESBListener"
-                              busidref="quickstartEsbChannel"
-                              maxThreads="1"
-                />                
-            </listeners>
-            <actions>
-               <action name="sayHelloAopStyle" 
-               		class="org.jboss.soa.esb.samples.quickstart.spring.MySpringEnabledAction" 
-               		process="sayHelloAopStyle">
-               		<property name="exceptionMethod" value="exceptionHandler"/>
-               		<property name="springContextXml" value="spring-context.xml"/>
-               </action>                     
-            </actions>
-        </service>
-      </services>
-     
-</jbossesb>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jboss-esb.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/jboss-esb.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jboss-esb.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jboss-esb.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,50 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
+
+    <providers>
+          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
+                      
+              <jms-bus busid="quickstartGwChannel">
+                  <jms-message-filter
+                      dest-type="QUEUE"
+                      dest-name="queue/quickstart_helloworld_action_Request"
+                  />
+              </jms-bus>
+              <jms-bus busid="quickstartEsbChannel">
+                  <jms-message-filter
+                      dest-type="QUEUE"
+                      dest-name="queue/B"
+                  />
+              </jms-bus>
+
+          </jms-provider>
+      </providers>
+      
+      <services>
+          
+        <service category="HelloWorld_ActionESB" 
+                 name="SimpleListener" 
+                 description="Hello World" >
+            <listeners>
+                <jms-listener name="JMS-Gateway"
+                    busidref="quickstartGwChannel"                         
+                    maxThreads="1"
+                    is-gateway="true"
+                />
+                <jms-listener name="JMS-ESBListener"
+                              busidref="quickstartEsbChannel"
+                              maxThreads="1"
+                />                
+            </listeners>
+            <actions>
+               <action name="sayHelloAopStyle" 
+               		class="org.jboss.soa.esb.samples.quickstart.spring.MySpringEnabledAction" 
+               		process="sayHelloAopStyle">
+               		<property name="exceptionMethod" value="exceptionHandler"/>
+               		<property name="springContextXml" value="spring-context.xml"/>
+               </action>                     
+            </actions>
+        </service>
+      </services>
+     
+</jbossesb>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbossesb-gateway.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/jbossesb-gateway.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbossesb-gateway.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	NOTE: DO NOT MODIFY
-	This file was auto-generated.
--->
-<jbossesb-gateways parameterReloadSecs="5">
-<JMS-Gateway connection-factory="ConnectionFactory" destination-name="queue/quickstart_helloworld_action_Request" destination-type="queue" gatewayClass="org.jboss.soa.esb.listeners.gateway.JmsGatewayListener" maxThreads="1" service-description="Hello World" target-service-category="HelloWorld_ActionESB" target-service-name="SimpleListener"/>
-</jbossesb-gateways>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbossesb-gateway.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/jbossesb-gateway.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbossesb-gateway.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbossesb-gateway.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	NOTE: DO NOT MODIFY
+	This file was auto-generated.
+-->
+<jbossesb-gateways parameterReloadSecs="5">
+<JMS-Gateway connection-factory="ConnectionFactory" destination-name="queue/quickstart_helloworld_action_Request" destination-type="queue" gatewayClass="org.jboss.soa.esb.listeners.gateway.JmsGatewayListener" maxThreads="1" service-description="Hello World" target-service-category="HelloWorld_ActionESB" target-service-name="SimpleListener"/>
+</jbossesb-gateways>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbossesb-listener.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/jbossesb-listener.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbossesb-listener.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	NOTE: DO NOT MODIFY
-	This file was auto-generated.
--->
-<jbossesb-listeners parameterReloadSecs="5">
-<JMS-ESBListener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="1" service-category="HelloWorld_ActionESB" service-description="Hello World" service-name="SimpleListener">
-<EPR connection-factory="ConnectionFactory" destination-name="queue/B" destination-type="queue" protocol="jms"/>
-<action action="sayHelloAopStyle" class="org.jboss.soa.esb.samples.quickstart.spring.MySpringEnabledAction" exceptionMethod="exceptionHandler" process="sayHelloAopStyle" springContextXml="spring-context.xml"/>
-</JMS-ESBListener>
-</jbossesb-listeners>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbossesb-listener.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/jbossesb-listener.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbossesb-listener.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbossesb-listener.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	NOTE: DO NOT MODIFY
+	This file was auto-generated.
+-->
+<jbossesb-listeners parameterReloadSecs="5">
+<JMS-ESBListener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="1" service-category="HelloWorld_ActionESB" service-description="Hello World" service-name="SimpleListener">
+<EPR connection-factory="ConnectionFactory" destination-name="queue/B" destination-type="queue" protocol="jms"/>
+<action action="sayHelloAopStyle" class="org.jboss.soa.esb.samples.quickstart.spring.MySpringEnabledAction" exceptionMethod="exceptionHandler" process="sayHelloAopStyle" springContextXml="spring-context.xml"/>
+</JMS-ESBListener>
+</jbossesb-listeners>

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

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

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jndi.properties
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/jndi.properties	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jndi.properties	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,5 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-java.naming.factory.url.pkgs=org.jnp.interfaces
-

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jndi.properties (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/jndi.properties)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jndi.properties	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jndi.properties	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,5 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming
+java.naming.factory.url.pkgs=org.jnp.interfaces
+

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

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/juddi.properties (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/juddi.properties)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/juddi.properties	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/juddi.properties	2007-06-06 14:23:48 UTC (rev 12351)
@@ -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
+  

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/log4j.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/log4j.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/log4j.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id: log4j.xml,v 1.26.2.5 2005/09/15 09:31:02 dimitris Exp $ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
-   <!-- ============================== -->
-   <!-- Append messages to the console -->
-   <!-- ============================== -->
-
-   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-	  <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="INFO"/>
-   </category>
-   <!-- ======================= -->
-   <!-- Setup the Root category -->
-   <!-- ======================= -->
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-      <appender-ref ref="FILE"/>
-   </root>
-
-</log4j:configuration>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/log4j.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/log4j.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/log4j.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/log4j.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml,v 1.26.2.5 2005/09/15 09:31:02 dimitris Exp $ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+   <!-- ============================== -->
+   <!-- Append messages to the console -->
+   <!-- ============================== -->
+
+   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+	  <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="INFO"/>
+   </category>
+   <!-- ======================= -->
+   <!-- Setup the Root category -->
+   <!-- ======================= -->
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+      <appender-ref ref="FILE"/>
+   </root>
+
+</log4j:configuration>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/readme.txt
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/readme.txt	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/readme.txt	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,80 +0,0 @@
-Overview:
-=========
-	The purpose of the spring_aop quickstart sample is to show the use of Spring AOP.   
-	You can specify Spring bean XML definitions in jboss-esb.xml and lookup the beans
-	in your Action class. Each Action loads a single Spring IoC container upon first spring bean
-	invocation. Subsequent invocations will not load a new IoC container. Also, none of the Spring 
-	dependencies are included. You must manually add additional Spring dependency JARs to the classpath 
-	to create Spring beans that have special dependencies, like a DB connection pool.
-
-Running this quickstart:
-========================
-	Please refer to 'ant help-quickstarts' for prerequisites about the quickstarts and a
-	more detailed descripton of the different ways to run the quickstarts.
-
-To Run standalone mode:
-=======================
-    1.  In a command terminal window in the quickstart folder type 'ant deploy-jms-dests'.
-    2.  In a command terminal window in this folder ("Window1"), type 'ant run'.
-    3.  Open another command terminal window in this folder ("Window2"), type 'ant runtest'.
-    4.  Switch back to "Window1" to see the output from the ESB
-    5. 	Shutdown the listener by simply using Ctrl-C in that window.
-
-To Run '.esb' archive mode:
-===========================
-    1.  In a command terminal window in this folder ("Window1"), type 'ant undeploy-jms-dests'.
-    1.  In a command terminal window in this folder ("Window1"), type 'ant deploy'.
-    2.  Open another command terminal window in this folder ("Window2"), type 'ant runtest'.
-    3.  Switch back to Application Server console to see the output from the ESB
-
-To Run '.esb' archive mode:
-===========================
-    1.  In a command terminal window in this folder ("Window1"), type 'ant undeploy-jms-dests'.
-    1.  In a command terminal window in this folder ("Window1"), type 'ant deploy'.
-    2.  Open another command terminal window in this folder ("Window2"), type 'ant runtest'.
-    3.  Switch back to Application Server console to see the output from the ESB
-
-	'run' target description:
-	In a command prompt window, start the listeners by simply running "ant"
-	in this directory.  You might review the build.xml file to see how it is setup.
-	More details on the build.xml can be found later in this document.  Shutdown
-	the listener by simply using Ctrl-C in that window.
-
-	'runtest' target description:
-	In a separate command prompt window, run "ant runtest" to shoot a JMS message
-	into the listener which will then invoke the MySpringEnabledAction.  
-	You can modify the build.xml to change the phrase "Hello World" to something 
-	else and re-run "ant runtest". You can modify spring-context-hello.xml and/or 
-	spring-context-goodbye.xml and change the greeting value of the Spring beans.    
-	
-	After you have run the test and seen the activity on the console also use the a queue viewer
-	like the one found in the JBoss JMX Console (if you are using JBossMQ) to 
-	see the modified message in the outbound queue: quickstart_helloworld_action_Response
-
-Project file descriptions:
-==========================
-	Review the helloworld quickstart as the majority of this is similiar to
-	that example
-
-	MySpringEnabledAction.java:
-	There is one action method called "sayHelloAopStyle". The method 
-	gets triggered when a JMS message is sent. "sayHelloAopStyle" actually uses the message
-	payload to get the greeting, but the interceptor will change the greeting.
-
-	jboss-esb.xml
-	The method, "sayHelloAopStyle" uses a spring interceptor to change the greeting message.
-	Notice that the action does not have any println statements, "MyInterceptor"
-	is doing all of the console output work. The interceptor is configured in spring-context.xml, 
-	not annotation style. You can change the greeting in build.xml. The greeting is sent to the 
-	ESB via JMS.
-	<action name="sayHelloAopStyle" 
-               	  class="org.jboss.soa.esb.samples.quickstart.helloworldaction.MySpringEnabledAction" 
-               	  process="sayHelloAopStyle">
-               	  <property name="exceptionMethod" value="exceptionHandler"/>
-               	  <property name="springContextXml" value="spring-context.xml"/>
-    </action>  
-    	  
-	An ESB action class must have a constructor that accepts a ConfigTree argument like the following:
-	public MyJMSListenerAction(ConfigTree config) { _config = config; } 
- 
-	A ConfigTree is an object holding any attributes associated with the action declaration in the jbossesb.xml

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/readme.txt (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/readme.txt)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/readme.txt	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/readme.txt	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,80 @@
+Overview:
+=========
+	The purpose of the spring_aop quickstart sample is to show the use of Spring AOP.   
+	You can specify Spring bean XML definitions in jboss-esb.xml and lookup the beans
+	in your Action class. Each Action loads a single Spring IoC container upon first spring bean
+	invocation. Subsequent invocations will not load a new IoC container. Also, none of the Spring 
+	dependencies are included. You must manually add additional Spring dependency JARs to the classpath 
+	to create Spring beans that have special dependencies, like a DB connection pool.
+
+Running this quickstart:
+========================
+	Please refer to 'ant help-quickstarts' for prerequisites about the quickstarts and a
+	more detailed descripton of the different ways to run the quickstarts.
+
+To Run standalone mode:
+=======================
+    1.  In a command terminal window in the quickstart folder type 'ant deploy-jms-dests'.
+    2.  In a command terminal window in this folder ("Window1"), type 'ant run'.
+    3.  Open another command terminal window in this folder ("Window2"), type 'ant runtest'.
+    4.  Switch back to "Window1" to see the output from the ESB
+    5. 	Shutdown the listener by simply using Ctrl-C in that window.
+
+To Run '.esb' archive mode:
+===========================
+    1.  In a command terminal window in this folder ("Window1"), type 'ant undeploy-jms-dests'.
+    1.  In a command terminal window in this folder ("Window1"), type 'ant deploy'.
+    2.  Open another command terminal window in this folder ("Window2"), type 'ant runtest'.
+    3.  Switch back to Application Server console to see the output from the ESB
+
+To Run '.esb' archive mode:
+===========================
+    1.  In a command terminal window in this folder ("Window1"), type 'ant undeploy-jms-dests'.
+    1.  In a command terminal window in this folder ("Window1"), type 'ant deploy'.
+    2.  Open another command terminal window in this folder ("Window2"), type 'ant runtest'.
+    3.  Switch back to Application Server console to see the output from the ESB
+
+	'run' target description:
+	In a command prompt window, start the listeners by simply running "ant"
+	in this directory.  You might review the build.xml file to see how it is setup.
+	More details on the build.xml can be found later in this document.  Shutdown
+	the listener by simply using Ctrl-C in that window.
+
+	'runtest' target description:
+	In a separate command prompt window, run "ant runtest" to shoot a JMS message
+	into the listener which will then invoke the MySpringEnabledAction.  
+	You can modify the build.xml to change the phrase "Hello World" to something 
+	else and re-run "ant runtest". You can modify spring-context-hello.xml and/or 
+	spring-context-goodbye.xml and change the greeting value of the Spring beans.    
+	
+	After you have run the test and seen the activity on the console also use the a queue viewer
+	like the one found in the JBoss JMX Console (if you are using JBossMQ) to 
+	see the modified message in the outbound queue: quickstart_helloworld_action_Response
+
+Project file descriptions:
+==========================
+	Review the helloworld quickstart as the majority of this is similiar to
+	that example
+
+	MySpringEnabledAction.java:
+	There is one action method called "sayHelloAopStyle". The method 
+	gets triggered when a JMS message is sent. "sayHelloAopStyle" actually uses the message
+	payload to get the greeting, but the interceptor will change the greeting.
+
+	jboss-esb.xml
+	The method, "sayHelloAopStyle" uses a spring interceptor to change the greeting message.
+	Notice that the action does not have any println statements, "MyInterceptor"
+	is doing all of the console output work. The interceptor is configured in spring-context.xml, 
+	not annotation style. You can change the greeting in build.xml. The greeting is sent to the 
+	ESB via JMS.
+	<action name="sayHelloAopStyle" 
+               	  class="org.jboss.soa.esb.samples.quickstart.helloworldaction.MySpringEnabledAction" 
+               	  process="sayHelloAopStyle">
+               	  <property name="exceptionMethod" value="exceptionHandler"/>
+               	  <property name="springContextXml" value="spring-context.xml"/>
+    </action>  
+    	  
+	An ESB action class must have a constructor that accepts a ConfigTree argument like the following:
+	public MyJMSListenerAction(ConfigTree config) { _config = config; } 
+ 
+	A ConfigTree is an object holding any attributes associated with the action declaration in the jbossesb.xml

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/spring-context.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/spring-context.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/spring-context.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-           http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
-
-	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
-	<bean id="helloObject" class="org.jboss.soa.esb.samples.quickstart.spring.SaySomething"/>
-
-	<aop:config proxy-target-class="true">
-		<aop:advisor pointcut="execution(* setGreeting*(..))" advice-ref="myInterceptor" />
-	</aop:config>
-
-	<bean id="myInterceptor"
-		class="org.jboss.soa.esb.samples.quickstart.spring.MyInterceptor"/>
-</beans>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/spring-context.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/spring-context.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/spring-context.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/spring-context.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+           http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+
+	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
+	<bean id="helloObject" class="org.jboss.soa.esb.samples.quickstart.spring.SaySomething"/>
+
+	<aop:config proxy-target-class="true">
+		<aop:advisor pointcut="execution(* setGreeting*(..))" advice-ref="myInterceptor" />
+	</aop:config>
+
+	<bean id="myInterceptor"
+		class="org.jboss.soa.esb.samples.quickstart.spring.MyInterceptor"/>
+</beans>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src/org)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src/org/jboss)

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

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

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

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/MyInterceptor.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/MyInterceptor.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/MyInterceptor.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,55 +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.quickstart.spring;
-
-import java.lang.reflect.Method;
-import org.springframework.aop.AfterReturningAdvice;
-
-/**
- * SpringAOP interceptor example.
- * 
- * <p>Simple after-method returning advice that intercepts a method
- * invocation. 
- * 
- * @see spring-context.xml 
- * 
- * @author <a href="mailto:james.williams at redhat.com">James Williams</a>.
- * 
- */
-public class MyInterceptor implements AfterReturningAdvice
-{
-
-   public void afterReturning(Object returnValue, Method m, Object[] args,
-         Object target) throws Exception
-   {
-      SaySomething something = (SaySomething) target;
-
-      System.out.println("*****GREETING VALUE PRE-INTERCEPTOR*****");
-      System.out.println(something.getGreeting());
-
-      something
-            .setGreeting("I used AOP to change the greeting! JMS has got nothin on me!");
-      System.out.println("*****GREETING VALUE POST-INTERCEPTOR*****");
-
-      System.out.println(something.getGreeting());
-   }
-
-}

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/MyInterceptor.java (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/MyInterceptor.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/MyInterceptor.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/MyInterceptor.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,55 @@
+/*
+ * 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.quickstart.spring;
+
+import java.lang.reflect.Method;
+import org.springframework.aop.AfterReturningAdvice;
+
+/**
+ * SpringAOP interceptor example.
+ * 
+ * <p>Simple after-method returning advice that intercepts a method
+ * invocation. 
+ * 
+ * @see spring-context.xml 
+ * 
+ * @author <a href="mailto:james.williams at redhat.com">James Williams</a>.
+ * 
+ */
+public class MyInterceptor implements AfterReturningAdvice
+{
+
+   public void afterReturning(Object returnValue, Method m, Object[] args,
+         Object target) throws Exception
+   {
+      SaySomething something = (SaySomething) target;
+
+      System.out.println("*****GREETING VALUE PRE-INTERCEPTOR*****");
+      System.out.println(something.getGreeting());
+
+      something
+            .setGreeting("I used AOP to change the greeting! JMS has got nothin on me!");
+      System.out.println("*****GREETING VALUE POST-INTERCEPTOR*****");
+
+      System.out.println(something.getGreeting());
+   }
+
+}

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/MySpringEnabledAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/MySpringEnabledAction.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/MySpringEnabledAction.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,61 +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.quickstart.spring;
-
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.actions.AbstractSpringAction;
-import org.jboss.soa.esb.actions.ActionLifecycleException;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Body;
-import org.jboss.soa.esb.message.Message;
-
-/**
- * Spring enabled action that leverages SpringAOP.
- * 
- * 
- * @see org.jboss.soa.esb.actions.AbstractSpringAction 
- * @see spring-context.xml
- * 
- * @author <a href="mailto:james.williams at redhat.com">James Williams</a>.
- * 
- */
-public class MySpringEnabledAction extends AbstractSpringAction
-{
-   public MySpringEnabledAction(ConfigTree config) throws Exception
-   {
-      configTree = config;
-   }
-
-   public Message sayHelloAopStyle(Message message) throws Exception
-   {
-
-      SaySomething hello = (SaySomething) getBeanFactory().getBean(
-            "helloObject");
-      logHeader();
-      // interceptor will get applied here
-      // check the console output to see the interceptor changed the message
-      hello.setGreeting(new String(message.getBody().getByteArray()));
-      logFooter();
-
-      return message;
-   }
-
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/MySpringEnabledAction.java (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/MySpringEnabledAction.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/MySpringEnabledAction.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/MySpringEnabledAction.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,61 @@
+/*
+ * 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.quickstart.spring;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.actions.AbstractSpringAction;
+import org.jboss.soa.esb.actions.ActionLifecycleException;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Body;
+import org.jboss.soa.esb.message.Message;
+
+/**
+ * Spring enabled action that leverages SpringAOP.
+ * 
+ * 
+ * @see org.jboss.soa.esb.actions.AbstractSpringAction 
+ * @see spring-context.xml
+ * 
+ * @author <a href="mailto:james.williams at redhat.com">James Williams</a>.
+ * 
+ */
+public class MySpringEnabledAction extends AbstractSpringAction
+{
+   public MySpringEnabledAction(ConfigTree config) throws Exception
+   {
+      configTree = config;
+   }
+
+   public Message sayHelloAopStyle(Message message) throws Exception
+   {
+
+      SaySomething hello = (SaySomething) getBeanFactory().getBean(
+            "helloObject");
+      logHeader();
+      // interceptor will get applied here
+      // check the console output to see the interceptor changed the message
+      hello.setGreeting(new String(message.getBody().getByteArray()));
+      logFooter();
+
+      return message;
+   }
+
+}
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/SaySomething.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/SaySomething.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/SaySomething.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,46 +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.quickstart.spring;
-
-import java.io.Serializable;
-
-/**
- * Simple POJO with a single String getter/setter.
- * 
- * @see spring-context.xml
- * 
- * @author <a href="mailto:james.williams at redhat.com">James Williams</a>.
- * 
- */
-public class SaySomething implements Serializable
-{
-   private String greeting;
-
-   public String getGreeting()
-   {
-      return greeting;
-   }
-
-   public void setGreeting(String greeting)
-   {
-      this.greeting = greeting;
-   }
-}

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/SaySomething.java (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/SaySomething.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/SaySomething.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/SaySomething.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,46 @@
+/*
+ * 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.quickstart.spring;
+
+import java.io.Serializable;
+
+/**
+ * Simple POJO with a single String getter/setter.
+ * 
+ * @see spring-context.xml
+ * 
+ * @author <a href="mailto:james.williams at redhat.com">James Williams</a>.
+ * 
+ */
+public class SaySomething implements Serializable
+{
+   private String greeting;
+
+   public String getGreeting()
+   {
+      return greeting;
+   }
+
+   public void setGreeting(String greeting)
+   {
+      this.greeting = greeting;
+   }
+}

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/test (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/test)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,81 +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.quickstart.helloworldaction.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;
-
-/**
- * Send a JMS message that the ESB will listen for.
- * 
- * @author <a href="mailto:james.williams at redhat.com">James Williams</a>.
- * 
- */
-public class SendJMSMessage
-{
-   QueueConnection conn;
-
-   QueueSession session;
-
-   Queue que;
-
-   public void setupConnection() throws JMSException, NamingException
-   {
-      InitialContext iniCtx = new InitialContext();
-      Object tmp = iniCtx.lookup("ConnectionFactory");
-      QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
-      conn = qcf.createQueueConnection();
-      que = (Queue) iniCtx.lookup("queue/quickstart_helloworld_action_Request");
-      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 static void main(String args[]) throws Exception
-   {
-      SendJMSMessage sm = new SendJMSMessage();
-      sm.setupConnection();
-      sm.sendAMessage(args[0]);
-      sm.stop();
-   }
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,81 @@
+/*
+ * 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.quickstart.helloworldaction.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;
+
+/**
+ * Send a JMS message that the ESB will listen for.
+ * 
+ * @author <a href="mailto:james.williams at redhat.com">James Williams</a>.
+ * 
+ */
+public class SendJMSMessage
+{
+   QueueConnection conn;
+
+   QueueSession session;
+
+   Queue que;
+
+   public void setupConnection() throws JMSException, NamingException
+   {
+      InitialContext iniCtx = new InitialContext();
+      Object tmp = iniCtx.lookup("ConnectionFactory");
+      QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
+      conn = qcf.createQueueConnection();
+      que = (Queue) iniCtx.lookup("queue/quickstart_helloworld_action_Request");
+      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 static void main(String args[]) throws Exception
+   {
+      SendJMSMessage sm = new SendJMSMessage();
+      sm.setupConnection();
+      sm.sendAMessage(args[0]);
+      sm.stop();
+   }
+}
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/build.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,20 +0,0 @@
-<project name="spring_helloworld" default="runtest" basedir=".">
-	
-	<description> 
-		${ant.project.name}
-		${line.separator}
-	</description>
-	
-	<!-- Import the base Ant build script... -->
-	<import file="../conf/base-build.xml"/>
-	
-	<target name="runtest" depends="compile"
-		description="sends a JMS message to the ESB">
-		<echo>Runs Test JMS Sender</echo>
-		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.spring.test.SendJMSMessage" failonerror="true">
-			<arg value="Hello World From JMS"/>
-			<classpath refid="exec-classpath"/>
-		</java>
-	</target>
-	
-</project>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/build.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/build.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/build.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,20 @@
+<project name="spring_helloworld" default="runtest" basedir=".">
+	
+	<description> 
+		${ant.project.name}
+		${line.separator}
+	</description>
+	
+	<!-- Import the base Ant build script... -->
+	<import file="../conf/base-build.xml"/>
+	
+	<target name="runtest" depends="compile"
+		description="sends a JMS message to the ESB">
+		<echo>Runs Test JMS Sender</echo>
+		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.spring.test.SendJMSMessage" failonerror="true">
+			<arg value="Hello World From JMS"/>
+			<classpath refid="exec-classpath"/>
+		</java>
+	</target>
+	
+</project>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/jbm-queue-service.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,16 +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_helloworld_action_Request"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-
-  </mbean>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_action_Response"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-</server>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbm-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/jbm-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbm-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_action_Request"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_action_Response"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+</server>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/jboss-esb.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jboss-esb.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,62 +0,0 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
-
-    <providers>
-          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
-                      
-              <jms-bus busid="quickstartGwChannel">
-                  <jms-message-filter
-                      dest-type="QUEUE"
-                      dest-name="queue/quickstart_helloworld_action_Request"
-                  />
-              </jms-bus>
-              <jms-bus busid="quickstartEsbChannel">
-                  <jms-message-filter
-                      dest-type="QUEUE"
-                      dest-name="queue/B"
-                  />
-              </jms-bus>
-
-          </jms-provider>
-      </providers>
-      
-      <services>
-          
-        <service category="HelloWorld_ActionESB" 
-                 name="SimpleListener" 
-                 description="Hello World" >
-            <listeners>
-                <jms-listener name="JMS-Gateway"
-                    busidref="quickstartGwChannel"                         
-                    maxThreads="1"
-                    is-gateway="true"
-                />
-                <jms-listener name="JMS-ESBListener"
-                              busidref="quickstartEsbChannel"
-                              maxThreads="1"
-                />                
-            </listeners>
-            <actions>
-               <action name="sayHello" 
-               		class="org.jboss.soa.esb.samples.quickstart.spring.MySpringEnabledAction" 
-               		process="sayHelloSpring,displayMessage">
-               		<property name="exceptionMethod" value="exceptionHandler"/>
-               		<property name="springContextXml" value="spring-context-hello.xml"/>
-               </action>
-               <action name="addGoodbye" 
-               		class="org.jboss.soa.esb.samples.quickstart.spring.MySpringEnabledAction" 
-               		process="sayGoodbyeSpring,displayMessage">
-               		<property name="exceptionMethod" value="exceptionHandler"/>
-               		<property name="springContextXml" value="spring-context-goodbye.xml"/>
-               </action>               
-               <action name="addHelloGoodbye" 
-               		class="org.jboss.soa.esb.samples.quickstart.spring.MySpringEnabledAction" 
-               		process="sayHelloSpring,sayGoodbyeSpring,displayMessage">
-               		<property name="exceptionMethod" value="exceptionHandler"/>
-               		<property name="springContextXml" value="spring-context-goodbye.xml,spring-context-hello.xml"/>
-               </action>    
-            </actions>
-        </service>
-      </services>
-     
-</jbossesb>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jboss-esb.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/jboss-esb.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jboss-esb.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jboss-esb.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,62 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
+
+    <providers>
+          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
+                      
+              <jms-bus busid="quickstartGwChannel">
+                  <jms-message-filter
+                      dest-type="QUEUE"
+                      dest-name="queue/quickstart_helloworld_action_Request"
+                  />
+              </jms-bus>
+              <jms-bus busid="quickstartEsbChannel">
+                  <jms-message-filter
+                      dest-type="QUEUE"
+                      dest-name="queue/B"
+                  />
+              </jms-bus>
+
+          </jms-provider>
+      </providers>
+      
+      <services>
+          
+        <service category="HelloWorld_ActionESB" 
+                 name="SimpleListener" 
+                 description="Hello World" >
+            <listeners>
+                <jms-listener name="JMS-Gateway"
+                    busidref="quickstartGwChannel"                         
+                    maxThreads="1"
+                    is-gateway="true"
+                />
+                <jms-listener name="JMS-ESBListener"
+                              busidref="quickstartEsbChannel"
+                              maxThreads="1"
+                />                
+            </listeners>
+            <actions>
+               <action name="sayHello" 
+               		class="org.jboss.soa.esb.samples.quickstart.spring.MySpringEnabledAction" 
+               		process="sayHelloSpring,displayMessage">
+               		<property name="exceptionMethod" value="exceptionHandler"/>
+               		<property name="springContextXml" value="spring-context-hello.xml"/>
+               </action>
+               <action name="addGoodbye" 
+               		class="org.jboss.soa.esb.samples.quickstart.spring.MySpringEnabledAction" 
+               		process="sayGoodbyeSpring,displayMessage">
+               		<property name="exceptionMethod" value="exceptionHandler"/>
+               		<property name="springContextXml" value="spring-context-goodbye.xml"/>
+               </action>               
+               <action name="addHelloGoodbye" 
+               		class="org.jboss.soa.esb.samples.quickstart.spring.MySpringEnabledAction" 
+               		process="sayHelloSpring,sayGoodbyeSpring,displayMessage">
+               		<property name="exceptionMethod" value="exceptionHandler"/>
+               		<property name="springContextXml" value="spring-context-goodbye.xml,spring-context-hello.xml"/>
+               </action>    
+            </actions>
+        </service>
+      </services>
+     
+</jbossesb>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbossesb-gateway.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/jbossesb-gateway.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbossesb-gateway.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	NOTE: DO NOT MODIFY
-	This file was auto-generated.
--->
-<jbossesb-gateways parameterReloadSecs="5">
-<JMS-Gateway connection-factory="ConnectionFactory" destination-name="queue/quickstart_helloworld_action_Request" destination-type="queue" gatewayClass="org.jboss.soa.esb.listeners.gateway.JmsGatewayListener" maxThreads="1" service-description="Hello World" target-service-category="HelloWorld_ActionESB" target-service-name="SimpleListener"/>
-</jbossesb-gateways>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbossesb-gateway.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/jbossesb-gateway.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbossesb-gateway.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbossesb-gateway.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	NOTE: DO NOT MODIFY
+	This file was auto-generated.
+-->
+<jbossesb-gateways parameterReloadSecs="5">
+<JMS-Gateway connection-factory="ConnectionFactory" destination-name="queue/quickstart_helloworld_action_Request" destination-type="queue" gatewayClass="org.jboss.soa.esb.listeners.gateway.JmsGatewayListener" maxThreads="1" service-description="Hello World" target-service-category="HelloWorld_ActionESB" target-service-name="SimpleListener"/>
+</jbossesb-gateways>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbossesb-listener.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/jbossesb-listener.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbossesb-listener.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	NOTE: DO NOT MODIFY
-	This file was auto-generated.
--->
-<jbossesb-listeners parameterReloadSecs="5">
-<JMS-ESBListener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="1" service-category="HelloWorld_ActionESB" service-description="Hello World" service-name="SimpleListener">
-<EPR connection-factory="ConnectionFactory" destination-name="queue/B" destination-type="queue" protocol="jms"/>
-<action action="sayHello" class="org.jboss.soa.esb.samples.quickstart.spring.MySpringEnabledAction" exceptionMethod="exceptionHandler" process="sayHelloSpring,displayMessage" springContextXml="spring-context-hello.xml"/>
-<action action="addGoodbye" class="org.jboss.soa.esb.samples.quickstart.spring.MySpringEnabledAction" exceptionMethod="exceptionHandler" process="sayGoodbyeSpring,displayMessage" springContextXml="spring-context-goodbye.xml"/>
-<action action="addHelloGoodbye" class="org.jboss.soa.esb.samples.quickstart.spring.MySpringEnabledAction" exceptionMethod="exceptionHandler" process="sayHelloSpring,sayGoodbyeSpring,displayMessage" springContextXml="spring-context-goodbye.xml,spring-context-hello.xml"/>
-</JMS-ESBListener>
-</jbossesb-listeners>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbossesb-listener.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/jbossesb-listener.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbossesb-listener.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbossesb-listener.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	NOTE: DO NOT MODIFY
+	This file was auto-generated.
+-->
+<jbossesb-listeners parameterReloadSecs="5">
+<JMS-ESBListener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="1" service-category="HelloWorld_ActionESB" service-description="Hello World" service-name="SimpleListener">
+<EPR connection-factory="ConnectionFactory" destination-name="queue/B" destination-type="queue" protocol="jms"/>
+<action action="sayHello" class="org.jboss.soa.esb.samples.quickstart.spring.MySpringEnabledAction" exceptionMethod="exceptionHandler" process="sayHelloSpring,displayMessage" springContextXml="spring-context-hello.xml"/>
+<action action="addGoodbye" class="org.jboss.soa.esb.samples.quickstart.spring.MySpringEnabledAction" exceptionMethod="exceptionHandler" process="sayGoodbyeSpring,displayMessage" springContextXml="spring-context-goodbye.xml"/>
+<action action="addHelloGoodbye" class="org.jboss.soa.esb.samples.quickstart.spring.MySpringEnabledAction" exceptionMethod="exceptionHandler" process="sayHelloSpring,sayGoodbyeSpring,displayMessage" springContextXml="spring-context-goodbye.xml,spring-context-hello.xml"/>
+</JMS-ESBListener>
+</jbossesb-listeners>

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

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

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jndi.properties
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/jndi.properties	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jndi.properties	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,5 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-java.naming.factory.url.pkgs=org.jnp.interfaces
-

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jndi.properties (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/jndi.properties)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jndi.properties	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jndi.properties	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,5 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming
+java.naming.factory.url.pkgs=org.jnp.interfaces
+

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

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/juddi.properties (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/juddi.properties)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/juddi.properties	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/juddi.properties	2007-06-06 14:23:48 UTC (rev 12351)
@@ -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
+  

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/log4j.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/log4j.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/log4j.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id: log4j.xml,v 1.26.2.5 2005/09/15 09:31:02 dimitris Exp $ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
-   <!-- ============================== -->
-   <!-- Append messages to the console -->
-   <!-- ============================== -->
-
-   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-	  <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"/>
-     <param name="Threshold" value="INFO"/>
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d %-5p [%t][%c] %m%n"/>
-     </layout>	    
-   </appender>
-
-   <!-- ================ -->
-   <!-- Limit categories -->
-   <!-- ================ -->
-
-   <category name="org.jboss">
-      <priority value="WARN"/>
-   </category>
-   <category name="org.jboss.soa.esb">
-      <priority value="ERROR"/>
-   </category>
-   <category name="org.jboss.internal.soa.esb">
-      <priority value="ERROR"/>
-   </category>
-   <category name="org.apache">
-      <priority value="ERROR"/>
-   </category>
-   <category name="quickstart">
-      <priority value="INFO"/>
-   </category>
-   <!-- ======================= -->
-   <!-- Setup the Root category -->
-   <!-- ======================= -->
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-      <appender-ref ref="FILE"/>
-   </root>
-
-</log4j:configuration>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/log4j.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/log4j.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/log4j.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/log4j.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml,v 1.26.2.5 2005/09/15 09:31:02 dimitris Exp $ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+   <!-- ============================== -->
+   <!-- Append messages to the console -->
+   <!-- ============================== -->
+
+   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+	  <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"/>
+     <param name="Threshold" value="INFO"/>
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="%d %-5p [%t][%c] %m%n"/>
+     </layout>	    
+   </appender>
+
+   <!-- ================ -->
+   <!-- Limit categories -->
+   <!-- ================ -->
+
+   <category name="org.jboss">
+      <priority value="WARN"/>
+   </category>
+   <category name="org.jboss.soa.esb">
+      <priority value="ERROR"/>
+   </category>
+   <category name="org.jboss.internal.soa.esb">
+      <priority value="ERROR"/>
+   </category>
+   <category name="org.apache">
+      <priority value="ERROR"/>
+   </category>
+   <category name="quickstart">
+      <priority value="INFO"/>
+   </category>
+   <!-- ======================= -->
+   <!-- Setup the Root category -->
+   <!-- ======================= -->
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+      <appender-ref ref="FILE"/>
+   </root>
+
+</log4j:configuration>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/readme.txt
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/readme.txt	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/readme.txt	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,105 +0,0 @@
-Overview:
-=========
-	The purpose of the spring_helloworld quickstart sample is to show the use of 
-	Spring based action invocations.  You can use a single Action class and make 
-	multiple method calls or use multiple Action classes. 
-	You can specify Spring bean XML definitions in jboss-esb.xml and lookup the beans
-	in your Action class. Each Action loads a single Spring IoC container upon first spring bean
-	invocation. Subsequent invocations will not load a new IoC container. Also, none of the Spring 
-	dependencies are included. You must manually add additional Spring dependency JARs to the classpath 
-	to create Spring beans that have special dependencies, like a DB connection pool.
-
-Running this quickstart:
-========================
-	Please refer to 'ant help-quickstarts' for prerequisites about the quickstarts and a
-	more detailed descripton of the different ways to run the quickstarts.
-
-To Run standalone mode:
-=======================
-    1.  In a command terminal window in the quickstart folder type 'ant deploy-jms-dests'.
-    2.  In a command terminal window in this folder ("Window1"), type 'ant run'.
-    3.  Open another command terminal window in this folder ("Window2"), type 'ant runtest'.
-    4.  Switch back to "Window1" to see the output from the ESB
-    5. 	Shutdown the listener by simply using Ctrl-C in that window.
-
-To Run '.esb' archive mode:
-===========================
-    1.  In a command terminal window in this folder ("Window1"), type 'ant undeploy-jms-dests'.
-    1.  In a command terminal window in this folder ("Window1"), type 'ant deploy'.
-    2.  Open another command terminal window in this folder ("Window2"), type 'ant runtest'.
-    3.  Switch back to Application Server console to see the output from the ESB
-
-To Run '.esb' archive mode:
-===========================
-    1.  In a command terminal window in this folder ("Window1"), type 'ant undeploy-jms-dests'.
-    1.  In a command terminal window in this folder ("Window1"), type 'ant deploy'.
-    2.  Open another command terminal window in this folder ("Window2"), type 'ant runtest'.
-    3.  Switch back to Application Server console to see the output from the ESB
-
-	'run' target description:
-	In a command prompt window, start the listeners by simply running "ant"
-	in this directory.  You might review the build.xml file to see how it is setup.
-	More details on the build.xml can be found later in this document.  Shutdown
-	the listener by simply using Ctrl-C in that window.
-
-	'runtest' target description:
-	In a separate command prompt window, run "ant runtest" to shoot a JMS message
-	into the listener which will then invoke the MyJMSListenerAction and display
-	it to the console.  You can modify the build.xml to change the phrase
-	"Hello World" to something else and re-run "ant runtest". You can modify 
-	spring-context-hello.xml and/or spring-context-goodbye.xml and change the greeting
-	value of the Spring beans.    
-	
-	After you have run the test and seen the activity on the console also use the a queue viewer
-	like the one found in the JBoss JMX Console (if you are using JBossMQ) to 
-	see the modified message in the outbound queue: quickstart_helloworld_action_Response
-
-Project file descriptions:
-==========================
-	Review the helloworld quickstart as the majority of this is similiar to
-	that example
-
-	MySpringEnabledAction.java:
-	Has methods to display the inbound message, modify the message and to handle an 
-	exceptions which might be thrown in the action processing. MySpringEnabledAction will also
-	lookup 2 different Spring beans located in 2 different Spring config files and append the 
-	"greeting" to the message. Lastly, this action extends AbstractSpringAction. If you 
-	extend AbstractSpringAction, you can define spring configuration files in jboss-esb.xml
-	and lookup Spring beans with "getSpringBeanFactory().getBean("someObject")".
-
-	jbossesb.xml:
-	There are 3 different actions. The first loads up a spring context, does a Spring bean lookup 
-	for "helloObject" and displays the JMS message payload plus the "helloObject.getGreeting()" 
-	value that is set in spring-context-hello.xml. 
-	
-	The second action will Spring lookup the "goodbyeObject" and append the 
-	"goodbyeObject.getGreeting()" value to the message.
-	
-	The third action will Spring lookup the "helloObject" and "goodbyeObject" and append the 
-	"helloObject.getGreeting()" and "goodbyeObject.getGreeting()" value to the message. This
-	last action demonstrates that a single action can lookup Spring beans that are in differnt
-	Spring config files, so long as both config files are a comma separated list value for
-	"springContextXml".
-	<action name="sayHello" 
-               		class="org.jboss.soa.esb.samples.quickstart.helloworldaction.MyJMSListenerAction" 
-               		process="sayHelloSpring,displayMessage">
-               		<property name="exceptionMethod" value="exceptionHandler"/>
-               		<property name="springContextXml" value="spring-context-hello.xml"/>
-    </action>
-    <action name="addGoodbye" 
-            class="org.jboss.soa.esb.samples.quickstart.helloworldaction.MyJMSListenerAction" 
-            process="sayGoodbyeSpring,displayMessage">
-            <property name="exceptionMethod" value="exceptionHandler"/>
-            <property name="springContextXml" value="spring-context-goodbye.xml"/>
-    </action>               
-    <action name="addHelloGoodbye" 
-            class="org.jboss.soa.esb.samples.quickstart.helloworldaction.MyJMSListenerAction" 
-            process="sayHelloSpring,sayGoodbyeSpring,displayMessage">
-            <property name="exceptionMethod" value="exceptionHandler"/>
-            <property name="springContextXml" value="spring-context-goodbye.xml,spring-context-hello.xml"/>
-    </action>    
-  
-	An ESB action class must have a constructor that accepts a ConfigTree argument like the following:
-	 public MySpringEnabledAction(ConfigTree config) { _config = config; } 
- 
-	A ConfigTree is an object holding any attributes associated with the action declaration in the jbossesb.xml

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/readme.txt (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/readme.txt)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/readme.txt	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/readme.txt	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,105 @@
+Overview:
+=========
+	The purpose of the spring_helloworld quickstart sample is to show the use of 
+	Spring based action invocations.  You can use a single Action class and make 
+	multiple method calls or use multiple Action classes. 
+	You can specify Spring bean XML definitions in jboss-esb.xml and lookup the beans
+	in your Action class. Each Action loads a single Spring IoC container upon first spring bean
+	invocation. Subsequent invocations will not load a new IoC container. Also, none of the Spring 
+	dependencies are included. You must manually add additional Spring dependency JARs to the classpath 
+	to create Spring beans that have special dependencies, like a DB connection pool.
+
+Running this quickstart:
+========================
+	Please refer to 'ant help-quickstarts' for prerequisites about the quickstarts and a
+	more detailed descripton of the different ways to run the quickstarts.
+
+To Run standalone mode:
+=======================
+    1.  In a command terminal window in the quickstart folder type 'ant deploy-jms-dests'.
+    2.  In a command terminal window in this folder ("Window1"), type 'ant run'.
+    3.  Open another command terminal window in this folder ("Window2"), type 'ant runtest'.
+    4.  Switch back to "Window1" to see the output from the ESB
+    5. 	Shutdown the listener by simply using Ctrl-C in that window.
+
+To Run '.esb' archive mode:
+===========================
+    1.  In a command terminal window in this folder ("Window1"), type 'ant undeploy-jms-dests'.
+    1.  In a command terminal window in this folder ("Window1"), type 'ant deploy'.
+    2.  Open another command terminal window in this folder ("Window2"), type 'ant runtest'.
+    3.  Switch back to Application Server console to see the output from the ESB
+
+To Run '.esb' archive mode:
+===========================
+    1.  In a command terminal window in this folder ("Window1"), type 'ant undeploy-jms-dests'.
+    1.  In a command terminal window in this folder ("Window1"), type 'ant deploy'.
+    2.  Open another command terminal window in this folder ("Window2"), type 'ant runtest'.
+    3.  Switch back to Application Server console to see the output from the ESB
+
+	'run' target description:
+	In a command prompt window, start the listeners by simply running "ant"
+	in this directory.  You might review the build.xml file to see how it is setup.
+	More details on the build.xml can be found later in this document.  Shutdown
+	the listener by simply using Ctrl-C in that window.
+
+	'runtest' target description:
+	In a separate command prompt window, run "ant runtest" to shoot a JMS message
+	into the listener which will then invoke the MyJMSListenerAction and display
+	it to the console.  You can modify the build.xml to change the phrase
+	"Hello World" to something else and re-run "ant runtest". You can modify 
+	spring-context-hello.xml and/or spring-context-goodbye.xml and change the greeting
+	value of the Spring beans.    
+	
+	After you have run the test and seen the activity on the console also use the a queue viewer
+	like the one found in the JBoss JMX Console (if you are using JBossMQ) to 
+	see the modified message in the outbound queue: quickstart_helloworld_action_Response
+
+Project file descriptions:
+==========================
+	Review the helloworld quickstart as the majority of this is similiar to
+	that example
+
+	MySpringEnabledAction.java:
+	Has methods to display the inbound message, modify the message and to handle an 
+	exceptions which might be thrown in the action processing. MySpringEnabledAction will also
+	lookup 2 different Spring beans located in 2 different Spring config files and append the 
+	"greeting" to the message. Lastly, this action extends AbstractSpringAction. If you 
+	extend AbstractSpringAction, you can define spring configuration files in jboss-esb.xml
+	and lookup Spring beans with "getSpringBeanFactory().getBean("someObject")".
+
+	jbossesb.xml:
+	There are 3 different actions. The first loads up a spring context, does a Spring bean lookup 
+	for "helloObject" and displays the JMS message payload plus the "helloObject.getGreeting()" 
+	value that is set in spring-context-hello.xml. 
+	
+	The second action will Spring lookup the "goodbyeObject" and append the 
+	"goodbyeObject.getGreeting()" value to the message.
+	
+	The third action will Spring lookup the "helloObject" and "goodbyeObject" and append the 
+	"helloObject.getGreeting()" and "goodbyeObject.getGreeting()" value to the message. This
+	last action demonstrates that a single action can lookup Spring beans that are in differnt
+	Spring config files, so long as both config files are a comma separated list value for
+	"springContextXml".
+	<action name="sayHello" 
+               		class="org.jboss.soa.esb.samples.quickstart.helloworldaction.MyJMSListenerAction" 
+               		process="sayHelloSpring,displayMessage">
+               		<property name="exceptionMethod" value="exceptionHandler"/>
+               		<property name="springContextXml" value="spring-context-hello.xml"/>
+    </action>
+    <action name="addGoodbye" 
+            class="org.jboss.soa.esb.samples.quickstart.helloworldaction.MyJMSListenerAction" 
+            process="sayGoodbyeSpring,displayMessage">
+            <property name="exceptionMethod" value="exceptionHandler"/>
+            <property name="springContextXml" value="spring-context-goodbye.xml"/>
+    </action>               
+    <action name="addHelloGoodbye" 
+            class="org.jboss.soa.esb.samples.quickstart.helloworldaction.MyJMSListenerAction" 
+            process="sayHelloSpring,sayGoodbyeSpring,displayMessage">
+            <property name="exceptionMethod" value="exceptionHandler"/>
+            <property name="springContextXml" value="spring-context-goodbye.xml,spring-context-hello.xml"/>
+    </action>    
+  
+	An ESB action class must have a constructor that accepts a ConfigTree argument like the following:
+	 public MySpringEnabledAction(ConfigTree config) { _config = config; } 
+ 
+	A ConfigTree is an object holding any attributes associated with the action declaration in the jbossesb.xml

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/spring-context-goodbye.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/spring-context-goodbye.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/spring-context-goodbye.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-	     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
-
-	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
-
-	<bean id="goodbyeObject" class="org.jboss.soa.esb.samples.quickstart.spring.SaySomething">
-		<property name="greeting" value="goodbye from Spring"/>
-	</bean>
-	
-
-</beans>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/spring-context-goodbye.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/spring-context-goodbye.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/spring-context-goodbye.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/spring-context-goodbye.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+	     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
+
+	<bean id="goodbyeObject" class="org.jboss.soa.esb.samples.quickstart.spring.SaySomething">
+		<property name="greeting" value="goodbye from Spring"/>
+	</bean>
+	
+
+</beans>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/spring-context-hello.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/spring-context-hello.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/spring-context-hello.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-	     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
-
-	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
-
-	<bean id="helloObject" class="org.jboss.soa.esb.samples.quickstart.spring.SaySomething">
-		<property name="greeting" value="hello from Spring"/>
-	</bean>
-	
-
-</beans>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/spring-context-hello.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/spring-context-hello.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/spring-context-hello.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/spring-context-hello.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+	     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
+
+	<bean id="helloObject" class="org.jboss.soa.esb.samples.quickstart.spring.SaySomething">
+		<property name="greeting" value="hello from Spring"/>
+	</bean>
+	
+
+</beans>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/src)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/src/org)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/src/org/jboss)

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

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

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

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/MySpringEnabledAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/MySpringEnabledAction.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/MySpringEnabledAction.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,92 +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.quickstart.spring;
-
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.actions.AbstractSpringAction;
-import org.jboss.soa.esb.actions.ActionLifecycleException;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Body;
-import org.jboss.soa.esb.message.Message;
-
-/**
- * Spring enabled action that makes a hello world call.
- * 
- * @see org.jboss.soa.esb.actions.AbstractSpringAction
- * @see spring-context-hello.xml
- * @see spring-context-goodbye.xml
- * 
- * @author <a href="mailto:james.williams at redhat.com">James Williams</a>.
- * 
- */
-public class MySpringEnabledAction extends AbstractSpringAction
-{
-
-   public MySpringEnabledAction(ConfigTree config) throws Exception
-   {
-      configTree = config;
-   }
-
-   public Message displayMessage(Message message) throws Exception
-   {
-      logHeader();
-      System.out.println("Body: "
-            + new String(message.getBody().getByteArray()));
-      logFooter();
-
-      return message;
-   }
-
-   public Message sayHelloSpring(Message message) throws Exception
-   {
-
-      SaySomething hello = (SaySomething) getBeanFactory().getBean(
-            "helloObject");
-
-      Body msgBody = message.getBody();
-      String contents = new String(msgBody.getByteArray());
-      StringBuffer sb = new StringBuffer();
-      sb.append(contents);
-      sb.append("\n");
-      sb.append(hello.getGreeting());
-
-      msgBody.setByteArray(sb.toString().getBytes());
-
-      return message;
-   }
-
-   public Message sayGoodbyeSpring(Message message) throws Exception
-   {
-      SaySomething goodbye = (SaySomething) getBeanFactory().getBean(
-            "goodbyeObject");
-
-      Body msgBody = message.getBody();
-      String contents = new String(msgBody.getByteArray());
-      StringBuffer sb = new StringBuffer();
-      sb.append(contents);
-      sb.append("\n");
-      sb.append(goodbye.getGreeting());
-
-      msgBody.setByteArray(sb.toString().getBytes());
-
-      return message;
-   }
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/MySpringEnabledAction.java (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/MySpringEnabledAction.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/MySpringEnabledAction.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/MySpringEnabledAction.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,92 @@
+/*
+ * 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.quickstart.spring;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.actions.AbstractSpringAction;
+import org.jboss.soa.esb.actions.ActionLifecycleException;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Body;
+import org.jboss.soa.esb.message.Message;
+
+/**
+ * Spring enabled action that makes a hello world call.
+ * 
+ * @see org.jboss.soa.esb.actions.AbstractSpringAction
+ * @see spring-context-hello.xml
+ * @see spring-context-goodbye.xml
+ * 
+ * @author <a href="mailto:james.williams at redhat.com">James Williams</a>.
+ * 
+ */
+public class MySpringEnabledAction extends AbstractSpringAction
+{
+
+   public MySpringEnabledAction(ConfigTree config) throws Exception
+   {
+      configTree = config;
+   }
+
+   public Message displayMessage(Message message) throws Exception
+   {
+      logHeader();
+      System.out.println("Body: "
+            + new String(message.getBody().getByteArray()));
+      logFooter();
+
+      return message;
+   }
+
+   public Message sayHelloSpring(Message message) throws Exception
+   {
+
+      SaySomething hello = (SaySomething) getBeanFactory().getBean(
+            "helloObject");
+
+      Body msgBody = message.getBody();
+      String contents = new String(msgBody.getByteArray());
+      StringBuffer sb = new StringBuffer();
+      sb.append(contents);
+      sb.append("\n");
+      sb.append(hello.getGreeting());
+
+      msgBody.setByteArray(sb.toString().getBytes());
+
+      return message;
+   }
+
+   public Message sayGoodbyeSpring(Message message) throws Exception
+   {
+      SaySomething goodbye = (SaySomething) getBeanFactory().getBean(
+            "goodbyeObject");
+
+      Body msgBody = message.getBody();
+      String contents = new String(msgBody.getByteArray());
+      StringBuffer sb = new StringBuffer();
+      sb.append(contents);
+      sb.append("\n");
+      sb.append(goodbye.getGreeting());
+
+      msgBody.setByteArray(sb.toString().getBytes());
+
+      return message;
+   }
+}
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/SaySomething.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/SaySomething.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/SaySomething.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,44 +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.quickstart.spring;
-
-/**
- * Simple POJO with a single String getter/setter.
- * 
- * @see spring-context.xml
- * 
- * @author <a href="mailto:james.williams at redhat.com">James Williams</a>.
- * 
- */
-public class SaySomething
-{
-   private String greeting;
-
-   public String getGreeting()
-   {
-      return greeting;
-   }
-
-   public void setGreeting(String greeting)
-   {
-      this.greeting = greeting;
-   }
-}

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/SaySomething.java (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/SaySomething.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/SaySomething.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/SaySomething.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,44 @@
+/*
+ * 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.quickstart.spring;
+
+/**
+ * Simple POJO with a single String getter/setter.
+ * 
+ * @see spring-context.xml
+ * 
+ * @author <a href="mailto:james.williams at redhat.com">James Williams</a>.
+ * 
+ */
+public class SaySomething
+{
+   private String greeting;
+
+   public String getGreeting()
+   {
+      return greeting;
+   }
+
+   public void setGreeting(String greeting)
+   {
+      this.greeting = greeting;
+   }
+}

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/test (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/test)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,80 +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.quickstart.spring.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;
-
-/**
- * Send a JMS message that the ESB will listen for.
- * 
- * @author <a href="mailto:james.williams at redhat.com">James Williams</a>.
- * 
- */
-public class SendJMSMessage
-{
-   private QueueConnection conn;
-   private QueueSession session;
-   private 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_helloworld_action_Request");
-      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 static void main(String args[]) throws Exception
-   {
-      SendJMSMessage sm = new SendJMSMessage();
-      sm.setupConnection();
-      sm.sendAMessage(args[0]);
-      sm.stop();
-   }
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,80 @@
+/*
+ * 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.quickstart.spring.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;
+
+/**
+ * Send a JMS message that the ESB will listen for.
+ * 
+ * @author <a href="mailto:james.williams at redhat.com">James Williams</a>.
+ * 
+ */
+public class SendJMSMessage
+{
+   private QueueConnection conn;
+   private QueueSession session;
+   private 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_helloworld_action_Request");
+      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 static void main(String args[]) throws Exception
+   {
+      SendJMSMessage sm = new SendJMSMessage();
+      sm.setupConnection();
+      sm.sendAMessage(args[0]);
+      sm.stop();
+   }
+}
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/applicationContext.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/applicationContext.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/applicationContext.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  - Application context definition for JPetStore's business layer.
-  - Contains bean references to the transaction manager and to the DAOs in
-  - dataAccessContext-local/jta.xml (see web.xml's "contextConfigLocation").
-  -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-	     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	     xmlns:aop="http://www.springframework.org/schema/aop"
-	     xmlns:tx="http://www.springframework.org/schema/tx"
-	     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-           http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
-           http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
-
-
-	<!-- ========================= GENERAL DEFINITIONS ========================= -->
-
-	<!-- Configurer that replaces ${...} placeholders with values from properties files -->
-	<!-- (in this case, mail and JDBC related properties) -->
-	<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="locations">
-			<list>
-				<value>jdbc.properties</value>
-			</list>
-		</property>
-	</bean>
-    
-	<!-- MailSender used by EmailAdvice -->
-	<!--
-	<bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
-		<property name="host" value="${mail.host}"/>
-	</bean>
-	-->
-
-
-	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
-
-	<!-- Generic validator for Account objects, to be used for example by the Spring web tier -->
-	<bean id="accountValidator" class="org.springframework.samples.jpetstore.domain.logic.AccountValidator"/>
-
-	<!-- Generic validator for Order objects, to be used for example by the Spring web tier -->
-	<bean id="orderValidator" class="org.springframework.samples.jpetstore.domain.logic.OrderValidator"/>
-
-	<!--
-	  - JPetStore primary business object (default implementation).
-		- Transaction advice gets applied through the AOP configuration below.
-		-->
-	<bean id="petStore" class="org.springframework.samples.jpetstore.domain.logic.PetStoreImpl">
-		<property name="accountDao" ref="accountDao"/>
-		<property name="categoryDao" ref="categoryDao"/>
-		<property name="productDao" ref="productDao"/>
-		<property name="itemDao" ref="itemDao"/>
-		<property name="orderDao" ref="orderDao"/>
-	</bean>
-
-
-	<!-- ========================= ASPECT CONFIGURATION ======================== -->
-
-	<aop:config>
-		<!--
-			This definition creates auto-proxy infrastructure based on the given pointcut,
-			expressed in AspectJ pointcut language. Here: applying the advice named
-			"txAdvice" to all methods on classes named PetStoreImpl.
-		-->
-		<aop:advisor pointcut="execution(* *..PetStoreFacade.*(..))" advice-ref="txAdvice"/>
-
-		<!--
-			This definition creates auto-proxy infrastructure based on the given pointcut,
-			expressed in AspectJ pointcut language. Here: applying the advice named
-			"emailAdvice" to insertOrder(Order) method of PetStoreImpl
-		-->
-		<!--
-		<aop:advisor pointcut="execution(* *..PetStoreFacade.insertOrder(*..Order))" advice-ref="emailAdvice"/>
-		-->
-	</aop:config>
-
-	<!--
-		Transaction advice definition, based on method name patterns.
-		Defaults to PROPAGATION_REQUIRED for all methods whose name starts with
-		"insert" or "update", and to PROPAGATION_REQUIRED with read-only hint
-		for all other methods.
-	-->
-	<tx:advice id="txAdvice">
-		<tx:attributes>
-			<tx:method name="insert*"/>
-			<tx:method name="update*"/>
-			<tx:method name="*" read-only="true"/>
-		</tx:attributes>
-	</tx:advice>
-
-	<!-- AOP advice used to send confirmation email after order has been submitted -->
-	<!--
-	<bean id="emailAdvice" class="org.springframework.samples.jpetstore.domain.logic.SendOrderConfirmationEmailAdvice">
-		<property name="mailSender" ref="mailSender"/>
-	</bean>-->
-
-
-	<!-- ========================= REMOTE EXPORTER DEFINITIONS ======================== -->
-
-	<!-- RMI exporter for the JPetStore OrderService -->
-	<!-- Commented out by default to avoid conflicts with EJB containers -->
-	<!--
-	<bean id="order-rmi" class="org.springframework.remoting.rmi.RmiServiceExporter">
-		<property name="service" ref="petStore"/>
-		<property name="serviceInterface" value="org.springframework.samples.jpetstore.domain.logic.OrderService"/>
-		<property name="serviceName" value="order"/>
-		<property name="registryPort" value="1099"/>
-	</bean>
-	-->
-
-</beans>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/applicationContext.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/applicationContext.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/applicationContext.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/applicationContext.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  - Application context definition for JPetStore's business layer.
+  - Contains bean references to the transaction manager and to the DAOs in
+  - dataAccessContext-local/jta.xml (see web.xml's "contextConfigLocation").
+  -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+	     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	     xmlns:aop="http://www.springframework.org/schema/aop"
+	     xmlns:tx="http://www.springframework.org/schema/tx"
+	     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+           http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
+           http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
+
+
+	<!-- ========================= GENERAL DEFINITIONS ========================= -->
+
+	<!-- Configurer that replaces ${...} placeholders with values from properties files -->
+	<!-- (in this case, mail and JDBC related properties) -->
+	<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="locations">
+			<list>
+				<value>jdbc.properties</value>
+			</list>
+		</property>
+	</bean>
+    
+	<!-- MailSender used by EmailAdvice -->
+	<!--
+	<bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
+		<property name="host" value="${mail.host}"/>
+	</bean>
+	-->
+
+
+	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
+
+	<!-- Generic validator for Account objects, to be used for example by the Spring web tier -->
+	<bean id="accountValidator" class="org.springframework.samples.jpetstore.domain.logic.AccountValidator"/>
+
+	<!-- Generic validator for Order objects, to be used for example by the Spring web tier -->
+	<bean id="orderValidator" class="org.springframework.samples.jpetstore.domain.logic.OrderValidator"/>
+
+	<!--
+	  - JPetStore primary business object (default implementation).
+		- Transaction advice gets applied through the AOP configuration below.
+		-->
+	<bean id="petStore" class="org.springframework.samples.jpetstore.domain.logic.PetStoreImpl">
+		<property name="accountDao" ref="accountDao"/>
+		<property name="categoryDao" ref="categoryDao"/>
+		<property name="productDao" ref="productDao"/>
+		<property name="itemDao" ref="itemDao"/>
+		<property name="orderDao" ref="orderDao"/>
+	</bean>
+
+
+	<!-- ========================= ASPECT CONFIGURATION ======================== -->
+
+	<aop:config>
+		<!--
+			This definition creates auto-proxy infrastructure based on the given pointcut,
+			expressed in AspectJ pointcut language. Here: applying the advice named
+			"txAdvice" to all methods on classes named PetStoreImpl.
+		-->
+		<aop:advisor pointcut="execution(* *..PetStoreFacade.*(..))" advice-ref="txAdvice"/>
+
+		<!--
+			This definition creates auto-proxy infrastructure based on the given pointcut,
+			expressed in AspectJ pointcut language. Here: applying the advice named
+			"emailAdvice" to insertOrder(Order) method of PetStoreImpl
+		-->
+		<!--
+		<aop:advisor pointcut="execution(* *..PetStoreFacade.insertOrder(*..Order))" advice-ref="emailAdvice"/>
+		-->
+	</aop:config>
+
+	<!--
+		Transaction advice definition, based on method name patterns.
+		Defaults to PROPAGATION_REQUIRED for all methods whose name starts with
+		"insert" or "update", and to PROPAGATION_REQUIRED with read-only hint
+		for all other methods.
+	-->
+	<tx:advice id="txAdvice">
+		<tx:attributes>
+			<tx:method name="insert*"/>
+			<tx:method name="update*"/>
+			<tx:method name="*" read-only="true"/>
+		</tx:attributes>
+	</tx:advice>
+
+	<!-- AOP advice used to send confirmation email after order has been submitted -->
+	<!--
+	<bean id="emailAdvice" class="org.springframework.samples.jpetstore.domain.logic.SendOrderConfirmationEmailAdvice">
+		<property name="mailSender" ref="mailSender"/>
+	</bean>-->
+
+
+	<!-- ========================= REMOTE EXPORTER DEFINITIONS ======================== -->
+
+	<!-- RMI exporter for the JPetStore OrderService -->
+	<!-- Commented out by default to avoid conflicts with EJB containers -->
+	<!--
+	<bean id="order-rmi" class="org.springframework.remoting.rmi.RmiServiceExporter">
+		<property name="service" ref="petStore"/>
+		<property name="serviceInterface" value="org.springframework.samples.jpetstore.domain.logic.OrderService"/>
+		<property name="serviceName" value="order"/>
+		<property name="registryPort" value="1099"/>
+	</bean>
+	-->
+
+</beans>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/build.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,36 +0,0 @@
-<project name="spring_jpetstore" default="runtest" basedir=".">
-	<description> 
-		${ant.project.name}
-		${line.separator}
-	</description>
-
-	<!-- Import the base Ant build script... -->
-	<import file="../conf/base-build.xml" />
-
-	<property name="spring.lib.dir" value="./lib" />
-	<property name="spring.xml.dir" value="./xml" />
-	
-	<!-- add external spring jar dependencies -->
-	<path id="build.classpath">
-		<fileset dir="${spring.lib.dir}" includes="*.jar" />
-		<path refid="exec-classpath" />
-	</path>
-	
-	<target name="runtest" depends="compile" description="sends a JMS message to the ESB">
-		<echo>Runs Test JMS Sender</echo>
-		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.spring.test.SendJMSMessage" failonerror="true">
-			<arg value="./sample-order.xml" />
-			<classpath refid="exec-classpath" />
-		</java>
-	</target>
-
-	<target name="start-hsqldb">
-		<exec os="Linux" executable="/bin/sh" dir="./hsqldb">
-			<arg value="server.sh" />
-		</exec>
-		<exec os="Windows" executable="cmd.exe" dir="./hsqldb">
-			<arg value="server.bat" />
-		</exec>
-	</target>
-
-</project>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/build.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/build.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/build.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,36 @@
+<project name="spring_jpetstore" default="runtest" basedir=".">
+	<description> 
+		${ant.project.name}
+		${line.separator}
+	</description>
+
+	<!-- Import the base Ant build script... -->
+	<import file="../conf/base-build.xml" />
+
+	<property name="spring.lib.dir" value="./lib" />
+	<property name="spring.xml.dir" value="./xml" />
+	
+	<!-- add external spring jar dependencies -->
+	<path id="build.classpath">
+		<fileset dir="${spring.lib.dir}" includes="*.jar" />
+		<path refid="exec-classpath" />
+	</path>
+	
+	<target name="runtest" depends="compile" description="sends a JMS message to the ESB">
+		<echo>Runs Test JMS Sender</echo>
+		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.spring.test.SendJMSMessage" failonerror="true">
+			<arg value="./sample-order.xml" />
+			<classpath refid="exec-classpath" />
+		</java>
+	</target>
+
+	<target name="start-hsqldb">
+		<exec os="Linux" executable="/bin/sh" dir="./hsqldb">
+			<arg value="server.sh" />
+		</exec>
+		<exec os="Windows" executable="cmd.exe" dir="./hsqldb">
+			<arg value="server.bat" />
+		</exec>
+	</target>
+
+</project>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/dataAccessContext-local.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/dataAccessContext-local.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/dataAccessContext-local.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
-
-<!--
-  - Application context definition for JPetStore's data access layer.
-  - Accessed by business layer objects defined in "applicationContext.xml"
-  - (see web.xml's "contextConfigLocation").
-  -
-  - This version of the data access layer works on a combined database,
-  - using a local DataSource with DataSourceTransactionManager. It does not
-  - need any JTA support in the container: It will run as-is in plain Tomcat.
-  -->
-<beans>
-
-	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-
-	<!-- Local Apache Commons DBCP DataSource that refers to a combined database -->
-	<!-- (see dataAccessContext-jta.xml for an alternative) -->
-	<!-- The placeholders are resolved from jdbc.properties through -->
-	<!-- the PropertyPlaceholderConfigurer in applicationContext.xml -->
-	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-		<property name="driverClassName" value="${jdbc.driverClassName}"/>
-		<property name="url" value="${jdbc.url}"/>
-		<property name="username" value="${jdbc.username}"/>
-		<property name="password" value="${jdbc.password}"/>
-	</bean>
-
-	<!-- Transaction manager for a single JDBC DataSource -->
-	<!-- (see dataAccessContext-jta.xml for an alternative) -->
-	<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-		<property name="dataSource" ref="dataSource"/>
-	</bean>
-
-	<!-- SqlMap setup for iBATIS Database Layer -->
-	<bean id="sqlMapClient" class="org.springframework.orm.ibatis.SqlMapClientFactoryBean">
-		<property name="configLocation" value="sql-map-config.xml"/>
-		<property name="dataSource" ref="dataSource"/>
-	</bean>
-
-
-	<!-- ========================= DAO DEFINITIONS: IBATIS IMPLEMENTATIONS ========================= -->
-
-	<bean id="accountDao" class="org.springframework.samples.jpetstore.dao.ibatis.SqlMapAccountDao">
-		<property name="sqlMapClient" ref="sqlMapClient"/>
-	</bean>
-
-	<bean id="categoryDao" class="org.springframework.samples.jpetstore.dao.ibatis.SqlMapCategoryDao">
-		<property name="sqlMapClient" ref="sqlMapClient"/>
-	</bean>
-
-	<bean id="productDao" class="org.springframework.samples.jpetstore.dao.ibatis.SqlMapProductDao">
-		<property name="sqlMapClient" ref="sqlMapClient"/>
-	</bean>
-
-	<bean id="itemDao" class="org.springframework.samples.jpetstore.dao.ibatis.SqlMapItemDao">
-		<property name="sqlMapClient" ref="sqlMapClient"/>
-	</bean>
-
-	<!-- Refers to the combined database here -->
-	<!-- (see dataAccessContext-jta.xml for an alternative) -->
-	<bean id="orderDao" class="org.springframework.samples.jpetstore.dao.ibatis.SqlMapOrderDao">
-		<property name="sqlMapClient" ref="sqlMapClient"/>
-		<property name="sequenceDao" ref="sequenceDao"/>
-	</bean>
-
-	<!-- OrderDao definition for MS SQL Server -->
-	<!-- (to be used instead of the default orderDao) -->
-	<!--
-	<bean id="orderDao" class="org.springframework.samples.jpetstore.dao.ibatis.MsSqlOrderDao">
-		<property name="sqlMapClient" ref="sqlMapClient"/>
-		<property name="sequenceDao" ref="sequenceDao"/>
-	</bean>
-	-->
-
-	<!-- Refers to the combined database here -->
-	<!-- (see dataAccessContext-jta.xml for an alternative) -->
-	<bean id="sequenceDao" class="org.springframework.samples.jpetstore.dao.ibatis.SqlMapSequenceDao">
-		<property name="sqlMapClient" ref="sqlMapClient"/>
-	</bean>
-
-	<!-- SequenceDao definition for Oracle databases -->
-	<!-- (to be used instead of the default sequenceDao) -->
-	<!--
-	<bean id="sequenceDao" class="org.springframework.samples.jpetstore.dao.ibatis.OracleSequenceDao">
-		<property name="sqlMapClient" ref="sqlMapClient"/>
-	</bean>
-	-->
-
-</beans>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/dataAccessContext-local.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/dataAccessContext-local.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/dataAccessContext-local.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/dataAccessContext-local.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+
+<!--
+  - Application context definition for JPetStore's data access layer.
+  - Accessed by business layer objects defined in "applicationContext.xml"
+  - (see web.xml's "contextConfigLocation").
+  -
+  - This version of the data access layer works on a combined database,
+  - using a local DataSource with DataSourceTransactionManager. It does not
+  - need any JTA support in the container: It will run as-is in plain Tomcat.
+  -->
+<beans>
+
+	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
+
+	<!-- Local Apache Commons DBCP DataSource that refers to a combined database -->
+	<!-- (see dataAccessContext-jta.xml for an alternative) -->
+	<!-- The placeholders are resolved from jdbc.properties through -->
+	<!-- the PropertyPlaceholderConfigurer in applicationContext.xml -->
+	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+		<property name="driverClassName" value="${jdbc.driverClassName}"/>
+		<property name="url" value="${jdbc.url}"/>
+		<property name="username" value="${jdbc.username}"/>
+		<property name="password" value="${jdbc.password}"/>
+	</bean>
+
+	<!-- Transaction manager for a single JDBC DataSource -->
+	<!-- (see dataAccessContext-jta.xml for an alternative) -->
+	<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+		<property name="dataSource" ref="dataSource"/>
+	</bean>
+
+	<!-- SqlMap setup for iBATIS Database Layer -->
+	<bean id="sqlMapClient" class="org.springframework.orm.ibatis.SqlMapClientFactoryBean">
+		<property name="configLocation" value="sql-map-config.xml"/>
+		<property name="dataSource" ref="dataSource"/>
+	</bean>
+
+
+	<!-- ========================= DAO DEFINITIONS: IBATIS IMPLEMENTATIONS ========================= -->
+
+	<bean id="accountDao" class="org.springframework.samples.jpetstore.dao.ibatis.SqlMapAccountDao">
+		<property name="sqlMapClient" ref="sqlMapClient"/>
+	</bean>
+
+	<bean id="categoryDao" class="org.springframework.samples.jpetstore.dao.ibatis.SqlMapCategoryDao">
+		<property name="sqlMapClient" ref="sqlMapClient"/>
+	</bean>
+
+	<bean id="productDao" class="org.springframework.samples.jpetstore.dao.ibatis.SqlMapProductDao">
+		<property name="sqlMapClient" ref="sqlMapClient"/>
+	</bean>
+
+	<bean id="itemDao" class="org.springframework.samples.jpetstore.dao.ibatis.SqlMapItemDao">
+		<property name="sqlMapClient" ref="sqlMapClient"/>
+	</bean>
+
+	<!-- Refers to the combined database here -->
+	<!-- (see dataAccessContext-jta.xml for an alternative) -->
+	<bean id="orderDao" class="org.springframework.samples.jpetstore.dao.ibatis.SqlMapOrderDao">
+		<property name="sqlMapClient" ref="sqlMapClient"/>
+		<property name="sequenceDao" ref="sequenceDao"/>
+	</bean>
+
+	<!-- OrderDao definition for MS SQL Server -->
+	<!-- (to be used instead of the default orderDao) -->
+	<!--
+	<bean id="orderDao" class="org.springframework.samples.jpetstore.dao.ibatis.MsSqlOrderDao">
+		<property name="sqlMapClient" ref="sqlMapClient"/>
+		<property name="sequenceDao" ref="sequenceDao"/>
+	</bean>
+	-->
+
+	<!-- Refers to the combined database here -->
+	<!-- (see dataAccessContext-jta.xml for an alternative) -->
+	<bean id="sequenceDao" class="org.springframework.samples.jpetstore.dao.ibatis.SqlMapSequenceDao">
+		<property name="sqlMapClient" ref="sqlMapClient"/>
+	</bean>
+
+	<!-- SequenceDao definition for Oracle databases -->
+	<!-- (to be used instead of the default sequenceDao) -->
+	<!--
+	<bean id="sequenceDao" class="org.springframework.samples.jpetstore.dao.ibatis.OracleSequenceDao">
+		<property name="sqlMapClient" ref="sqlMapClient"/>
+	</bean>
+	-->
+
+</beans>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore-hsqldb-dataload.sql
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore-hsqldb-dataload.sql	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore-hsqldb-dataload.sql	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,101 +0,0 @@
-INSERT INTO sequence VALUES ('ordernum', 1000);
-INSERT INTO sequence VALUES ('linenum', 1000);
-
-INSERT INTO signon VALUES ('j2ee','j2ee');
-INSERT INTO signon VALUES ('ACID','ACID');
-
-INSERT INTO account VALUES ('j2ee','yourname at yourdomain.com','ABC', 'XYX', 'OK', '901 San Antonio Road', 'MS UCUP02-206', 'Palo Alto', 'CA', '94303', 'USA',  '555-555-5555');
-INSERT INTO account VALUES ('ACID','acid at yourdomain.com','ABC', 'XYX', 'OK', '901 San Antonio Road', 'MS UCUP02-206', 'Palo Alto', 'CA', '94303', 'USA',  '555-555-5555');
-
-INSERT INTO profile VALUES ('j2ee','english','DOGS',1,1);
-INSERT INTO profile VALUES ('ACID','english','CATS',1,1);
-
-INSERT INTO bannerdata VALUES ('FISH','<image src="../images/banner_fish.gif">');
-INSERT INTO bannerdata VALUES ('CATS','<image src="../images/banner_cats.gif">');
-INSERT INTO bannerdata VALUES ('DOGS','<image src="../images/banner_dogs.gif">');
-INSERT INTO bannerdata VALUES ('REPTILES','<image src="../images/banner_reptiles.gif">');
-INSERT INTO bannerdata VALUES ('BIRDS','<image src="../images/banner_birds.gif">');
-
-INSERT INTO category VALUES ('FISH','Fish','<image src="../images/fish_icon.gif"><font size="5" color="blue"> Fish</font>');
-INSERT INTO category VALUES ('DOGS','Dogs','<image src="../images/dogs_icon.gif"><font size="5" color="blue"> Dogs</font>');
-INSERT INTO category VALUES ('REPTILES','Reptiles','<image src="../images/reptiles_icon.gif"><font size="5" color="blue"> Reptiles</font>');
-INSERT INTO category VALUES ('CATS','Cats','<image src="../images/cats_icon.gif"><font size="5" color="blue"> Cats</font>');
-INSERT INTO category VALUES ('BIRDS','Birds','<image src="../images/birds_icon.gif"><font size="5" color="blue"> Birds</font>');
-
-INSERT INTO product VALUES ('FI-SW-01','FISH','Angelfish','<image src="../images/fish1.jpg">Salt Water fish from Australia');
-INSERT INTO product VALUES ('FI-SW-02','FISH','Tiger Shark','<image src="../images/fish4.gif">Salt Water fish from Australia');
-INSERT INTO product VALUES ('FI-FW-01','FISH', 'Koi','<image src="../images/fish3.gif">Fresh Water fish from Japan');
-INSERT INTO product VALUES ('FI-FW-02','FISH', 'Goldfish','<image src="../images/fish2.gif">Fresh Water fish from China');
-INSERT INTO product VALUES ('K9-BD-01','DOGS','Bulldog','<image src="../images/dog2.gif">Friendly dog from England');
-INSERT INTO product VALUES ('K9-PO-02','DOGS','Poodle','<image src="../images/dog6.gif">Cute dog from France');
-INSERT INTO product VALUES ('K9-DL-01','DOGS', 'Dalmation','<image src="../images/dog5.gif">Great dog for a Fire Station');
-INSERT INTO product VALUES ('K9-RT-01','DOGS', 'Golden Retriever','<image src="../images/dog1.gif">Great family dog');
-INSERT INTO product VALUES ('K9-RT-02','DOGS', 'Labrador Retriever','<image src="../images/dog5.gif">Great hunting dog');
-INSERT INTO product VALUES ('K9-CW-01','DOGS', 'Chihuahua','<image src="../images/dog4.gif">Great companion dog');
-INSERT INTO product VALUES ('RP-SN-01','REPTILES','Rattlesnake','<image src="../images/lizard3.gif">Doubles as a watch dog');
-INSERT INTO product VALUES ('RP-LI-02','REPTILES','Iguana','<image src="../images/lizard2.gif">Friendly green friend');
-INSERT INTO product VALUES ('FL-DSH-01','CATS','Manx','<image src="../images/cat3.gif">Great for reducing mouse populations');
-INSERT INTO product VALUES ('FL-DLH-02','CATS','Persian','<image src="../images/cat1.gif">Friendly house cat, doubles as a princess');
-INSERT INTO product VALUES ('AV-CB-01','BIRDS','Amazon Parrot','<image src="../images/bird4.gif">Great companion for up to 75 years');
-INSERT INTO product VALUES ('AV-SB-02','BIRDS','Finch','<image src="../images/bird1.gif">Great stress reliever');
-
-INSERT INTO supplier VALUES (1,'XYZ Pets','AC','600 Avon Way','','Los Angeles','CA','94024','212-947-0797');
-INSERT INTO supplier VALUES (2,'ABC Pets','AC','700 Abalone Way','','San Francisco ','CA','94024','415-947-0797');
-
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-1','FI-SW-01',16.50,10.00,1,'P','Large');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-2','FI-SW-01',16.50,10.00,1,'P','Small');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-3','FI-SW-02',18.50,12.00,1,'P','Toothless');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-4','FI-FW-01',18.50,12.00,1,'P','Spotted');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-5','FI-FW-01',18.50,12.00,1,'P','Spotless');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-6','K9-BD-01',18.50,12.00,1,'P','Male Adult');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-7','K9-BD-01',18.50,12.00,1,'P','Female Puppy');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-8','K9-PO-02',18.50,12.00,1,'P','Male Puppy');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-9','K9-DL-01',18.50,12.00,1,'P','Spotless Male Puppy');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-10','K9-DL-01',18.50,12.00,1,'P','Spotted Adult Female');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-11','RP-SN-01',18.50,12.00,1,'P','Venomless');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-12','RP-SN-01',18.50,12.00,1,'P','Rattleless');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-13','RP-LI-02',18.50,12.00,1,'P','Green Adult');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-14','FL-DSH-01',58.50,12.00,1,'P','Tailless');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-15','FL-DSH-01',23.50,12.00,1,'P','With tail');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-16','FL-DLH-02',93.50,12.00,1,'P','Adult Female');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-17','FL-DLH-02',93.50,12.00,1,'P','Adult Male');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-18','AV-CB-01',193.50,92.00,1,'P','Adult Male');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-19','AV-SB-02',15.50, 2.00,1,'P','Adult Male');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-20','FI-FW-02',5.50, 2.00,1,'P','Adult Male');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-21','FI-FW-02',5.29, 1.00,1,'P','Adult Female');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-22','K9-RT-02',135.50, 100.00,1,'P','Adult Male');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-23','K9-RT-02',145.49, 100.00,1,'P','Adult Female');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-24','K9-RT-02',255.50, 92.00,1,'P','Adult Male');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-25','K9-RT-02',325.29, 90.00,1,'P','Adult Female');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-26','K9-CW-01',125.50, 92.00,1,'P','Adult Male');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-27','K9-CW-01',155.29, 90.00,1,'P','Adult Female');
-INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-28','K9-RT-01',155.29, 90.00,1,'P','Adult Female');
-
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-1',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-2',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-3',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-4',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-5',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-6',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-7',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-8',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-9',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-10',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-11',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-12',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-13',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-14',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-15',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-16',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-17',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-18',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-19',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-20',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-21',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-22',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-23',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-24',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-25',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-26',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-27',10000);
-INSERT INTO inventory (itemid, qty ) VALUES ('EST-28',10000);

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore-hsqldb-dataload.sql (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore-hsqldb-dataload.sql)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore-hsqldb-dataload.sql	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore-hsqldb-dataload.sql	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,101 @@
+INSERT INTO sequence VALUES ('ordernum', 1000);
+INSERT INTO sequence VALUES ('linenum', 1000);
+
+INSERT INTO signon VALUES ('j2ee','j2ee');
+INSERT INTO signon VALUES ('ACID','ACID');
+
+INSERT INTO account VALUES ('j2ee','yourname at yourdomain.com','ABC', 'XYX', 'OK', '901 San Antonio Road', 'MS UCUP02-206', 'Palo Alto', 'CA', '94303', 'USA',  '555-555-5555');
+INSERT INTO account VALUES ('ACID','acid at yourdomain.com','ABC', 'XYX', 'OK', '901 San Antonio Road', 'MS UCUP02-206', 'Palo Alto', 'CA', '94303', 'USA',  '555-555-5555');
+
+INSERT INTO profile VALUES ('j2ee','english','DOGS',1,1);
+INSERT INTO profile VALUES ('ACID','english','CATS',1,1);
+
+INSERT INTO bannerdata VALUES ('FISH','<image src="../images/banner_fish.gif">');
+INSERT INTO bannerdata VALUES ('CATS','<image src="../images/banner_cats.gif">');
+INSERT INTO bannerdata VALUES ('DOGS','<image src="../images/banner_dogs.gif">');
+INSERT INTO bannerdata VALUES ('REPTILES','<image src="../images/banner_reptiles.gif">');
+INSERT INTO bannerdata VALUES ('BIRDS','<image src="../images/banner_birds.gif">');
+
+INSERT INTO category VALUES ('FISH','Fish','<image src="../images/fish_icon.gif"><font size="5" color="blue"> Fish</font>');
+INSERT INTO category VALUES ('DOGS','Dogs','<image src="../images/dogs_icon.gif"><font size="5" color="blue"> Dogs</font>');
+INSERT INTO category VALUES ('REPTILES','Reptiles','<image src="../images/reptiles_icon.gif"><font size="5" color="blue"> Reptiles</font>');
+INSERT INTO category VALUES ('CATS','Cats','<image src="../images/cats_icon.gif"><font size="5" color="blue"> Cats</font>');
+INSERT INTO category VALUES ('BIRDS','Birds','<image src="../images/birds_icon.gif"><font size="5" color="blue"> Birds</font>');
+
+INSERT INTO product VALUES ('FI-SW-01','FISH','Angelfish','<image src="../images/fish1.jpg">Salt Water fish from Australia');
+INSERT INTO product VALUES ('FI-SW-02','FISH','Tiger Shark','<image src="../images/fish4.gif">Salt Water fish from Australia');
+INSERT INTO product VALUES ('FI-FW-01','FISH', 'Koi','<image src="../images/fish3.gif">Fresh Water fish from Japan');
+INSERT INTO product VALUES ('FI-FW-02','FISH', 'Goldfish','<image src="../images/fish2.gif">Fresh Water fish from China');
+INSERT INTO product VALUES ('K9-BD-01','DOGS','Bulldog','<image src="../images/dog2.gif">Friendly dog from England');
+INSERT INTO product VALUES ('K9-PO-02','DOGS','Poodle','<image src="../images/dog6.gif">Cute dog from France');
+INSERT INTO product VALUES ('K9-DL-01','DOGS', 'Dalmation','<image src="../images/dog5.gif">Great dog for a Fire Station');
+INSERT INTO product VALUES ('K9-RT-01','DOGS', 'Golden Retriever','<image src="../images/dog1.gif">Great family dog');
+INSERT INTO product VALUES ('K9-RT-02','DOGS', 'Labrador Retriever','<image src="../images/dog5.gif">Great hunting dog');
+INSERT INTO product VALUES ('K9-CW-01','DOGS', 'Chihuahua','<image src="../images/dog4.gif">Great companion dog');
+INSERT INTO product VALUES ('RP-SN-01','REPTILES','Rattlesnake','<image src="../images/lizard3.gif">Doubles as a watch dog');
+INSERT INTO product VALUES ('RP-LI-02','REPTILES','Iguana','<image src="../images/lizard2.gif">Friendly green friend');
+INSERT INTO product VALUES ('FL-DSH-01','CATS','Manx','<image src="../images/cat3.gif">Great for reducing mouse populations');
+INSERT INTO product VALUES ('FL-DLH-02','CATS','Persian','<image src="../images/cat1.gif">Friendly house cat, doubles as a princess');
+INSERT INTO product VALUES ('AV-CB-01','BIRDS','Amazon Parrot','<image src="../images/bird4.gif">Great companion for up to 75 years');
+INSERT INTO product VALUES ('AV-SB-02','BIRDS','Finch','<image src="../images/bird1.gif">Great stress reliever');
+
+INSERT INTO supplier VALUES (1,'XYZ Pets','AC','600 Avon Way','','Los Angeles','CA','94024','212-947-0797');
+INSERT INTO supplier VALUES (2,'ABC Pets','AC','700 Abalone Way','','San Francisco ','CA','94024','415-947-0797');
+
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-1','FI-SW-01',16.50,10.00,1,'P','Large');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-2','FI-SW-01',16.50,10.00,1,'P','Small');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-3','FI-SW-02',18.50,12.00,1,'P','Toothless');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-4','FI-FW-01',18.50,12.00,1,'P','Spotted');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-5','FI-FW-01',18.50,12.00,1,'P','Spotless');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-6','K9-BD-01',18.50,12.00,1,'P','Male Adult');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-7','K9-BD-01',18.50,12.00,1,'P','Female Puppy');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-8','K9-PO-02',18.50,12.00,1,'P','Male Puppy');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-9','K9-DL-01',18.50,12.00,1,'P','Spotless Male Puppy');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-10','K9-DL-01',18.50,12.00,1,'P','Spotted Adult Female');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-11','RP-SN-01',18.50,12.00,1,'P','Venomless');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-12','RP-SN-01',18.50,12.00,1,'P','Rattleless');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-13','RP-LI-02',18.50,12.00,1,'P','Green Adult');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-14','FL-DSH-01',58.50,12.00,1,'P','Tailless');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-15','FL-DSH-01',23.50,12.00,1,'P','With tail');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-16','FL-DLH-02',93.50,12.00,1,'P','Adult Female');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-17','FL-DLH-02',93.50,12.00,1,'P','Adult Male');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-18','AV-CB-01',193.50,92.00,1,'P','Adult Male');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-19','AV-SB-02',15.50, 2.00,1,'P','Adult Male');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-20','FI-FW-02',5.50, 2.00,1,'P','Adult Male');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-21','FI-FW-02',5.29, 1.00,1,'P','Adult Female');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-22','K9-RT-02',135.50, 100.00,1,'P','Adult Male');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-23','K9-RT-02',145.49, 100.00,1,'P','Adult Female');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-24','K9-RT-02',255.50, 92.00,1,'P','Adult Male');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-25','K9-RT-02',325.29, 90.00,1,'P','Adult Female');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-26','K9-CW-01',125.50, 92.00,1,'P','Adult Male');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-27','K9-CW-01',155.29, 90.00,1,'P','Adult Female');
+INSERT INTO item (itemid, productid, listprice, unitcost, supplier, status, attr1) VALUES ('EST-28','K9-RT-01',155.29, 90.00,1,'P','Adult Female');
+
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-1',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-2',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-3',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-4',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-5',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-6',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-7',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-8',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-9',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-10',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-11',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-12',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-13',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-14',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-15',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-16',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-17',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-18',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-19',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-20',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-21',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-22',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-23',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-24',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-25',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-26',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-27',10000);
+INSERT INTO inventory (itemid, qty ) VALUES ('EST-28',10000);

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore-hsqldb-schema.sql
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore-hsqldb-schema.sql	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore-hsqldb-schema.sql	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,166 +0,0 @@
-drop index productCat;
-drop index productName;
-drop index itemProd;
-
-drop table lineitem;
-drop table orderstatus;
-drop table orders;
-drop table bannerdata;
-drop table profile;
-drop table signon;
-drop table inventory;
-drop table item;
-drop table product;
-drop table account;
-drop table category;
-drop table supplier;
-drop table sequence;
-
-create table supplier (
-    suppid int not null,
-    name varchar(80) null,
-    status varchar(2) not null,
-    addr1 varchar(80) null,
-    addr2 varchar(80) null,
-    city varchar(80) null,
-    state varchar(80) null,
-    zip varchar(5) null,
-    phone varchar(80) null,
-    constraint pk_supplier primary key (suppid)
-);
-
-create table signon (
-    username varchar(25) not null,
-    password varchar(25)  not null,
-    constraint pk_signon primary key (username)
-);
-
-create table account (
-    userid varchar(80) not null,
-    email varchar(80) not null,
-    firstname varchar(80) not null,
-    lastname varchar(80) not null,
-    status varchar(2)  null,
-    addr1 varchar(80) not null,
-    addr2 varchar(40) null,
-    city varchar(80) not  null,
-    state varchar(80) not null,
-    zip varchar(20) not null,
-    country varchar(20) not null,
-    phone varchar(80) not null,
-    constraint pk_account primary key (userid)
-);
-
-create table profile (
-    userid varchar(80) not null,
-    langpref varchar(80) not null,
-    favcategory varchar(30),
-    mylistopt int,
-    banneropt int,
-    constraint pk_profile primary key (userid)
-);
-
-create table bannerdata (
-    favcategory varchar(80) not null,
-    bannername varchar(255)  null,
-    constraint pk_bannerdata primary key (favcategory)
-);
-
-create table orders (
-      orderid int not null,
-      userid varchar(80) not null,
-      orderdate date not null,
-      shipaddr1 varchar(80) not null,
-      shipaddr2 varchar(80) null,
-      shipcity varchar(80) not null,
-      shipstate varchar(80) not null,
-      shipzip varchar(20) not null,
-      shipcountry varchar(20) not null,
-      billaddr1 varchar(80) not null,
-      billaddr2 varchar(80)  null,
-      billcity varchar(80) not null,
-      billstate varchar(80) not null,
-      billzip varchar(20) not null,
-      billcountry varchar(20) not null,
-      courier varchar(80) not null,
-      totalprice decimal(10,2) not null,
-      billtofirstname varchar(80) not null,
-      billtolastname varchar(80) not null,
-      shiptofirstname varchar(80) not null,
-      shiptolastname varchar(80) not null,
-      creditcard varchar(80) not null,
-      exprdate varchar(7) not null,
-      cardtype varchar(80) not null,
-      locale varchar(80) not null,
-      constraint pk_orders primary key (orderid)
-);
-
-create table orderstatus (
-      orderid int not null,
-      linenum int not null,
-      timestamp date not null,
-      status varchar(2) not null,
-      constraint pk_orderstatus primary key (orderid, linenum)
-);
-
-create table lineitem (
-      orderid int not null,
-      linenum int not null,
-      itemid varchar(10) not null,
-      quantity int not null,
-      unitprice decimal(10,2) not null,
-      constraint pk_lineitem primary key (orderid, linenum)
-);
-
-create table category (
-	catid varchar(10) not null,
-	name varchar(80) null,
-	descn varchar(255) null,
-	constraint pk_category primary key (catid)
-);
-
-create table product (
-    productid varchar(10) not null,
-    category varchar(10) not null,
-    name varchar(80) null,
-    descn varchar(255) null,
-    constraint pk_product primary key (productid),
-        constraint fk_product_1 foreign key (category)
-        references category (catid)
-);
-
-create index productCat on product (category);
-create index productName on product (name);
-
-create table item (
-    itemid varchar(10) not null,
-    productid varchar(10) not null,
-    listprice decimal(10,2) null,
-    unitcost decimal(10,2) null,
-    supplier int null,
-    status varchar(2) null,
-    attr1 varchar(80) null,
-    attr2 varchar(80) null,
-    attr3 varchar(80) null,
-    attr4 varchar(80) null,
-    attr5 varchar(80) null,
-    constraint pk_item primary key (itemid),
-        constraint fk_item_1 foreign key (productid)
-        references product (productid),
-        constraint fk_item_2 foreign key (supplier)
-        references supplier (suppid)
-);
-
-create index itemProd on item (productid);
-
-create table inventory (
-    itemid varchar(10) not null,
-    qty int not null,
-    constraint pk_inventory primary key (itemid)
-);
-
-create table sequence (
-    name varchar(30) not null,
-    nextid int not null,
-    constraint pk_sequence primary key (name)
-);

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore-hsqldb-schema.sql (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore-hsqldb-schema.sql)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore-hsqldb-schema.sql	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore-hsqldb-schema.sql	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,166 @@
+drop index productCat;
+drop index productName;
+drop index itemProd;
+
+drop table lineitem;
+drop table orderstatus;
+drop table orders;
+drop table bannerdata;
+drop table profile;
+drop table signon;
+drop table inventory;
+drop table item;
+drop table product;
+drop table account;
+drop table category;
+drop table supplier;
+drop table sequence;
+
+create table supplier (
+    suppid int not null,
+    name varchar(80) null,
+    status varchar(2) not null,
+    addr1 varchar(80) null,
+    addr2 varchar(80) null,
+    city varchar(80) null,
+    state varchar(80) null,
+    zip varchar(5) null,
+    phone varchar(80) null,
+    constraint pk_supplier primary key (suppid)
+);
+
+create table signon (
+    username varchar(25) not null,
+    password varchar(25)  not null,
+    constraint pk_signon primary key (username)
+);
+
+create table account (
+    userid varchar(80) not null,
+    email varchar(80) not null,
+    firstname varchar(80) not null,
+    lastname varchar(80) not null,
+    status varchar(2)  null,
+    addr1 varchar(80) not null,
+    addr2 varchar(40) null,
+    city varchar(80) not  null,
+    state varchar(80) not null,
+    zip varchar(20) not null,
+    country varchar(20) not null,
+    phone varchar(80) not null,
+    constraint pk_account primary key (userid)
+);
+
+create table profile (
+    userid varchar(80) not null,
+    langpref varchar(80) not null,
+    favcategory varchar(30),
+    mylistopt int,
+    banneropt int,
+    constraint pk_profile primary key (userid)
+);
+
+create table bannerdata (
+    favcategory varchar(80) not null,
+    bannername varchar(255)  null,
+    constraint pk_bannerdata primary key (favcategory)
+);
+
+create table orders (
+      orderid int not null,
+      userid varchar(80) not null,
+      orderdate date not null,
+      shipaddr1 varchar(80) not null,
+      shipaddr2 varchar(80) null,
+      shipcity varchar(80) not null,
+      shipstate varchar(80) not null,
+      shipzip varchar(20) not null,
+      shipcountry varchar(20) not null,
+      billaddr1 varchar(80) not null,
+      billaddr2 varchar(80)  null,
+      billcity varchar(80) not null,
+      billstate varchar(80) not null,
+      billzip varchar(20) not null,
+      billcountry varchar(20) not null,
+      courier varchar(80) not null,
+      totalprice decimal(10,2) not null,
+      billtofirstname varchar(80) not null,
+      billtolastname varchar(80) not null,
+      shiptofirstname varchar(80) not null,
+      shiptolastname varchar(80) not null,
+      creditcard varchar(80) not null,
+      exprdate varchar(7) not null,
+      cardtype varchar(80) not null,
+      locale varchar(80) not null,
+      constraint pk_orders primary key (orderid)
+);
+
+create table orderstatus (
+      orderid int not null,
+      linenum int not null,
+      timestamp date not null,
+      status varchar(2) not null,
+      constraint pk_orderstatus primary key (orderid, linenum)
+);
+
+create table lineitem (
+      orderid int not null,
+      linenum int not null,
+      itemid varchar(10) not null,
+      quantity int not null,
+      unitprice decimal(10,2) not null,
+      constraint pk_lineitem primary key (orderid, linenum)
+);
+
+create table category (
+	catid varchar(10) not null,
+	name varchar(80) null,
+	descn varchar(255) null,
+	constraint pk_category primary key (catid)
+);
+
+create table product (
+    productid varchar(10) not null,
+    category varchar(10) not null,
+    name varchar(80) null,
+    descn varchar(255) null,
+    constraint pk_product primary key (productid),
+        constraint fk_product_1 foreign key (category)
+        references category (catid)
+);
+
+create index productCat on product (category);
+create index productName on product (name);
+
+create table item (
+    itemid varchar(10) not null,
+    productid varchar(10) not null,
+    listprice decimal(10,2) null,
+    unitcost decimal(10,2) null,
+    supplier int null,
+    status varchar(2) null,
+    attr1 varchar(80) null,
+    attr2 varchar(80) null,
+    attr3 varchar(80) null,
+    attr4 varchar(80) null,
+    attr5 varchar(80) null,
+    constraint pk_item primary key (itemid),
+        constraint fk_item_1 foreign key (productid)
+        references product (productid),
+        constraint fk_item_2 foreign key (supplier)
+        references supplier (suppid)
+);
+
+create index itemProd on item (productid);
+
+create table inventory (
+    itemid varchar(10) not null,
+    qty int not null,
+    constraint pk_inventory primary key (itemid)
+);
+
+create table sequence (
+    name varchar(30) not null,
+    nextid int not null,
+    constraint pk_sequence primary key (name)
+);

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.properties
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.properties	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.properties	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,17 +0,0 @@
-#HSQL Database Engine
-#Sun Jun 03 15:08:34 EDT 2007
-hsqldb.script_format=0
-runtime.gc_interval=0
-sql.enforce_strict_size=false
-hsqldb.cache_size_scale=8
-readonly=false
-hsqldb.nio_data_file=true
-hsqldb.cache_scale=14
-version=1.8.0
-hsqldb.default_table_type=memory
-hsqldb.cache_file_scale=1
-hsqldb.log_size=200
-modified=yes
-hsqldb.cache_version=1.7.0
-hsqldb.original_version=1.8.0
-hsqldb.compatible_version=1.8.0

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.properties (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.properties)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.properties	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.properties	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,17 @@
+#HSQL Database Engine
+#Sun Jun 03 15:08:34 EDT 2007
+hsqldb.script_format=0
+runtime.gc_interval=0
+sql.enforce_strict_size=false
+hsqldb.cache_size_scale=8
+readonly=false
+hsqldb.nio_data_file=true
+hsqldb.cache_scale=14
+version=1.8.0
+hsqldb.default_table_type=memory
+hsqldb.cache_file_scale=1
+hsqldb.log_size=200
+modified=yes
+hsqldb.cache_version=1.7.0
+hsqldb.original_version=1.8.0
+hsqldb.compatible_version=1.8.0

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.script
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.script	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.script	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,131 +0,0 @@
-CREATE SCHEMA PUBLIC AUTHORIZATION DBA
-CREATE MEMORY TABLE SUPPLIER(SUPPID INTEGER NOT NULL PRIMARY KEY,NAME VARCHAR(80),STATUS VARCHAR(2) NOT NULL,ADDR1 VARCHAR(80),ADDR2 VARCHAR(80),CITY VARCHAR(80),STATE VARCHAR(80),ZIP VARCHAR(5),PHONE VARCHAR(80))
-CREATE MEMORY TABLE SIGNON(USERNAME VARCHAR(25) NOT NULL PRIMARY KEY,PASSWORD VARCHAR(25) NOT NULL)
-CREATE MEMORY TABLE ACCOUNT(USERID VARCHAR(80) NOT NULL PRIMARY KEY,EMAIL VARCHAR(80) NOT NULL,FIRSTNAME VARCHAR(80) NOT NULL,LASTNAME VARCHAR(80) NOT NULL,STATUS VARCHAR(2),ADDR1 VARCHAR(80) NOT NULL,ADDR2 VARCHAR(40),CITY VARCHAR(80) NOT NULL,STATE VARCHAR(80) NOT NULL,ZIP VARCHAR(20) NOT NULL,COUNTRY VARCHAR(20) NOT NULL,PHONE VARCHAR(80) NOT NULL)
-CREATE MEMORY TABLE PROFILE(USERID VARCHAR(80) NOT NULL PRIMARY KEY,LANGPREF VARCHAR(80) NOT NULL,FAVCATEGORY VARCHAR(30),MYLISTOPT INTEGER,BANNEROPT INTEGER)
-CREATE MEMORY TABLE BANNERDATA(FAVCATEGORY VARCHAR(80) NOT NULL PRIMARY KEY,BANNERNAME VARCHAR(255))
-CREATE MEMORY TABLE ORDERS(ORDERID INTEGER NOT NULL PRIMARY KEY,USERID VARCHAR(80) NOT NULL,ORDERDATE DATE NOT NULL,SHIPADDR1 VARCHAR(80) NOT NULL,SHIPADDR2 VARCHAR(80),SHIPCITY VARCHAR(80) NOT NULL,SHIPSTATE VARCHAR(80) NOT NULL,SHIPZIP VARCHAR(20) NOT NULL,SHIPCOUNTRY VARCHAR(20) NOT NULL,BILLADDR1 VARCHAR(80) NOT NULL,BILLADDR2 VARCHAR(80),BILLCITY VARCHAR(80) NOT NULL,BILLSTATE VARCHAR(80) NOT NULL,BILLZIP VARCHAR(20) NOT NULL,BILLCOUNTRY VARCHAR(20) NOT NULL,COURIER VARCHAR(80) NOT NULL,TOTALPRICE DECIMAL(10,2) NOT NULL,BILLTOFIRSTNAME VARCHAR(80) NOT NULL,BILLTOLASTNAME VARCHAR(80) NOT NULL,SHIPTOFIRSTNAME VARCHAR(80) NOT NULL,SHIPTOLASTNAME VARCHAR(80) NOT NULL,CREDITCARD VARCHAR(80) NOT NULL,EXPRDATE VARCHAR(7) NOT NULL,CARDTYPE VARCHAR(80) NOT NULL,LOCALE VARCHAR(80) NOT NULL)
-CREATE MEMORY TABLE ORDERSTATUS(ORDERID INTEGER NOT NULL,LINENUM INTEGER NOT NULL,TIMESTAMP DATE NOT NULL,STATUS VARCHAR(2) NOT NULL,CONSTRAINT PK_ORDERSTATUS PRIMARY KEY(ORDERID,LINENUM))
-CREATE MEMORY TABLE LINEITEM(ORDERID INTEGER NOT NULL,LINENUM INTEGER NOT NULL,ITEMID VARCHAR(10) NOT NULL,QUANTITY INTEGER NOT NULL,UNITPRICE DECIMAL(10,2) NOT NULL,CONSTRAINT PK_LINEITEM PRIMARY KEY(ORDERID,LINENUM))
-CREATE MEMORY TABLE CATEGORY(CATID VARCHAR(10) NOT NULL PRIMARY KEY,NAME VARCHAR(80),DESCN VARCHAR(255))
-CREATE MEMORY TABLE PRODUCT(PRODUCTID VARCHAR(10) NOT NULL PRIMARY KEY,CATEGORY VARCHAR(10) NOT NULL,NAME VARCHAR(80),DESCN VARCHAR(255),CONSTRAINT FK_PRODUCT_1 FOREIGN KEY(CATEGORY) REFERENCES CATEGORY(CATID))
-CREATE INDEX PRODUCTCAT ON PRODUCT(CATEGORY)
-CREATE INDEX PRODUCTNAME ON PRODUCT(NAME)
-CREATE MEMORY TABLE ITEM(ITEMID VARCHAR(10) NOT NULL PRIMARY KEY,PRODUCTID VARCHAR(10) NOT NULL,LISTPRICE DECIMAL(10,2),UNITCOST DECIMAL(10,2),SUPPLIER INTEGER,STATUS VARCHAR(2),ATTR1 VARCHAR(80),ATTR2 VARCHAR(80),ATTR3 VARCHAR(80),ATTR4 VARCHAR(80),ATTR5 VARCHAR(80),CONSTRAINT FK_ITEM_1 FOREIGN KEY(PRODUCTID) REFERENCES PRODUCT(PRODUCTID),CONSTRAINT FK_ITEM_2 FOREIGN KEY(SUPPLIER) REFERENCES SUPPLIER(SUPPID))
-CREATE INDEX ITEMPROD ON ITEM(PRODUCTID)
-CREATE MEMORY TABLE INVENTORY(ITEMID VARCHAR(10) NOT NULL PRIMARY KEY,QTY INTEGER NOT NULL)
-CREATE MEMORY TABLE SEQUENCE(NAME VARCHAR(30) NOT NULL PRIMARY KEY,NEXTID INTEGER NOT NULL)
-CREATE USER SA PASSWORD ""
-GRANT DBA TO SA
-SET WRITE_DELAY 60
-SET SCHEMA PUBLIC
-INSERT INTO SUPPLIER VALUES(1,'XYZ Pets','AC','600 Avon Way','','Los Angeles','CA','94024','212-947-0797')
-INSERT INTO SUPPLIER VALUES(2,'ABC Pets','AC','700 Abalone Way','','San Francisco ','CA','94024','415-947-0797')
-INSERT INTO SIGNON VALUES('ACID','ACID')
-INSERT INTO SIGNON VALUES('j2ee','j2ee')
-INSERT INTO ACCOUNT VALUES('ACID','acid at yourdomain.com','ABC','XYX','OK','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','94303','USA','555-555-5555')
-INSERT INTO ACCOUNT VALUES('j2ee','yourname at yourdomain.com','ABC','XYX','OK','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','94303','USA','555-555-5555')
-INSERT INTO PROFILE VALUES('ACID','english','CATS',1,1)
-INSERT INTO PROFILE VALUES('j2ee','english','DOGS',1,1)
-INSERT INTO BANNERDATA VALUES('BIRDS','<image src="../images/banner_birds.gif">')
-INSERT INTO BANNERDATA VALUES('CATS','<image src="../images/banner_cats.gif">')
-INSERT INTO BANNERDATA VALUES('DOGS','<image src="../images/banner_dogs.gif">')
-INSERT INTO BANNERDATA VALUES('FISH','<image src="../images/banner_fish.gif">')
-INSERT INTO BANNERDATA VALUES('REPTILES','<image src="../images/banner_reptiles.gif">')
-INSERT INTO ORDERS VALUES(1000,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES(1001,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES(1002,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES(1003,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES(1004,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES(1005,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES(1006,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES(1007,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES(1008,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.5,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERSTATUS VALUES(1000,1000,'2007-05-25','P')
-INSERT INTO ORDERSTATUS VALUES(1001,1001,'2007-05-25','P')
-INSERT INTO ORDERSTATUS VALUES(1002,1002,'2007-05-25','P')
-INSERT INTO ORDERSTATUS VALUES(1003,1003,'2007-05-25','P')
-INSERT INTO ORDERSTATUS VALUES(1004,1004,'2007-05-25','P')
-INSERT INTO ORDERSTATUS VALUES(1005,1005,'2007-05-25','P')
-INSERT INTO ORDERSTATUS VALUES(1006,1006,'2007-05-25','P')
-INSERT INTO ORDERSTATUS VALUES(1007,1007,'2007-05-25','P')
-INSERT INTO ORDERSTATUS VALUES(1008,1008,'2007-05-25','P')
-INSERT INTO CATEGORY VALUES('BIRDS','Birds','<image src="../images/birds_icon.gif"><font size="5" color="blue"> Birds</font>')
-INSERT INTO CATEGORY VALUES('CATS','Cats','<image src="../images/cats_icon.gif"><font size="5" color="blue"> Cats</font>')
-INSERT INTO CATEGORY VALUES('DOGS','Dogs','<image src="../images/dogs_icon.gif"><font size="5" color="blue"> Dogs</font>')
-INSERT INTO CATEGORY VALUES('FISH','Fish','<image src="../images/fish_icon.gif"><font size="5" color="blue"> Fish</font>')
-INSERT INTO CATEGORY VALUES('REPTILES','Reptiles','<image src="../images/reptiles_icon.gif"><font size="5" color="blue"> Reptiles</font>')
-INSERT INTO PRODUCT VALUES('AV-CB-01','BIRDS','Amazon Parrot','<image src="../images/bird4.gif">Great companion for up to 75 years')
-INSERT INTO PRODUCT VALUES('AV-SB-02','BIRDS','Finch','<image src="../images/bird1.gif">Great stress reliever')
-INSERT INTO PRODUCT VALUES('FI-FW-01','FISH','Koi','<image src="../images/fish3.gif">Fresh Water fish from Japan')
-INSERT INTO PRODUCT VALUES('FI-FW-02','FISH','Goldfish','<image src="../images/fish2.gif">Fresh Water fish from China')
-INSERT INTO PRODUCT VALUES('FI-SW-01','FISH','Angelfish','<image src="../images/fish1.jpg">Salt Water fish from Australia')
-INSERT INTO PRODUCT VALUES('FI-SW-02','FISH','Tiger Shark','<image src="../images/fish4.gif">Salt Water fish from Australia')
-INSERT INTO PRODUCT VALUES('FL-DLH-02','CATS','Persian','<image src="../images/cat1.gif">Friendly house cat, doubles as a princess')
-INSERT INTO PRODUCT VALUES('FL-DSH-01','CATS','Manx','<image src="../images/cat3.gif">Great for reducing mouse populations')
-INSERT INTO PRODUCT VALUES('K9-BD-01','DOGS','Bulldog','<image src="../images/dog2.gif">Friendly dog from England')
-INSERT INTO PRODUCT VALUES('K9-CW-01','DOGS','Chihuahua','<image src="../images/dog4.gif">Great companion dog')
-INSERT INTO PRODUCT VALUES('K9-DL-01','DOGS','Dalmation','<image src="../images/dog5.gif">Great dog for a Fire Station')
-INSERT INTO PRODUCT VALUES('K9-PO-02','DOGS','Poodle','<image src="../images/dog6.gif">Cute dog from France')
-INSERT INTO PRODUCT VALUES('K9-RT-01','DOGS','Golden Retriever','<image src="../images/dog1.gif">Great family dog')
-INSERT INTO PRODUCT VALUES('K9-RT-02','DOGS','Labrador Retriever','<image src="../images/dog5.gif">Great hunting dog')
-INSERT INTO PRODUCT VALUES('RP-LI-02','REPTILES','Iguana','<image src="../images/lizard2.gif">Friendly green friend')
-INSERT INTO PRODUCT VALUES('RP-SN-01','REPTILES','Rattlesnake','<image src="../images/lizard3.gif">Doubles as a watch dog')
-INSERT INTO ITEM VALUES('EST-1','FI-SW-01',16.50,10.00,1,'P','Large',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-10','K9-DL-01',18.50,12.00,1,'P','Spotted Adult Female',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-11','RP-SN-01',18.50,12.00,1,'P','Venomless',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-12','RP-SN-01',18.50,12.00,1,'P','Rattleless',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-13','RP-LI-02',18.50,12.00,1,'P','Green Adult',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-14','FL-DSH-01',58.50,12.00,1,'P','Tailless',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-15','FL-DSH-01',23.50,12.00,1,'P','With tail',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-16','FL-DLH-02',93.50,12.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-17','FL-DLH-02',93.50,12.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-18','AV-CB-01',193.50,92.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-19','AV-SB-02',15.50,2.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-2','FI-SW-01',16.50,10.00,1,'P','Small',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-20','FI-FW-02',5.50,2.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-21','FI-FW-02',5.29,1.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-22','K9-RT-02',135.50,100.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-23','K9-RT-02',145.49,100.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-24','K9-RT-02',255.50,92.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-25','K9-RT-02',325.29,90.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-26','K9-CW-01',125.50,92.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-27','K9-CW-01',155.29,90.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-28','K9-RT-01',155.29,90.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-3','FI-SW-02',18.50,12.00,1,'P','Toothless',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-4','FI-FW-01',18.50,12.00,1,'P','Spotted',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-5','FI-FW-01',18.50,12.00,1,'P','Spotless',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-6','K9-BD-01',18.50,12.00,1,'P','Male Adult',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-7','K9-BD-01',18.50,12.00,1,'P','Female Puppy',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-8','K9-PO-02',18.50,12.00,1,'P','Male Puppy',NULL,NULL,NULL,NULL)
-INSERT INTO ITEM VALUES('EST-9','K9-DL-01',18.50,12.00,1,'P','Spotless Male Puppy',NULL,NULL,NULL,NULL)
-INSERT INTO INVENTORY VALUES('EST-1',10000)
-INSERT INTO INVENTORY VALUES('EST-10',10000)
-INSERT INTO INVENTORY VALUES('EST-11',10000)
-INSERT INTO INVENTORY VALUES('EST-12',10000)
-INSERT INTO INVENTORY VALUES('EST-13',10000)
-INSERT INTO INVENTORY VALUES('EST-14',10000)
-INSERT INTO INVENTORY VALUES('EST-15',10000)
-INSERT INTO INVENTORY VALUES('EST-16',10000)
-INSERT INTO INVENTORY VALUES('EST-17',10000)
-INSERT INTO INVENTORY VALUES('EST-18',10000)
-INSERT INTO INVENTORY VALUES('EST-19',10000)
-INSERT INTO INVENTORY VALUES('EST-2',10000)
-INSERT INTO INVENTORY VALUES('EST-20',10000)
-INSERT INTO INVENTORY VALUES('EST-21',10000)
-INSERT INTO INVENTORY VALUES('EST-22',10000)
-INSERT INTO INVENTORY VALUES('EST-23',10000)
-INSERT INTO INVENTORY VALUES('EST-24',10000)
-INSERT INTO INVENTORY VALUES('EST-25',10000)
-INSERT INTO INVENTORY VALUES('EST-26',10000)
-INSERT INTO INVENTORY VALUES('EST-27',10000)
-INSERT INTO INVENTORY VALUES('EST-28',10000)
-INSERT INTO INVENTORY VALUES('EST-3',10000)
-INSERT INTO INVENTORY VALUES('EST-4',10000)
-INSERT INTO INVENTORY VALUES('EST-5',10000)
-INSERT INTO INVENTORY VALUES('EST-6',10000)
-INSERT INTO INVENTORY VALUES('EST-7',10000)
-INSERT INTO INVENTORY VALUES('EST-8',10000)
-INSERT INTO INVENTORY VALUES('EST-9',10000)
-INSERT INTO SEQUENCE VALUES('linenum',1000)
-INSERT INTO SEQUENCE VALUES('ordernum',1009)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.script (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.script)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.script	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/jpetstore.script	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,131 @@
+CREATE SCHEMA PUBLIC AUTHORIZATION DBA
+CREATE MEMORY TABLE SUPPLIER(SUPPID INTEGER NOT NULL PRIMARY KEY,NAME VARCHAR(80),STATUS VARCHAR(2) NOT NULL,ADDR1 VARCHAR(80),ADDR2 VARCHAR(80),CITY VARCHAR(80),STATE VARCHAR(80),ZIP VARCHAR(5),PHONE VARCHAR(80))
+CREATE MEMORY TABLE SIGNON(USERNAME VARCHAR(25) NOT NULL PRIMARY KEY,PASSWORD VARCHAR(25) NOT NULL)
+CREATE MEMORY TABLE ACCOUNT(USERID VARCHAR(80) NOT NULL PRIMARY KEY,EMAIL VARCHAR(80) NOT NULL,FIRSTNAME VARCHAR(80) NOT NULL,LASTNAME VARCHAR(80) NOT NULL,STATUS VARCHAR(2),ADDR1 VARCHAR(80) NOT NULL,ADDR2 VARCHAR(40),CITY VARCHAR(80) NOT NULL,STATE VARCHAR(80) NOT NULL,ZIP VARCHAR(20) NOT NULL,COUNTRY VARCHAR(20) NOT NULL,PHONE VARCHAR(80) NOT NULL)
+CREATE MEMORY TABLE PROFILE(USERID VARCHAR(80) NOT NULL PRIMARY KEY,LANGPREF VARCHAR(80) NOT NULL,FAVCATEGORY VARCHAR(30),MYLISTOPT INTEGER,BANNEROPT INTEGER)
+CREATE MEMORY TABLE BANNERDATA(FAVCATEGORY VARCHAR(80) NOT NULL PRIMARY KEY,BANNERNAME VARCHAR(255))
+CREATE MEMORY TABLE ORDERS(ORDERID INTEGER NOT NULL PRIMARY KEY,USERID VARCHAR(80) NOT NULL,ORDERDATE DATE NOT NULL,SHIPADDR1 VARCHAR(80) NOT NULL,SHIPADDR2 VARCHAR(80),SHIPCITY VARCHAR(80) NOT NULL,SHIPSTATE VARCHAR(80) NOT NULL,SHIPZIP VARCHAR(20) NOT NULL,SHIPCOUNTRY VARCHAR(20) NOT NULL,BILLADDR1 VARCHAR(80) NOT NULL,BILLADDR2 VARCHAR(80),BILLCITY VARCHAR(80) NOT NULL,BILLSTATE VARCHAR(80) NOT NULL,BILLZIP VARCHAR(20) NOT NULL,BILLCOUNTRY VARCHAR(20) NOT NULL,COURIER VARCHAR(80) NOT NULL,TOTALPRICE DECIMAL(10,2) NOT NULL,BILLTOFIRSTNAME VARCHAR(80) NOT NULL,BILLTOLASTNAME VARCHAR(80) NOT NULL,SHIPTOFIRSTNAME VARCHAR(80) NOT NULL,SHIPTOLASTNAME VARCHAR(80) NOT NULL,CREDITCARD VARCHAR(80) NOT NULL,EXPRDATE VARCHAR(7) NOT NULL,CARDTYPE VARCHAR(80) NOT NULL,LOCALE VARCHAR(80) NOT NULL)
+CREATE MEMORY TABLE ORDERSTATUS(ORDERID INTEGER NOT NULL,LINENUM INTEGER NOT NULL,TIMESTAMP DATE NOT NULL,STATUS VARCHAR(2) NOT NULL,CONSTRAINT PK_ORDERSTATUS PRIMARY KEY(ORDERID,LINENUM))
+CREATE MEMORY TABLE LINEITEM(ORDERID INTEGER NOT NULL,LINENUM INTEGER NOT NULL,ITEMID VARCHAR(10) NOT NULL,QUANTITY INTEGER NOT NULL,UNITPRICE DECIMAL(10,2) NOT NULL,CONSTRAINT PK_LINEITEM PRIMARY KEY(ORDERID,LINENUM))
+CREATE MEMORY TABLE CATEGORY(CATID VARCHAR(10) NOT NULL PRIMARY KEY,NAME VARCHAR(80),DESCN VARCHAR(255))
+CREATE MEMORY TABLE PRODUCT(PRODUCTID VARCHAR(10) NOT NULL PRIMARY KEY,CATEGORY VARCHAR(10) NOT NULL,NAME VARCHAR(80),DESCN VARCHAR(255),CONSTRAINT FK_PRODUCT_1 FOREIGN KEY(CATEGORY) REFERENCES CATEGORY(CATID))
+CREATE INDEX PRODUCTCAT ON PRODUCT(CATEGORY)
+CREATE INDEX PRODUCTNAME ON PRODUCT(NAME)
+CREATE MEMORY TABLE ITEM(ITEMID VARCHAR(10) NOT NULL PRIMARY KEY,PRODUCTID VARCHAR(10) NOT NULL,LISTPRICE DECIMAL(10,2),UNITCOST DECIMAL(10,2),SUPPLIER INTEGER,STATUS VARCHAR(2),ATTR1 VARCHAR(80),ATTR2 VARCHAR(80),ATTR3 VARCHAR(80),ATTR4 VARCHAR(80),ATTR5 VARCHAR(80),CONSTRAINT FK_ITEM_1 FOREIGN KEY(PRODUCTID) REFERENCES PRODUCT(PRODUCTID),CONSTRAINT FK_ITEM_2 FOREIGN KEY(SUPPLIER) REFERENCES SUPPLIER(SUPPID))
+CREATE INDEX ITEMPROD ON ITEM(PRODUCTID)
+CREATE MEMORY TABLE INVENTORY(ITEMID VARCHAR(10) NOT NULL PRIMARY KEY,QTY INTEGER NOT NULL)
+CREATE MEMORY TABLE SEQUENCE(NAME VARCHAR(30) NOT NULL PRIMARY KEY,NEXTID INTEGER NOT NULL)
+CREATE USER SA PASSWORD ""
+GRANT DBA TO SA
+SET WRITE_DELAY 60
+SET SCHEMA PUBLIC
+INSERT INTO SUPPLIER VALUES(1,'XYZ Pets','AC','600 Avon Way','','Los Angeles','CA','94024','212-947-0797')
+INSERT INTO SUPPLIER VALUES(2,'ABC Pets','AC','700 Abalone Way','','San Francisco ','CA','94024','415-947-0797')
+INSERT INTO SIGNON VALUES('ACID','ACID')
+INSERT INTO SIGNON VALUES('j2ee','j2ee')
+INSERT INTO ACCOUNT VALUES('ACID','acid at yourdomain.com','ABC','XYX','OK','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','94303','USA','555-555-5555')
+INSERT INTO ACCOUNT VALUES('j2ee','yourname at yourdomain.com','ABC','XYX','OK','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','94303','USA','555-555-5555')
+INSERT INTO PROFILE VALUES('ACID','english','CATS',1,1)
+INSERT INTO PROFILE VALUES('j2ee','english','DOGS',1,1)
+INSERT INTO BANNERDATA VALUES('BIRDS','<image src="../images/banner_birds.gif">')
+INSERT INTO BANNERDATA VALUES('CATS','<image src="../images/banner_cats.gif">')
+INSERT INTO BANNERDATA VALUES('DOGS','<image src="../images/banner_dogs.gif">')
+INSERT INTO BANNERDATA VALUES('FISH','<image src="../images/banner_fish.gif">')
+INSERT INTO BANNERDATA VALUES('REPTILES','<image src="../images/banner_reptiles.gif">')
+INSERT INTO ORDERS VALUES(1000,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES(1001,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES(1002,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES(1003,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES(1004,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES(1005,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES(1006,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES(1007,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.23,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES(1008,'j2ee','2007-05-25','123 Way','hoaky drive','Los Angelos','CA','30253','USA','123 Way','hoaky drive','Los Angelos','CA','30253','USA','UPS',22.5,'James','Williams','James','Williams','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERSTATUS VALUES(1000,1000,'2007-05-25','P')
+INSERT INTO ORDERSTATUS VALUES(1001,1001,'2007-05-25','P')
+INSERT INTO ORDERSTATUS VALUES(1002,1002,'2007-05-25','P')
+INSERT INTO ORDERSTATUS VALUES(1003,1003,'2007-05-25','P')
+INSERT INTO ORDERSTATUS VALUES(1004,1004,'2007-05-25','P')
+INSERT INTO ORDERSTATUS VALUES(1005,1005,'2007-05-25','P')
+INSERT INTO ORDERSTATUS VALUES(1006,1006,'2007-05-25','P')
+INSERT INTO ORDERSTATUS VALUES(1007,1007,'2007-05-25','P')
+INSERT INTO ORDERSTATUS VALUES(1008,1008,'2007-05-25','P')
+INSERT INTO CATEGORY VALUES('BIRDS','Birds','<image src="../images/birds_icon.gif"><font size="5" color="blue"> Birds</font>')
+INSERT INTO CATEGORY VALUES('CATS','Cats','<image src="../images/cats_icon.gif"><font size="5" color="blue"> Cats</font>')
+INSERT INTO CATEGORY VALUES('DOGS','Dogs','<image src="../images/dogs_icon.gif"><font size="5" color="blue"> Dogs</font>')
+INSERT INTO CATEGORY VALUES('FISH','Fish','<image src="../images/fish_icon.gif"><font size="5" color="blue"> Fish</font>')
+INSERT INTO CATEGORY VALUES('REPTILES','Reptiles','<image src="../images/reptiles_icon.gif"><font size="5" color="blue"> Reptiles</font>')
+INSERT INTO PRODUCT VALUES('AV-CB-01','BIRDS','Amazon Parrot','<image src="../images/bird4.gif">Great companion for up to 75 years')
+INSERT INTO PRODUCT VALUES('AV-SB-02','BIRDS','Finch','<image src="../images/bird1.gif">Great stress reliever')
+INSERT INTO PRODUCT VALUES('FI-FW-01','FISH','Koi','<image src="../images/fish3.gif">Fresh Water fish from Japan')
+INSERT INTO PRODUCT VALUES('FI-FW-02','FISH','Goldfish','<image src="../images/fish2.gif">Fresh Water fish from China')
+INSERT INTO PRODUCT VALUES('FI-SW-01','FISH','Angelfish','<image src="../images/fish1.jpg">Salt Water fish from Australia')
+INSERT INTO PRODUCT VALUES('FI-SW-02','FISH','Tiger Shark','<image src="../images/fish4.gif">Salt Water fish from Australia')
+INSERT INTO PRODUCT VALUES('FL-DLH-02','CATS','Persian','<image src="../images/cat1.gif">Friendly house cat, doubles as a princess')
+INSERT INTO PRODUCT VALUES('FL-DSH-01','CATS','Manx','<image src="../images/cat3.gif">Great for reducing mouse populations')
+INSERT INTO PRODUCT VALUES('K9-BD-01','DOGS','Bulldog','<image src="../images/dog2.gif">Friendly dog from England')
+INSERT INTO PRODUCT VALUES('K9-CW-01','DOGS','Chihuahua','<image src="../images/dog4.gif">Great companion dog')
+INSERT INTO PRODUCT VALUES('K9-DL-01','DOGS','Dalmation','<image src="../images/dog5.gif">Great dog for a Fire Station')
+INSERT INTO PRODUCT VALUES('K9-PO-02','DOGS','Poodle','<image src="../images/dog6.gif">Cute dog from France')
+INSERT INTO PRODUCT VALUES('K9-RT-01','DOGS','Golden Retriever','<image src="../images/dog1.gif">Great family dog')
+INSERT INTO PRODUCT VALUES('K9-RT-02','DOGS','Labrador Retriever','<image src="../images/dog5.gif">Great hunting dog')
+INSERT INTO PRODUCT VALUES('RP-LI-02','REPTILES','Iguana','<image src="../images/lizard2.gif">Friendly green friend')
+INSERT INTO PRODUCT VALUES('RP-SN-01','REPTILES','Rattlesnake','<image src="../images/lizard3.gif">Doubles as a watch dog')
+INSERT INTO ITEM VALUES('EST-1','FI-SW-01',16.50,10.00,1,'P','Large',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-10','K9-DL-01',18.50,12.00,1,'P','Spotted Adult Female',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-11','RP-SN-01',18.50,12.00,1,'P','Venomless',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-12','RP-SN-01',18.50,12.00,1,'P','Rattleless',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-13','RP-LI-02',18.50,12.00,1,'P','Green Adult',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-14','FL-DSH-01',58.50,12.00,1,'P','Tailless',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-15','FL-DSH-01',23.50,12.00,1,'P','With tail',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-16','FL-DLH-02',93.50,12.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-17','FL-DLH-02',93.50,12.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-18','AV-CB-01',193.50,92.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-19','AV-SB-02',15.50,2.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-2','FI-SW-01',16.50,10.00,1,'P','Small',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-20','FI-FW-02',5.50,2.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-21','FI-FW-02',5.29,1.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-22','K9-RT-02',135.50,100.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-23','K9-RT-02',145.49,100.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-24','K9-RT-02',255.50,92.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-25','K9-RT-02',325.29,90.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-26','K9-CW-01',125.50,92.00,1,'P','Adult Male',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-27','K9-CW-01',155.29,90.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-28','K9-RT-01',155.29,90.00,1,'P','Adult Female',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-3','FI-SW-02',18.50,12.00,1,'P','Toothless',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-4','FI-FW-01',18.50,12.00,1,'P','Spotted',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-5','FI-FW-01',18.50,12.00,1,'P','Spotless',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-6','K9-BD-01',18.50,12.00,1,'P','Male Adult',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-7','K9-BD-01',18.50,12.00,1,'P','Female Puppy',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-8','K9-PO-02',18.50,12.00,1,'P','Male Puppy',NULL,NULL,NULL,NULL)
+INSERT INTO ITEM VALUES('EST-9','K9-DL-01',18.50,12.00,1,'P','Spotless Male Puppy',NULL,NULL,NULL,NULL)
+INSERT INTO INVENTORY VALUES('EST-1',10000)
+INSERT INTO INVENTORY VALUES('EST-10',10000)
+INSERT INTO INVENTORY VALUES('EST-11',10000)
+INSERT INTO INVENTORY VALUES('EST-12',10000)
+INSERT INTO INVENTORY VALUES('EST-13',10000)
+INSERT INTO INVENTORY VALUES('EST-14',10000)
+INSERT INTO INVENTORY VALUES('EST-15',10000)
+INSERT INTO INVENTORY VALUES('EST-16',10000)
+INSERT INTO INVENTORY VALUES('EST-17',10000)
+INSERT INTO INVENTORY VALUES('EST-18',10000)
+INSERT INTO INVENTORY VALUES('EST-19',10000)
+INSERT INTO INVENTORY VALUES('EST-2',10000)
+INSERT INTO INVENTORY VALUES('EST-20',10000)
+INSERT INTO INVENTORY VALUES('EST-21',10000)
+INSERT INTO INVENTORY VALUES('EST-22',10000)
+INSERT INTO INVENTORY VALUES('EST-23',10000)
+INSERT INTO INVENTORY VALUES('EST-24',10000)
+INSERT INTO INVENTORY VALUES('EST-25',10000)
+INSERT INTO INVENTORY VALUES('EST-26',10000)
+INSERT INTO INVENTORY VALUES('EST-27',10000)
+INSERT INTO INVENTORY VALUES('EST-28',10000)
+INSERT INTO INVENTORY VALUES('EST-3',10000)
+INSERT INTO INVENTORY VALUES('EST-4',10000)
+INSERT INTO INVENTORY VALUES('EST-5',10000)
+INSERT INTO INVENTORY VALUES('EST-6',10000)
+INSERT INTO INVENTORY VALUES('EST-7',10000)
+INSERT INTO INVENTORY VALUES('EST-8',10000)
+INSERT INTO INVENTORY VALUES('EST-9',10000)
+INSERT INTO SEQUENCE VALUES('linenum',1000)
+INSERT INTO SEQUENCE VALUES('ordernum',1009)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.bat
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.bat	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.bat	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,2 +0,0 @@
-"%JAVA_HOME%/bin/java" -classpath ..\lib\hsqldb.jar org.hsqldb.util.DatabaseManager
-

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.bat (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.bat)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.bat	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.bat	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,2 @@
+"%JAVA_HOME%/bin/java" -classpath ..\lib\hsqldb.jar org.hsqldb.util.DatabaseManager
+

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.sh
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.sh	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.sh	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1 +0,0 @@
-java -cp ../lib/hsqldb.jar org.hsqldb.util.DatabaseManager

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.sh (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.sh)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.sh	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.sh	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1 @@
+java -cp ../lib/hsqldb.jar org.hsqldb.util.DatabaseManager

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.bat
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/server.bat	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.bat	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1 +0,0 @@
-"%JAVA_HOME%/bin/java" -classpath ..\lib\hsqldb.jar org.hsqldb.Server -database jpetstore
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.bat (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/server.bat)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.bat	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.bat	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1 @@
+"%JAVA_HOME%/bin/java" -classpath ..\lib\hsqldb.jar org.hsqldb.Server -database jpetstore
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.properties
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/server.properties	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.properties	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,2 +0,0 @@
-server.port=9002
-server.trace=true

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.properties (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/server.properties)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.properties	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.properties	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,2 @@
+server.port=9002
+server.trace=true

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.sh
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/server.sh	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.sh	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1 +0,0 @@
-java -classpath ../lib/hsqldb.jar org.hsqldb.Server -database jpetstore
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.sh (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/hsqldb/server.sh)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.sh	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.sh	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1 @@
+java -classpath ../lib/hsqldb.jar org.hsqldb.Server -database jpetstore
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/jbm-queue-service.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,16 +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_helloworld_action_Request"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-
-  </mbean>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_action_Response"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-</server>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbm-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/jbm-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbm-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_action_Request"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_action_Response"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+</server>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/jboss-esb.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jboss-esb.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,50 +0,0 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
-
-    <providers>
-          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
-                      
-              <jms-bus busid="quickstartGwChannel">
-                  <jms-message-filter
-                      dest-type="QUEUE"
-                      dest-name="queue/quickstart_spring_jpetstore_Request"
-                  />
-              </jms-bus>
-              <jms-bus busid="quickstartEsbChannel">
-                  <jms-message-filter
-                      dest-type="QUEUE"
-                      dest-name="queue/B"
-                  />
-              </jms-bus>
-
-          </jms-provider>
-      </providers>
-      
-      <services>
-          
-        <service category="Spring_JPetstore_ActionESB" 
-                 name="SimpleListener" 
-                 description="Hello World" >
-            <listeners>
-                <jms-listener name="JMS-Gateway"
-                    busidref="quickstartGwChannel"                         
-                    maxThreads="1"
-                    is-gateway="true"
-                />
-                <jms-listener name="JMS-ESBListener"
-                              busidref="quickstartEsbChannel"
-                              maxThreads="1"
-                />                
-            </listeners>
-            <actions>
-               <action name="insertOrderAction" 
-               		class="org.jboss.soa.esb.samples.quickstart.spring.InsertOrderAction" 
-               		process="insertOrder">
-               		<property name="exceptionMethod" value="exceptionHandler"/>
-               		<property name="springContextXml" value="applicationContext.xml,dataAccessContext-local.xml"/>
-               </action>               
-            </actions>
-        </service>
-      </services>
-     
-</jbossesb>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jboss-esb.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/jboss-esb.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jboss-esb.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jboss-esb.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,50 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
+
+    <providers>
+          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
+                      
+              <jms-bus busid="quickstartGwChannel">
+                  <jms-message-filter
+                      dest-type="QUEUE"
+                      dest-name="queue/quickstart_spring_jpetstore_Request"
+                  />
+              </jms-bus>
+              <jms-bus busid="quickstartEsbChannel">
+                  <jms-message-filter
+                      dest-type="QUEUE"
+                      dest-name="queue/B"
+                  />
+              </jms-bus>
+
+          </jms-provider>
+      </providers>
+      
+      <services>
+          
+        <service category="Spring_JPetstore_ActionESB" 
+                 name="SimpleListener" 
+                 description="Hello World" >
+            <listeners>
+                <jms-listener name="JMS-Gateway"
+                    busidref="quickstartGwChannel"                         
+                    maxThreads="1"
+                    is-gateway="true"
+                />
+                <jms-listener name="JMS-ESBListener"
+                              busidref="quickstartEsbChannel"
+                              maxThreads="1"
+                />                
+            </listeners>
+            <actions>
+               <action name="insertOrderAction" 
+               		class="org.jboss.soa.esb.samples.quickstart.spring.InsertOrderAction" 
+               		process="insertOrder">
+               		<property name="exceptionMethod" value="exceptionHandler"/>
+               		<property name="springContextXml" value="applicationContext.xml,dataAccessContext-local.xml"/>
+               </action>               
+            </actions>
+        </service>
+      </services>
+     
+</jbossesb>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbossesb-gateway.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/jbossesb-gateway.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbossesb-gateway.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	NOTE: DO NOT MODIFY
-	This file was auto-generated.
--->
-<jbossesb-gateways parameterReloadSecs="5">
-<JMS-Gateway connection-factory="ConnectionFactory" destination-name="queue/quickstart_spring_jpetstore_Request" destination-type="queue" gatewayClass="org.jboss.soa.esb.listeners.gateway.JmsGatewayListener" maxThreads="1" service-description="Hello World" target-service-category="Spring_JPetstore_ActionESB" target-service-name="SimpleListener"/>
-</jbossesb-gateways>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbossesb-gateway.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/jbossesb-gateway.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbossesb-gateway.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbossesb-gateway.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	NOTE: DO NOT MODIFY
+	This file was auto-generated.
+-->
+<jbossesb-gateways parameterReloadSecs="5">
+<JMS-Gateway connection-factory="ConnectionFactory" destination-name="queue/quickstart_spring_jpetstore_Request" destination-type="queue" gatewayClass="org.jboss.soa.esb.listeners.gateway.JmsGatewayListener" maxThreads="1" service-description="Hello World" target-service-category="Spring_JPetstore_ActionESB" target-service-name="SimpleListener"/>
+</jbossesb-gateways>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbossesb-listener.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/jbossesb-listener.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbossesb-listener.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	NOTE: DO NOT MODIFY
-	This file was auto-generated.
--->
-<jbossesb-listeners parameterReloadSecs="5">
-<JMS-ESBListener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="1" service-category="Spring_JPetstore_ActionESB" service-description="Hello World" service-name="SimpleListener">
-<EPR connection-factory="ConnectionFactory" destination-name="queue/B" destination-type="queue" protocol="jms"/>
-<action action="insertOrderAction" class="org.jboss.soa.esb.samples.quickstart.spring.InsertOrderAction" exceptionMethod="exceptionHandler" process="insertOrder" springContextXml="applicationContext.xml,dataAccessContext-local.xml"/>
-</JMS-ESBListener>
-</jbossesb-listeners>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbossesb-listener.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/jbossesb-listener.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbossesb-listener.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbossesb-listener.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	NOTE: DO NOT MODIFY
+	This file was auto-generated.
+-->
+<jbossesb-listeners parameterReloadSecs="5">
+<JMS-ESBListener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="1" service-category="Spring_JPetstore_ActionESB" service-description="Hello World" service-name="SimpleListener">
+<EPR connection-factory="ConnectionFactory" destination-name="queue/B" destination-type="queue" protocol="jms"/>
+<action action="insertOrderAction" class="org.jboss.soa.esb.samples.quickstart.spring.InsertOrderAction" exceptionMethod="exceptionHandler" process="insertOrder" springContextXml="applicationContext.xml,dataAccessContext-local.xml"/>
+</JMS-ESBListener>
+</jbossesb-listeners>

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

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

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jdbc.properties
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/jdbc.properties	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jdbc.properties	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,8 +0,0 @@
-# Properties file with JDBC-related settings.
-# Applied by PropertyPlaceholderConfigurer from "dataAccessContext-local.xml".
-# Targeted at system administrators, to avoid touching the context XML files.
-
-jdbc.driverClassName=org.hsqldb.jdbcDriver
-jdbc.url=jdbc:hsqldb:hsql://localhost:9002
-jdbc.username=sa
-jdbc.password=

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jdbc.properties (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/jdbc.properties)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jdbc.properties	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jdbc.properties	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,8 @@
+# Properties file with JDBC-related settings.
+# Applied by PropertyPlaceholderConfigurer from "dataAccessContext-local.xml".
+# Targeted at system administrators, to avoid touching the context XML files.
+
+jdbc.driverClassName=org.hsqldb.jdbcDriver
+jdbc.url=jdbc:hsqldb:hsql://localhost:9002
+jdbc.username=sa
+jdbc.password=

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jndi.properties
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/jndi.properties	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jndi.properties	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,5 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-java.naming.factory.url.pkgs=org.jnp.interfaces
-

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jndi.properties (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/jndi.properties)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jndi.properties	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jndi.properties	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,5 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming
+java.naming.factory.url.pkgs=org.jnp.interfaces
+

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

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

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/lib)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-beanutils.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-beanutils.jar (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/lib/commons-beanutils.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-collections.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-collections.jar (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/lib/commons-collections.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-dbcp.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-dbcp.jar (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/lib/commons-dbcp.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-digester.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-digester.jar (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/lib/commons-digester.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-discovery.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-discovery.jar (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/lib/commons-discovery.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-logging.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-logging.jar (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/lib/commons-logging.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-pool.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-pool.jar (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/lib/commons-pool.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-validator.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/commons-validator.jar (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/lib/commons-validator.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/hsqldb.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/hsqldb.jar (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/lib/hsqldb.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/ibatis-2.3.0.677.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/ibatis-2.3.0.677.jar (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/lib/ibatis-2.3.0.677.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/jpetstore.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/jpetstore.jar (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/lib/jpetstore.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/xstream-1.2.2.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/xstream-1.2.2.jar (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/lib/xstream-1.2.2.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/log4j.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/log4j.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/log4j.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -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="Threshold" value="INFO"/>
-     <param name="Append" value="false"/>
-     <param name="MaxFileSize" value="500KB"/>
-     <param name="MaxBackupIndex" value="1"/>
-
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d %-5p [%t][%c] %m%n"/>
-     </layout>	    
-   </appender>
-
-   <!-- ================ -->
-   <!-- Limit categories -->
-   <!-- ================ -->
-
-   <category name="org.jboss">
-      <priority value="WARN"/>
-   </category>
-   <category name="org.jboss.soa.esb">
-      <priority value="ERROR"/>
-   </category>
-   <category name="org.jboss.internal.soa.esb">
-      <priority value="ERROR"/>
-   </category>
-   <category name="org.apache">
-      <priority value="ERROR"/>
-   </category>
-   <category name="quickstart">
-      <priority value="INFO"/>
-   </category>
-   <!-- ======================= -->
-   <!-- Setup the Root category -->
-   <!-- ======================= -->
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-      <appender-ref ref="FILE"/>
-   </root>
-
-</log4j:configuration>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/log4j.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/log4j.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/log4j.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/log4j.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -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="Threshold" value="INFO"/>
+     <param name="Append" value="false"/>
+     <param name="MaxFileSize" value="500KB"/>
+     <param name="MaxBackupIndex" value="1"/>
+
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="%d %-5p [%t][%c] %m%n"/>
+     </layout>	    
+   </appender>
+
+   <!-- ================ -->
+   <!-- Limit categories -->
+   <!-- ================ -->
+
+   <category name="org.jboss">
+      <priority value="WARN"/>
+   </category>
+   <category name="org.jboss.soa.esb">
+      <priority value="ERROR"/>
+   </category>
+   <category name="org.jboss.internal.soa.esb">
+      <priority value="ERROR"/>
+   </category>
+   <category name="org.apache">
+      <priority value="ERROR"/>
+   </category>
+   <category name="quickstart">
+      <priority value="INFO"/>
+   </category>
+   <!-- ======================= -->
+   <!-- Setup the Root category -->
+   <!-- ======================= -->
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+      <appender-ref ref="FILE"/>
+   </root>
+
+</log4j:configuration>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/readme.txt
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/readme.txt	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/readme.txt	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,96 +0,0 @@
-Overview:
-=========
-	The purpose of the spring_jpetstore quickstart sample is to show advanced use of 
-	Spring based action invocations.  You can leverage any application logic, like
-	the business logic tier of a spring based web application by looking up the
-	business service bean and executing a method. This is a complex usage of Spring
-	that includes AOP, iBatis, a datasource and transaction management.
-	
-	You can specify Spring bean XML definitions in jboss-esb.xml and lookup the beans
-	in your Action class. Each Action loads a single Spring IoC container upon first spring bean
-	invocation. Subsequent invocations will not load a new IoC container. In this example
-	many Spring dependencies are included and used.
-
-Running this quickstart:
-========================
-	Please refer to 'ant help-quickstarts' for prerequisites about the quickstarts and a
-	more detailed descripton of the different ways to run the quickstarts.
-
-To Run standalone mode:
-=======================
-    1.  In a command terminal window in the quickstart folder type 'ant deploy-jms-dests'.
-    2.  In a command terminal window in this folder ("Window1"), type 'ant start-hsqldb'.
-    3.  In a command terminal window in this folder ("Window1"), type 'ant run'.
-    4.  Open another command terminal window in this folder ("Window2"), type 'ant runtest'.
-    5.  Switch back to "Window1" to see the output from the ESB
-    6. 	Shutdown the listener by simply using Ctrl-C in that window.
-
-To Run '.esb' archive mode:
-===========================
-    1.  In a command terminal window in this folder ("Window1"), type 'ant undeploy-jms-dests'.
-    2.  In a command terminal window in this folder ("Window1"), type 'ant start-hsqldb'.
-    3.  In a command terminal window in this folder ("Window1"), type 'ant deploy'.
-    4.  Open another command terminal window in this folder ("Window2"), type 'ant runtest'.
-    5.  Switch back to Application Server console to see the output from the ESB
-
-To Run '.esb' archive mode:
-===========================
-    1.  In a command terminal window in this folder ("Window1"), type 'ant undeploy-jms-dests'.
-    2.  In a command terminal window in this folder ("Window1"), type 'ant start-hsqldb'.
-    3.  In a command terminal window in this folder ("Window1"), type 'ant deploy'.
-    4.  Open another command terminal window in this folder ("Window2"), type 'ant runtest'.
-    5.  Switch back to Application Server console to see the output from the ESB
-
-	'run' target description:
-	In a command prompt window, start the listeners by simply running "ant"
-	in this directory. It is important to note that this build.xml file adds several
-	Spring dependency JARs to the classpath. Those JARS are located in the "lib" directory.
-	Since spring.jar, spring-aspects.jar and spring-mock.jar are already in the JBossESB 
-	classpath, they are not included in the lib directory. You might review the build.xml 
-	file to see how it is setup. More details on the build.xml can be found later in this 
-	document.  Shutdown	the listener by simply using Ctrl-C in that window. 
-
-	'runtest' target description:
-	In a separate command prompt window, run "ant runtest" to shoot a JMS message
-	into the listener which will then place the contents of "sample-order.xml"
-	on a JMS queue.  You can modify the "sample-order.xml" to change the order details
-	and re-run "ant runtest". The following XML changes will be output to the console:
-		<totalPrice></totalPrice>
-		<shipToFirstName></shipToFirstName>
-		<shipToLastName></shipToLastName>
-		<shipAddress1></shipAddress1>
-		<shipAddress2></shipAddress2>
-		<shipCity></shipCity>
-		<shipState></shipState>
-		<shipZip></shipZip>
-	
-	After you have run the test and seen the activity on the console also use the a queue viewer
-	like the one found in the JBoss JMX Console (if you are using JBossMQ) to 
-	see the modified message in the outbound queue: quickstart_helloworld_action_Response
-
-Project file descriptions:
-==========================
-	
-	InsertOrderAction.java:
-	Takes the sample order XML from the ESB message then converts it into an Order POJO. The
-	order POJO is then inserted into the Spring JPetstore database by calling the 
-	"PetStoreFacade.insertOrder()" method. The "PestoreFacade.insertOrder()" method uses
-	a SpringAOP transaction advice. 
-	
-	After successful insert, the InsertOrderAction will query the database, by using 
-	"PetStoreFacade.getOrdersByUsername()". and display the Order
-	details in the console.
-
-	jbossesb.xml:
-	Make sure that the Spring application context files are defined via the "springContextXml" property.
-	<action name="insertOrderAction" 
-       		class="org.jboss.soa.esb.samples.quickstart.spring.InsertOrderAction" 
-       		process="insertOrder">
-       		<property name="exceptionMethod" value="exceptionHandler"/>
-       		<property name="springContextXml" value="applicationContext.xml,dataAccessContext-local.xml"/>
-    </action>      
-  
-	An ESB action class must have a constructor that accepts a ConfigTree argument like the following:
-	public MyJMSListenerAction(ConfigTree config) { _config = config; } 
- 
-	A ConfigTree is an object holding any attributes associated with the action declaration in the jbossesb.xml

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/readme.txt (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/readme.txt)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/readme.txt	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/readme.txt	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,96 @@
+Overview:
+=========
+	The purpose of the spring_jpetstore quickstart sample is to show advanced use of 
+	Spring based action invocations.  You can leverage any application logic, like
+	the business logic tier of a spring based web application by looking up the
+	business service bean and executing a method. This is a complex usage of Spring
+	that includes AOP, iBatis, a datasource and transaction management.
+	
+	You can specify Spring bean XML definitions in jboss-esb.xml and lookup the beans
+	in your Action class. Each Action loads a single Spring IoC container upon first spring bean
+	invocation. Subsequent invocations will not load a new IoC container. In this example
+	many Spring dependencies are included and used.
+
+Running this quickstart:
+========================
+	Please refer to 'ant help-quickstarts' for prerequisites about the quickstarts and a
+	more detailed descripton of the different ways to run the quickstarts.
+
+To Run standalone mode:
+=======================
+    1.  In a command terminal window in the quickstart folder type 'ant deploy-jms-dests'.
+    2.  In a command terminal window in this folder ("Window1"), type 'ant start-hsqldb'.
+    3.  In a command terminal window in this folder ("Window1"), type 'ant run'.
+    4.  Open another command terminal window in this folder ("Window2"), type 'ant runtest'.
+    5.  Switch back to "Window1" to see the output from the ESB
+    6. 	Shutdown the listener by simply using Ctrl-C in that window.
+
+To Run '.esb' archive mode:
+===========================
+    1.  In a command terminal window in this folder ("Window1"), type 'ant undeploy-jms-dests'.
+    2.  In a command terminal window in this folder ("Window1"), type 'ant start-hsqldb'.
+    3.  In a command terminal window in this folder ("Window1"), type 'ant deploy'.
+    4.  Open another command terminal window in this folder ("Window2"), type 'ant runtest'.
+    5.  Switch back to Application Server console to see the output from the ESB
+
+To Run '.esb' archive mode:
+===========================
+    1.  In a command terminal window in this folder ("Window1"), type 'ant undeploy-jms-dests'.
+    2.  In a command terminal window in this folder ("Window1"), type 'ant start-hsqldb'.
+    3.  In a command terminal window in this folder ("Window1"), type 'ant deploy'.
+    4.  Open another command terminal window in this folder ("Window2"), type 'ant runtest'.
+    5.  Switch back to Application Server console to see the output from the ESB
+
+	'run' target description:
+	In a command prompt window, start the listeners by simply running "ant"
+	in this directory. It is important to note that this build.xml file adds several
+	Spring dependency JARs to the classpath. Those JARS are located in the "lib" directory.
+	Since spring.jar, spring-aspects.jar and spring-mock.jar are already in the JBossESB 
+	classpath, they are not included in the lib directory. You might review the build.xml 
+	file to see how it is setup. More details on the build.xml can be found later in this 
+	document.  Shutdown	the listener by simply using Ctrl-C in that window. 
+
+	'runtest' target description:
+	In a separate command prompt window, run "ant runtest" to shoot a JMS message
+	into the listener which will then place the contents of "sample-order.xml"
+	on a JMS queue.  You can modify the "sample-order.xml" to change the order details
+	and re-run "ant runtest". The following XML changes will be output to the console:
+		<totalPrice></totalPrice>
+		<shipToFirstName></shipToFirstName>
+		<shipToLastName></shipToLastName>
+		<shipAddress1></shipAddress1>
+		<shipAddress2></shipAddress2>
+		<shipCity></shipCity>
+		<shipState></shipState>
+		<shipZip></shipZip>
+	
+	After you have run the test and seen the activity on the console also use the a queue viewer
+	like the one found in the JBoss JMX Console (if you are using JBossMQ) to 
+	see the modified message in the outbound queue: quickstart_helloworld_action_Response
+
+Project file descriptions:
+==========================
+	
+	InsertOrderAction.java:
+	Takes the sample order XML from the ESB message then converts it into an Order POJO. The
+	order POJO is then inserted into the Spring JPetstore database by calling the 
+	"PetStoreFacade.insertOrder()" method. The "PestoreFacade.insertOrder()" method uses
+	a SpringAOP transaction advice. 
+	
+	After successful insert, the InsertOrderAction will query the database, by using 
+	"PetStoreFacade.getOrdersByUsername()". and display the Order
+	details in the console.
+
+	jbossesb.xml:
+	Make sure that the Spring application context files are defined via the "springContextXml" property.
+	<action name="insertOrderAction" 
+       		class="org.jboss.soa.esb.samples.quickstart.spring.InsertOrderAction" 
+       		process="insertOrder">
+       		<property name="exceptionMethod" value="exceptionHandler"/>
+       		<property name="springContextXml" value="applicationContext.xml,dataAccessContext-local.xml"/>
+    </action>      
+  
+	An ESB action class must have a constructor that accepts a ConfigTree argument like the following:
+	public MyJMSListenerAction(ConfigTree config) { _config = config; } 
+ 
+	A ConfigTree is an object holding any attributes associated with the action declaration in the jbossesb.xml

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/sample-order.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/sample-order.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/sample-order.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,29 +0,0 @@
-<order>
-	<orderId>12345</orderId>
-	<username>j2ee</username>
-	<orderDate>2007-05-25 00:00:00.0 EDT</orderDate>
-	<shipAddress1>123 Way</shipAddress1>
-	<shipAddress2>hoaky drive</shipAddress2>
-	<shipCity>Los Angelos</shipCity>
-	<shipState>CA</shipState>
-	<shipZip>30253</shipZip>
-	<shipCountry>USA</shipCountry>
-	<billAddress1>123 Way</billAddress1>
-	<billAddress2>hoaky drive</billAddress2>
-	<billCity>Los Angelos</billCity>
-	<billState>CA</billState>
-	<billZip>30253</billZip>
-	<billCountry>USA</billCountry>
-	<courier>UPS</courier>
-	<totalPrice>32.50</totalPrice>
-	<billToFirstName>James</billToFirstName>
-	<billToLastName>Williams</billToLastName>
-	<shipToFirstName>James</shipToFirstName>
-	<shipToLastName>Williams</shipToLastName>
-	<creditCard>999 9999 9999 9999</creditCard>
-	<expiryDate>12/03</expiryDate>
-	<cardType>Visa</cardType>
-	<locale>CA</locale>
-	<status>P</status>
-	<lineItems />
-</order>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/sample-order.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/sample-order.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/sample-order.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/sample-order.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,29 @@
+<order>
+	<orderId>12345</orderId>
+	<username>j2ee</username>
+	<orderDate>2007-05-25 00:00:00.0 EDT</orderDate>
+	<shipAddress1>123 Way</shipAddress1>
+	<shipAddress2>hoaky drive</shipAddress2>
+	<shipCity>Los Angelos</shipCity>
+	<shipState>CA</shipState>
+	<shipZip>30253</shipZip>
+	<shipCountry>USA</shipCountry>
+	<billAddress1>123 Way</billAddress1>
+	<billAddress2>hoaky drive</billAddress2>
+	<billCity>Los Angelos</billCity>
+	<billState>CA</billState>
+	<billZip>30253</billZip>
+	<billCountry>USA</billCountry>
+	<courier>UPS</courier>
+	<totalPrice>32.50</totalPrice>
+	<billToFirstName>James</billToFirstName>
+	<billToLastName>Williams</billToLastName>
+	<shipToFirstName>James</shipToFirstName>
+	<shipToLastName>Williams</shipToLastName>
+	<creditCard>999 9999 9999 9999</creditCard>
+	<expiryDate>12/03</expiryDate>
+	<cardType>Visa</cardType>
+	<locale>CA</locale>
+	<status>P</status>
+	<lineItems />
+</order>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/sql-map-config.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/sql-map-config.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/sql-map-config.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sqlMapConfig PUBLIC "-//iBATIS.com//DTD SQL Map Config 2.0//EN"
-    "http://www.ibatis.com/dtd/sql-map-config-2.dtd">
-
-<sqlMapConfig>
-
-	<sqlMap resource="org/springframework/samples/jpetstore/dao/ibatis/maps/Account.xml"/>
-	<sqlMap resource="org/springframework/samples/jpetstore/dao/ibatis/maps/Category.xml"/>
-	<sqlMap resource="org/springframework/samples/jpetstore/dao/ibatis/maps/Product.xml"/>
-	<sqlMap resource="org/springframework/samples/jpetstore/dao/ibatis/maps/Item.xml"/>
-	<sqlMap resource="org/springframework/samples/jpetstore/dao/ibatis/maps/Order.xml"/>
-	<sqlMap resource="org/springframework/samples/jpetstore/dao/ibatis/maps/LineItem.xml"/>
-	<sqlMap resource="org/springframework/samples/jpetstore/dao/ibatis/maps/Sequence.xml"/>
-
-</sqlMapConfig>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/sql-map-config.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/sql-map-config.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/sql-map-config.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/sql-map-config.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sqlMapConfig PUBLIC "-//iBATIS.com//DTD SQL Map Config 2.0//EN"
+    "http://www.ibatis.com/dtd/sql-map-config-2.dtd">
+
+<sqlMapConfig>
+
+	<sqlMap resource="org/springframework/samples/jpetstore/dao/ibatis/maps/Account.xml"/>
+	<sqlMap resource="org/springframework/samples/jpetstore/dao/ibatis/maps/Category.xml"/>
+	<sqlMap resource="org/springframework/samples/jpetstore/dao/ibatis/maps/Product.xml"/>
+	<sqlMap resource="org/springframework/samples/jpetstore/dao/ibatis/maps/Item.xml"/>
+	<sqlMap resource="org/springframework/samples/jpetstore/dao/ibatis/maps/Order.xml"/>
+	<sqlMap resource="org/springframework/samples/jpetstore/dao/ibatis/maps/LineItem.xml"/>
+	<sqlMap resource="org/springframework/samples/jpetstore/dao/ibatis/maps/Sequence.xml"/>
+
+</sqlMapConfig>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/src)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/src/org)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/src/org/jboss)

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

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

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

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/InsertOrderAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/InsertOrderAction.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/InsertOrderAction.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,157 +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.quickstart.spring;
-
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.actions.AbstractSpringAction;
-import org.jboss.soa.esb.actions.ActionLifecycleException;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Body;
-import org.jboss.soa.esb.message.Message;
-
-import org.springframework.samples.jpetstore.domain.logic.PetStoreFacade;
-import org.springframework.samples.jpetstore.domain.Item;
-import org.springframework.samples.jpetstore.domain.Order;
-import org.springframework.samples.jpetstore.domain.LineItem;
-import java.util.Date;
-import java.util.List;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
-
-/**
- * Spring enabled action that makes a DB insert call to the 
- * Spring jpetstore sample application.
- * 
- * @see org.jboss.soa.esb.actions.AbstractSpringAction
- * @see applicationContext.xml
- * @see dataAccessContext-local.xml
- * 
- * @author <a href="mailto:james.williams at redhat.com">James Williams</a>.
- * 
- */
-public class InsertOrderAction extends AbstractSpringAction
-{
-   public InsertOrderAction(ConfigTree config) throws Exception
-   {
-      configTree = config;
-   }
-
-   public Message insertOrder(Message message) throws Exception
-   {
-      Body msgBody = message.getBody();
-      XStream xstream = new XStream(new DomDriver());
-      xstream.alias("order", Order.class);
-      Order order = (Order) xstream.fromXML(new String(msgBody.getByteArray()));
-
-      PetStoreFacade petStore = (PetStoreFacade) getBeanFactory()
-            .getBean("petStore");
-      petStore.insertOrder(order);
-
-      System.out.println("ORDER SUCCESSFULLY INSERTED\n");
-      printOrderDetails(getOrderFromDB());
-
-      return message;
-   }
-
-   private void printOrderDetails(Order order)
-   {
-      System.out.println("************************");
-      System.out.println("TOTAL PRICE: " + order.getTotalPrice());
-      System.out.println("SHIP TO:");
-      System.out.println(order.getShipToFirstName() + " "
-            + order.getShipToLastName());
-      System.out.println(order.getShipAddress1() + " "
-            + order.getShipAddress2());
-      System.out.println(order.getShipCity() + " " + order.getShipZip());
-      System.out.println("************************");
-   }
-
-   private Order getOrderFromDB() throws Exception
-   {
-      PetStoreFacade petStore = (PetStoreFacade) getBeanFactory()
-            .getBean("petStore");
-      System.out.println("QUERYING DATABASE FOR INSERTED ORDER");
-      List<Order> orders = petStore.getOrdersByUsername("j2ee");
-      return orders.get(orders.size() - 1);
-   }
-
-   // utility methods used to create/generate a test order pojo and xml
-
-   // private Order getTestOrder()
-   // {
-   // Order order = new Order();
-   //	   
-   // order.setOrderDate(new Date());
-   // order.setStatus("P");
-   // order.setTotalPrice(22.22);
-   // order.setUsername("j2ee");
-   // order.setShipToFirstName("ABC");
-   // order.setShipToLastName("XYX");
-   // order.setShipState("CA");
-   //	   
-   // order.setShipToFirstName("James");
-   // order.setShipToLastName("Williams");
-   // order.setShipAddress1("123 Way");
-   // order.setShipAddress2("hoaky drive");
-   // order.setShipCity("Los Angelos");
-   // order.setShipCountry("USA");
-   // order.setShipZip("30253");
-   //	    
-   // order.setBillToFirstName("James");
-   // order.setBillToLastName("Williams");
-   // order.setBillAddress1("123 Way");
-   // order.setBillAddress2("hoaky drive");
-   // order.setBillCity("Los Angelos");
-   // order.setBillCountry("USA");
-   // order.setBillState("CA");
-   // order.setBillZip("30253");
-   //	   
-   // order.setCreditCard("999 9999 9999 9999");
-   // order.setExpiryDate("12/03");
-   // order.setCardType("Visa");
-   // order.setLocale("CA");
-   // order.setCourier("UPS");
-   //	   
-   // LineItem lineItem = new LineItem();
-   // lineItem.setItemId("EST-8");
-   // lineItem.setLineNumber(1);
-   // lineItem.setQuantity(10);
-   // Item item = new Item();
-   // item.setItemId("EST-8");
-   // item.setListPrice(18.5);
-   // lineItem.setItem(item);
-   // order.addLineItem(lineItem);
-   //	   
-   // return order;
-   // }
-
-   // private String serializeOrder(Order order)
-   // {
-   // XStream xstream = new XStream(new DomDriver());
-   // String xml;
-   //	   
-   // xstream.alias("order", Order.class);
-   // xml = xstream.toXML(order);
-   //	  
-   // return xml;
-   // }
-   //   
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/InsertOrderAction.java (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/InsertOrderAction.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/InsertOrderAction.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/InsertOrderAction.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,157 @@
+/*
+ * 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.quickstart.spring;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.actions.AbstractSpringAction;
+import org.jboss.soa.esb.actions.ActionLifecycleException;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Body;
+import org.jboss.soa.esb.message.Message;
+
+import org.springframework.samples.jpetstore.domain.logic.PetStoreFacade;
+import org.springframework.samples.jpetstore.domain.Item;
+import org.springframework.samples.jpetstore.domain.Order;
+import org.springframework.samples.jpetstore.domain.LineItem;
+import java.util.Date;
+import java.util.List;
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.DomDriver;
+
+/**
+ * Spring enabled action that makes a DB insert call to the 
+ * Spring jpetstore sample application.
+ * 
+ * @see org.jboss.soa.esb.actions.AbstractSpringAction
+ * @see applicationContext.xml
+ * @see dataAccessContext-local.xml
+ * 
+ * @author <a href="mailto:james.williams at redhat.com">James Williams</a>.
+ * 
+ */
+public class InsertOrderAction extends AbstractSpringAction
+{
+   public InsertOrderAction(ConfigTree config) throws Exception
+   {
+      configTree = config;
+   }
+
+   public Message insertOrder(Message message) throws Exception
+   {
+      Body msgBody = message.getBody();
+      XStream xstream = new XStream(new DomDriver());
+      xstream.alias("order", Order.class);
+      Order order = (Order) xstream.fromXML(new String(msgBody.getByteArray()));
+
+      PetStoreFacade petStore = (PetStoreFacade) getBeanFactory()
+            .getBean("petStore");
+      petStore.insertOrder(order);
+
+      System.out.println("ORDER SUCCESSFULLY INSERTED\n");
+      printOrderDetails(getOrderFromDB());
+
+      return message;
+   }
+
+   private void printOrderDetails(Order order)
+   {
+      System.out.println("************************");
+      System.out.println("TOTAL PRICE: " + order.getTotalPrice());
+      System.out.println("SHIP TO:");
+      System.out.println(order.getShipToFirstName() + " "
+            + order.getShipToLastName());
+      System.out.println(order.getShipAddress1() + " "
+            + order.getShipAddress2());
+      System.out.println(order.getShipCity() + " " + order.getShipZip());
+      System.out.println("************************");
+   }
+
+   private Order getOrderFromDB() throws Exception
+   {
+      PetStoreFacade petStore = (PetStoreFacade) getBeanFactory()
+            .getBean("petStore");
+      System.out.println("QUERYING DATABASE FOR INSERTED ORDER");
+      List<Order> orders = petStore.getOrdersByUsername("j2ee");
+      return orders.get(orders.size() - 1);
+   }
+
+   // utility methods used to create/generate a test order pojo and xml
+
+   // private Order getTestOrder()
+   // {
+   // Order order = new Order();
+   //	   
+   // order.setOrderDate(new Date());
+   // order.setStatus("P");
+   // order.setTotalPrice(22.22);
+   // order.setUsername("j2ee");
+   // order.setShipToFirstName("ABC");
+   // order.setShipToLastName("XYX");
+   // order.setShipState("CA");
+   //	   
+   // order.setShipToFirstName("James");
+   // order.setShipToLastName("Williams");
+   // order.setShipAddress1("123 Way");
+   // order.setShipAddress2("hoaky drive");
+   // order.setShipCity("Los Angelos");
+   // order.setShipCountry("USA");
+   // order.setShipZip("30253");
+   //	    
+   // order.setBillToFirstName("James");
+   // order.setBillToLastName("Williams");
+   // order.setBillAddress1("123 Way");
+   // order.setBillAddress2("hoaky drive");
+   // order.setBillCity("Los Angelos");
+   // order.setBillCountry("USA");
+   // order.setBillState("CA");
+   // order.setBillZip("30253");
+   //	   
+   // order.setCreditCard("999 9999 9999 9999");
+   // order.setExpiryDate("12/03");
+   // order.setCardType("Visa");
+   // order.setLocale("CA");
+   // order.setCourier("UPS");
+   //	   
+   // LineItem lineItem = new LineItem();
+   // lineItem.setItemId("EST-8");
+   // lineItem.setLineNumber(1);
+   // lineItem.setQuantity(10);
+   // Item item = new Item();
+   // item.setItemId("EST-8");
+   // item.setListPrice(18.5);
+   // lineItem.setItem(item);
+   // order.addLineItem(lineItem);
+   //	   
+   // return order;
+   // }
+
+   // private String serializeOrder(Order order)
+   // {
+   // XStream xstream = new XStream(new DomDriver());
+   // String xml;
+   //	   
+   // xstream.alias("order", Order.class);
+   // xml = xstream.toXML(order);
+   //	  
+   // return xml;
+   // }
+   //   
+}
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/test (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/test)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,117 +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.quickstart.spring.test;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-
-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;
-
-/**
- * Send a JMS message that the ESB will listen for.
- * 
- * @author <a href="mailto:james.williams at redhat.com">James Williams</a>.
- * 
- */
-public class SendJMSMessage
-{
-   QueueConnection conn;
-   QueueSession session;
-   Queue que;
-
-   public void setupConnection() throws JMSException, NamingException
-   {
-      InitialContext iniCtx = new InitialContext();
-      Object tmp = iniCtx.lookup("ConnectionFactory");
-      QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
-      conn = qcf.createQueueConnection();
-      que = (Queue) iniCtx.lookup("queue/quickstart_spring_jpetstore_Request");
-      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();
-   }
-
-   private static 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
-   {
-      SendJMSMessage sm = new SendJMSMessage();
-      sm.setupConnection();
-      sm.sendAMessage(readAsciiFile(args[0]));
-      sm.stop();
-   }
-
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring/test/SendJMSMessage.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,117 @@
+/*
+ * 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.quickstart.spring.test;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+
+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;
+
+/**
+ * Send a JMS message that the ESB will listen for.
+ * 
+ * @author <a href="mailto:james.williams at redhat.com">James Williams</a>.
+ * 
+ */
+public class SendJMSMessage
+{
+   QueueConnection conn;
+   QueueSession session;
+   Queue que;
+
+   public void setupConnection() throws JMSException, NamingException
+   {
+      InitialContext iniCtx = new InitialContext();
+      Object tmp = iniCtx.lookup("ConnectionFactory");
+      QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
+      conn = qcf.createQueueConnection();
+      que = (Queue) iniCtx.lookup("queue/quickstart_spring_jpetstore_Request");
+      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();
+   }
+
+   private static 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
+   {
+      SendJMSMessage sm = new SendJMSMessage();
+      sm.setupConnection();
+      sm.sendAMessage(readAsciiFile(args[0]));
+      sm.stop();
+   }
+
+}
\ No newline at end of file

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/build.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -5,7 +5,7 @@
 		${line.separator}
 	</description>
 	
-	<property name="additional.deploys" value="smooks-cdr.lst,smooks-res.xml" />
+	<property name="additional.deploys" value="smooks-res-csv2xml.xml" />
 			
 	<!-- Import the base Ant build script... -->
 	<import file="../conf/base-build.xml"/>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/deployment.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/deployment.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbossesb-deployment>
+  <depends>jboss.esb:deployment=smooks.esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_gw</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_esb</depends>
+</jbossesb-deployment>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/jbm-queue-service-scoped.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/jbm-queue-service-scoped.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -6,13 +6,13 @@
   </loader-repository>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_CSV2XML_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_CSV2XML_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/jbm-queue-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_CSV2XML_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_CSV2XML_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/jbmq-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/jbmq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_gw">
+        <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_transform_CSV2XML_esb">
+        <depends optional-attribute-name="DestinationManager">
+          jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+</server>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/jboss-esb.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/jboss-esb.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -34,9 +34,8 @@
 		            </action>	 
 					
 					<action name="transform-from-csv" class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
-	                    <property name="from" value="order-list" />
+                        <property name="resource-config" value="/smooks-res-csv2xml.xml" />
 			            <property name="from-type" value="text/csv:order-list" />
-			            <property name="to" value="smooks-order-xml" />
 			            <property name="to-type" value="text/xml:smooks-order-xml" />
 	                </action>
 					
@@ -45,9 +44,8 @@
 		            </action>	 
 					
 	                <action name="transform-smooksXml-to-canonicalXml" class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
-	                    <property name="from" value="smooks-order-list" />
+                        <property name="resource-config" value="/smooks-res-csv2xml.xml" />
 			            <property name="from-type" value="text/xml:smooks-order-xml" />
-			            <property name="to" value="canonical-order-xml" />
 			            <property name="to-type" value="text/xml:canonical-order-xml" />
 	                </action>
 					

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/smooks-cdr.lst
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/smooks-cdr.lst	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/smooks-cdr.lst	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,16 +0,0 @@
-########################################################################################################
-# Uncomment out to load config from local XML file
-########################################################################################################
-/smooks-res.xml
-/org/milyn/templating/templating-cdu-creators-0.1.cdrl
-
-########################################################################################################
-# Uncomment out to load config from the
-# ESB Administration Console.
-#
-# You must "import" smooks-res.xml into the console in order to view and manipulate the
-# transformations in this sample.  You will also need to register the "Message Exchange Participants"
-# "A" and "B" as well as their supported message contracts "text/xml:messageAtA" and 
-# "text/xml:messageAtB" respectively.
-########################################################################################################
-#http://localhost:8080/jboss-esb-console/transform/smooks-config.jsp

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/smooks-res-csv2xml.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/smooks-res-csv2xml.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/smooks-res-csv2xml.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/smooks-res-csv2xml.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,56 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
+
+	<resource-config target-profile="from-type:text/csv:order-list AND to-type:text/xml:smooks-order-xml" selector="org.xml.sax.driver">
+        <resource>org.milyn.csv.CSVParser</resource>
+        <param name="fields" type="string-list">
+			orderId,
+			orderDate,
+			statusCode,
+			netAmount,
+			totalAmount,
+			tax,
+			userName,
+			firstName,
+			lastName,
+			state,
+			orderLine1Position,
+			orderLine1Quantity,
+			orderLine1ProductId,
+			orderLine1ProductTitle,
+			orderLine1ProductPrice,
+			orderLine2Position,
+			orderLine2Quantity,
+			orderLine2ProductId,
+			orderLine2ProductTitle,
+			orderLine2ProductPrice
+		</param>
+	</resource-config>
+	
+	<resource-config target-profile="from-type:text/xml:smooks-order-xml AND to-type:text/xml:canonical-order-xml" selector="csv-set">
+        <resource type="xsl">
+            <![CDATA[
+                <xsl:for-each select="csv-record">
+                    <Order orderId="{orderId}"
+                                orderDate="{orderDate}"
+                                statusCode="{statusCode}"
+                                netAmount="{netAmount}"
+                                totalAmount="{totalAmount}"
+                                tax="{tax}" >
+                        <Customer userName="{userName}" firstName="{firstName}" lastName="{lastName}" state="{state}" />
+                            <OrderLines>
+                                <OrderLine posistion="{orderLine1Position}" quantity="{orderLine1Quantity}">
+                                    <Product  productId="{orderLine1ProductId}" title="{orderLine1Title}" price="{orderLine1Price}"/>
+                                </OrderLine>
+                                <OrderLine posistion="{orderLine1Position}" quantity="{orderLine1Quantity}">
+                                    <Product  productId="{orderLine1ProductId}" title="{orderLine1Title}" price="{orderLine1Price}"/>
+                                </OrderLine>
+                            </OrderLines>
+                    </Order>
+                </xsl:for-each>
+            ]]>
+        </resource>
+        <param name="is-xslt-templatelet">true</param>
+	</resource-config>
+	
+</smooks-resource-list>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/smooks-res.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/smooks-res.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/smooks-res.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,62 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE smooks-resource-list PUBLIC "-//MILYN//DTD SMOOKS 1.0//EN" "http://www.milyn.org/dtd/smooksres-list-1.0.dtd">
-<smooks-resource-list>
-
-	<smooks-resource useragent="from-type:text/csv:order-list AND to-type:text/xml:smooks-order-xml" selector="org.xml.sax.driver" path="org.milyn.csv.CSVParser" >
-		<param name="fields" type="string-list">
-			orderId,
-			orderDate,
-			statusCode,
-			netAmount,
-			totalAmount,
-			tax,
-			userName,
-			firstName,
-			lastName,
-			state,
-			orderLine1Position,
-			orderLine1Quantity,
-			orderLine1ProductId,
-			orderLine1ProductTitle,
-			orderLine1ProductPrice,
-			orderLine2Position,
-			orderLine2Quantity,
-			orderLine2ProductId,
-			orderLine2ProductTitle,
-			orderLine2ProductPrice
-		</param>
-	</smooks-resource>
-	
-	<smooks-resource useragent="from-type:text/xml:smooks-order-xml AND to-type:text/xml:canonical-order-xml" selector="csv-set" path="See 'resdata' parameter value" >
-            <!--param name="RESERVED:RESOURCE_NAME_PARAM"><![CDATA[XSLT (Templatelet)]]></param-->
-            <param name="encoding">UTF-8</param>
-            <param name="visitBefore">false</param>
-            <param name="is-xslt-templatelet">true</param>
-            <param name="restype">xsl</param>
-            <param name="action">replace</param>
-            <param name="encoding">UTF-8</param>
-            <param name="resdata"> 
-            	<![CDATA[
-	            	<xsl:for-each select="csv-record">
-            			<Order orderId="{orderId}" 
-									orderDate="{orderDate}"
-									statusCode="{statusCode}"
-									netAmount="{netAmount}"
-									totalAmount="{totalAmount}"
-									tax="{tax}" >
-							<Customer userName="{userName}" firstName="{firstName}" lastName="{lastName}" state="{state}" />
-								<OrderLines>
-									<OrderLine posistion="{orderLine1Position}" quantity="{orderLine1Quantity}">
-										<Product  productId="{orderLine1ProductId}" title="{orderLine1Title}" price="{orderLine1Price}"/>
-									</OrderLine>	
-									<OrderLine posistion="{orderLine1Position}" quantity="{orderLine1Quantity}">
-										<Product  productId="{orderLine1ProductId}" title="{orderLine1Title}" price="{orderLine1Price}"/>
-									</OrderLine>	
-								</OrderLines>
-						</Order>
-					</xsl:for-each>
-	            ]]>
-            </param>
-	</smooks-resource>
-	
-</smooks-resource-list>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/build.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -22,7 +22,7 @@
 	<!-- The ESB itself is started by the default "run" target - defined in base-build.xml  -->
 	
 	<!-- Target for injecting the sample order message for transformation... -->
-	<target name="runtest" description="runs Test JMS Sender">
+	<target name="runtest" description="runs Test JMS Sender" depends="compile">
 		<echo>Runs Test JMS Sender</echo>
 		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.transformedi2xmlgroovyxslt.test.SendJMSMessage" failonerror="true">
 			<arg value="SampleOrder.edi" />

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/deployment.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/deployment.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/deployment.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,8 +1,5 @@
 <jbossesb-deployment>
-    <loader-repository>
-        org.jboss.soa.esb:loader=simple-scoped
-        <loader-repository-config>
-            java2ParentDelegaton=false
-        </loader-repository-config>
-    </loader-repository>
-</jbossesb-deployment>
\ No newline at end of file
+  <depends>jboss.esb:deployment=smooks.esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_gw</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_esb</depends>
+</jbossesb-deployment>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbm-queue-service-scoped.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbm-queue-service-scoped.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -5,14 +5,14 @@
   </loader-repository>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_edi_groovy_xslt_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>
 
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_edi_groovy_xslt_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbm-queue-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_edi_groovy_xslt_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>
 
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_edi_groovy_xslt_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbmq-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbmq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_gw">
+        <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_edi_groovy_xslt_esb">
+        <depends optional-attribute-name="DestinationManager">
+          jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+</server>
+

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jboss-esb.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jboss-esb.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -31,6 +31,7 @@
 					<property name="message" value="[transform_EDI2XML_Groovy_XSLT] Message before transformation" />
 				</action>
 				<action name="transform" class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
+                        <property name="resource-config" value="/smooks-res.xml" />
 					<property name="from" value="DVDStore:OrderDispatchService" />
 					<property name="from-type" value="text/xml:fullFillOrder" />
 					<property name="to" value="DVDWarehouse_1:OrderHandlingService" />

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/smooks-res.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/smooks-res.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/smooks-res.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,32 +1,30 @@
-<?xml version="1.0"?>
-<!DOCTYPE smooks-resource-list PUBLIC "-//MILYN//DTD SMOOKS 1.0//EN" "http://www.milyn.org/dtd/smooksres-list-1.0.dtd">
-<smooks-resource-list>
+<?xml version='1.0' encoding='UTF-8'?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
 
-	<smooks-resource selector="org.xml.sax.driver" useragent="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice and to-type:text/xml:shiporder and to:dvdwarehouse_1:orderhandlingservice" path="org.milyn.smooks.edi.SmooksEDIParser" >
-		<param name="RESERVED:RESOURCE_NAME_PARAM"><![CDATA[EDI Message Parser]]></param>
+	<resource-config selector="org.xml.sax.driver" target-profile="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice and to-type:text/xml:shiporder and to:dvdwarehouse_1:orderhandlingservice">
+        <resource>org.milyn.smooks.edi.SmooksEDIParser</resource>
+        <param name="RESERVED:RESOURCE_NAME_PARAM"><![CDATA[EDI Message Parser]]></param>
 		<param name="mapping-model"><![CDATA[/org/jboss/xtrans/edi-to-xml-order-mapping.xml]]></param>
-	</smooks-resource>
+	</resource-config>
 
-	<smooks-resource selector="date" useragent="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice and to-type:text/xml:shiporder and to:dvdwarehouse_1:orderhandlingservice" path="org/jboss/xtrans/DateFormatter.groovy" >
-		<param name="RESERVED:RESOURCE_NAME_PARAM"><![CDATA[Groovy Script (External)]]></param>
-		<param name="restype"><![CDATA[groovy]]></param>
+	<resource-config selector="date" target-profile="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice and to-type:text/xml:shiporder and to:dvdwarehouse_1:orderhandlingservice">
+        <resource>org/jboss/xtrans/DateFormatter.groovy</resource>
+        <param name="RESERVED:RESOURCE_NAME_PARAM"><![CDATA[Groovy Script (External)]]></param>
 		<param name="input-format"><![CDATA[EEE MMM dd HH:mm:ss z yyyy]]></param>
-	</smooks-resource>
+	</resource-config>
 
-	<smooks-resource selector="state" useragent="from-type:text/xml:fullFillOrder AND from:DVDStore:OrderDispatchService AND to-type:text/xml:shipOrder AND to:DVDWarehouse_1:OrderHandlingService" path="/org/jboss/xtrans/EnrichmentProcessor.groovy" >
-		<param name="RESERVED:RESOURCE_NAME_PARAM"><![CDATA[Groovy Script (External)]]></param>
-		<param name="restype"><![CDATA[groovy]]></param>
+	<resource-config selector="state" target-profile="from-type:text/xml:fullFillOrder AND from:DVDStore:OrderDispatchService AND to-type:text/xml:shipOrder AND to:DVDWarehouse_1:OrderHandlingService">
+        <resource>/org/jboss/xtrans/EnrichmentProcessor.groovy</resource>
+        <param name="RESERVED:RESOURCE_NAME_PARAM"><![CDATA[Groovy Script (External)]]></param>
 		<param name="enrichments-uri"><![CDATA[/org/jboss/xtrans/us-state-codes.properties]]></param>
-	</smooks-resource>
+	</resource-config>
 
-	<smooks-resource selector="order" useragent="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice and to-type:text/xml:shiporder and to:dvdwarehouse_1:orderhandlingservice" path="org/jboss/xtrans/dispatch-to-handling.xsl" >
-		<param name="RESERVED:RESOURCE_NAME_PARAM"><![CDATA[XSLT (Full Stylesheet - External)]]></param>
+	<resource-config selector="order" target-profile="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice and to-type:text/xml:shiporder and to:dvdwarehouse_1:orderhandlingservice">
+        <resource>org/jboss/xtrans/dispatch-to-handling.xsl</resource>
+        <param name="RESERVED:RESOURCE_NAME_PARAM"><![CDATA[XSLT (Full Stylesheet - External)]]></param>
 		<param name="encoding"><![CDATA[UTF-8]]></param>
-		<param name="visitBefore"><![CDATA[false]]></param>
-
 		<param name="is-xslt-templatelet"><![CDATA[false]]></param>
-		<param name="restype"><![CDATA[xsl]]></param>
 		<param name="action"><![CDATA[replace]]></param>
-	</smooks-resource>
+	</resource-config>
 
 </smooks-resource-list>
\ No newline at end of file

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/src/org/jboss/xtrans/DateFormatter.groovy
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/src/org/jboss/xtrans/DateFormatter.groovy	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/src/org/jboss/xtrans/DateFormatter.groovy	2007-06-06 14:23:48 UTC (rev 12351)
@@ -4,8 +4,8 @@
 import java.text.SimpleDateFormat;
 
 import org.milyn.cdr.SmooksResourceConfiguration;
-import org.milyn.container.ContainerRequest;
-import org.milyn.delivery.assemble.AssemblyUnit;
+import org.milyn.container.ExecutionContext;
+import org.milyn.delivery.dom.DOMElementVisitor;
 import org.milyn.xml.DomUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -15,7 +15,7 @@
  * Date Formatting class.
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  */
-public class DateFormatter implements AssemblyUnit {
+public class DateFormatter implements DOMElementVisitor {
 
 	private SimpleDateFormat dateDecodeFormat;
 	private Properties outputFields;
@@ -30,7 +30,12 @@
 		outputFields = parseOutputFields(outputFormats);
 	}
 
-	public void visit(Element element, ContainerRequest request) {
+	public void visitBefore(Element element, ExecutionContext execContext) {
+	    // Not doing anything on this event - wait until after we've visited
+	    // this elements child content...
+	}
+
+	public void visitAfter(Element element, ExecutionContext execContext) {
 		String dateString = null;
 		Date date = null;
 
@@ -68,8 +73,4 @@
 		properties.load(new ByteArrayInputStream(outputFormats.getBytes()));
 		return properties;
 	}
-
-	public boolean visitBefore() {
-		return false;
-	}
 }
\ No newline at end of file

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/src/org/jboss/xtrans/EnrichmentProcessor.groovy
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/src/org/jboss/xtrans/EnrichmentProcessor.groovy	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/src/org/jboss/xtrans/EnrichmentProcessor.groovy	2007-06-06 14:23:48 UTC (rev 12351)
@@ -25,8 +25,8 @@
 
 import org.milyn.cdr.SmooksConfigurationException;
 import org.milyn.cdr.SmooksResourceConfiguration;
-import org.milyn.container.ContainerRequest;
-import org.milyn.delivery.process.ProcessingUnit;
+import org.milyn.container.ExecutionContext;
+import org.milyn.delivery.dom.DOMElementVisitor;
 import org.milyn.resource.URIResourceLocator;
 import org.milyn.xml.DomUtils;
 import org.w3c.dom.Element;
@@ -35,7 +35,7 @@
  * Sample "simple" enrichment Java based processing unit.
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  */
-public class EnrichmentProcessor implements ProcessingUnit {
+public class EnrichmentProcessor implements DOMElementVisitor {
 
 	private static final String ENRICHMENTS_URI = "enrichments-uri";
 	private Properties enrichments = new Properties();
@@ -59,7 +59,10 @@
 		attributeName = config.getStringParameter("attribute-name");
 	}
 
-	public void visit(Element element, ContainerRequest request) {
+	public void visitBefore(Element element, ExecutionContext execContext) {
+		// We'll perfom the enrichment process as soon as we encouter the element
+		// and before we process the element's child nodes.
+
 		if(attributeName != null) {
 			String enrichmentKey = element.getAttribute(attributeName);
 			if(enrichmentKey != null) {
@@ -80,9 +83,6 @@
 		}
 	}
 
-	public boolean visitBefore() {
-		// We'll perfom the enrichment process as soon as we encouter the element
-		// and before we process the element's child nodes.
-		return true;
+	public void visitAfter(Element element, ExecutionContext execContext) {
 	}
 }

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/deployment.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/deployment.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/deployment.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,8 +1,6 @@
 <jbossesb-deployment>
-    <loader-repository>
-        org.jboss.soa.esb:loader=simple-scoped
-        <loader-repository-config>
-            java2ParentDelegaton=false
-        </loader-repository-config>
-    </loader-repository>
-</jbossesb-deployment>
\ No newline at end of file
+  <depends>jboss.esb:deployment=smooks.esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_gw</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_transformation_Response</depends>
+</jbossesb-deployment>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/jbm-queue-service-scoped.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/jbm-queue-service-scoped.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -6,19 +6,19 @@
   </loader-repository>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_pojo_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_pojo_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-			name="jboss.messaging.destination:service=Queue,name=quickstart_simple_transformation_Response"
+			name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_transformation_Response"
 			xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/jbm-queue-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_pojo_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_pojo_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-			name="jboss.messaging.destination:service=Queue,name=quickstart_simple_transformation_Response"
+			name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_transformation_Response"
 			xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/jbmq-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/jbmq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_gw">
+    <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_transform_pojo_esb">
+    <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_simple_transformation_Response">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>
+

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/jboss-esb.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/jboss-esb.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -44,6 +44,7 @@
                    	process="displayMessage" 
                 />   
                 <action name="transform" class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
+                        <property name="resource-config" value="/smooks-res.xml" />
               		<property name="from" value="DVDStore:OrderDispatchService" />
 					<property name="from-type" value="text/xml:fullFillOrder" />
 					<property name="to" value="DVDWarehouse_1:OrderHandlingService" />

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/smooks-res.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/smooks-res.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/smooks-res.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,98 +1,65 @@
-<?xml version="1.0"?>
-<!DOCTYPE smooks-resource-list PUBLIC "-//MILYN//DTD SMOOKS 1.0//EN" "http://www.milyn.org/dtd/smooksres-list-1.0.dtd" >
-<smooks-resource-list>
-	<smooks-resource selector="cdu-creator" useragent="*" path="org.milyn.templating.xslt.XslContentDeliveryUnitCreator" >
-		<param name="restype"><![CDATA[xsl]]></param>
-	</smooks-resource>
-	<smooks-resource selector="cdu-creator" useragent="*" path="org.milyn.templating.stringtemplate.StringTemplateContentDeliveryUnitCreator" >
-		<param name="restype"><![CDATA[st]]></param>
-	</smooks-resource>
-	<smooks-resource selector="order" useragent="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice" path="org.milyn.javabean.ProcessingPhaseBeanPopulator" >
+<?xml version='1.0' encoding='UTF-8'?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
 
-		<param name="beanId"><![CDATA[orderHeader]]></param>
-		<param name="beanClass"><![CDATA[org.jboss.soa.esb.dvdstore.OrderHeader]]></param>
-	</smooks-resource>
-	<smooks-resource selector="order" useragent="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice" path="org.milyn.javabean.ProcessingPhaseBeanPopulator" >
-		<param name="beanId"><![CDATA[orderHeader]]></param>
-		<param name="attributeName"><![CDATA[orderId]]></param>
-	</smooks-resource>
-	<smooks-resource selector="order" useragent="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice" path="org.milyn.javabean.ProcessingPhaseBeanPopulator" >
-		<param name="beanId"><![CDATA[orderHeader]]></param>
+	<resource-config selector="cdu-creator">
+        <resource>org.milyn.templating.xslt.XslContentDeliveryUnitCreator</resource>
+        <param name="restype">xsl></param>
+	</resource-config>
+	<resource-config selector="cdu-creator">
+        <resource>org.milyn.templating.stringtemplate.StringTemplateContentDeliveryUnitCreator</resource>
+        <param name="restype">st</param>
+	</resource-config>
 
-		<param name="attributeName"><![CDATA[orderDate]]></param>
-	</smooks-resource>
-	<smooks-resource selector="order" useragent="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice" path="org.milyn.javabean.ProcessingPhaseBeanPopulator" >
-		<param name="beanId"><![CDATA[orderHeader]]></param>
-		<param name="attributeName"><![CDATA[statusCode]]></param>
-	</smooks-resource>
-	<smooks-resource selector="order" useragent="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice" path="org.milyn.javabean.ProcessingPhaseBeanPopulator" >
-		<param name="beanId"><![CDATA[orderHeader]]></param>
-		<param name="attributeName"><![CDATA[netAmount]]></param>
+    <!-- Populate the OrderHeader -->
+	<resource-config selector="order" target-profile="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice">
+        <resource>org.milyn.javabean.ProcessingPhaseBeanPopulator</resource>
+        <param name="beanId">orderHeader</param>
+		<param name="beanClass">org.jboss.soa.esb.dvdstore.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" type="Integer" />
+            <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>
 
-	</smooks-resource>
-	<smooks-resource selector="order" useragent="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice" path="org.milyn.javabean.ProcessingPhaseBeanPopulator" >
-		<param name="beanId"><![CDATA[orderHeader]]></param>
-		<param name="attributeName"><![CDATA[totalAmount]]></param>
-	</smooks-resource>
-	<smooks-resource selector="order" useragent="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice" path="org.milyn.javabean.ProcessingPhaseBeanPopulator" >
-		<param name="beanId"><![CDATA[orderHeader]]></param>
-		<param name="attributeName"><![CDATA[tax]]></param>
-	</smooks-resource>
+    <!-- Populate the Customer -->
+    <resource-config selector="order customer" target-profile="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice">
+        <resource>org.milyn.javabean.ProcessingPhaseBeanPopulator</resource>
+		<param name="beanId">customer</param>
+		<param name="beanClass">org.jboss.soa.esb.dvdstore.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>
 
-	<smooks-resource selector="order customer" useragent="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice" path="org.milyn.javabean.ProcessingPhaseBeanPopulator" >
-		<param name="beanId"><![CDATA[customer]]></param>
-		<param name="beanClass"><![CDATA[org.jboss.soa.esb.dvdstore.Customer]]></param>
-	</smooks-resource>
-	<smooks-resource selector="order customer" useragent="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice" path="org.milyn.javabean.ProcessingPhaseBeanPopulator" >
-		<param name="beanId"><![CDATA[customer]]></param>
-		<param name="attributeName"><![CDATA[userName]]></param>
-	</smooks-resource>
-	<smooks-resource selector="order customer" useragent="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice" path="org.milyn.javabean.ProcessingPhaseBeanPopulator" >
+    <!-- Populate the OrderItem list -->
+	<resource-config selector="order orderlines orderline" target-profile="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice">
+        <resource>org.milyn.javabean.ProcessingPhaseBeanPopulator</resource>
+		<param name="beanId">orderItem</param>
+		<param name="beanClass">org.jboss.soa.esb.dvdstore.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>
 
-		<param name="beanId"><![CDATA[customer]]></param>
-		<param name="attributeName"><![CDATA[firstName]]></param>
-	</smooks-resource>
-	<smooks-resource selector="order customer" useragent="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice" path="org.milyn.javabean.ProcessingPhaseBeanPopulator" >
-		<param name="beanId"><![CDATA[customer]]></param>
-		<param name="attributeName"><![CDATA[lastName]]></param>
-	</smooks-resource>
-	<smooks-resource selector="order customer" useragent="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice" path="org.milyn.javabean.ProcessingPhaseBeanPopulator" >
-		<param name="beanId"><![CDATA[customer]]></param>
+	<resource-config selector="order orderlines orderline" target-profile="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice and to-type:text/xml:shiporder and to:dvdwarehouse_1:orderhandlingservice">
+        <resource>/org/jboss/soa/esb/dvdstore/orderitem.st</resource>
+	</resource-config>
 
-		<param name="attributeName"><![CDATA[state]]></param>
-	</smooks-resource>
-	<smooks-resource selector="order orderlines orderline" useragent="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice" path="org.milyn.javabean.ProcessingPhaseBeanPopulator" >
-		<param name="beanId"><![CDATA[orderItem]]></param>
-		<param name="beanClass"><![CDATA[org.jboss.soa.esb.dvdstore.OrderItem]]></param>
-		<param name="addToList"><![CDATA[true]]></param>
-	</smooks-resource>
-	<smooks-resource selector="order orderlines orderline" useragent="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice" path="org.milyn.javabean.ProcessingPhaseBeanPopulator" >
-		<param name="beanId"><![CDATA[orderItem]]></param>
-
-		<param name="attributeName"><![CDATA[position]]></param>
-	</smooks-resource>
-	<smooks-resource selector="order orderlines orderline" useragent="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice" path="org.milyn.javabean.ProcessingPhaseBeanPopulator" >
-		<param name="beanId"><![CDATA[orderItem]]></param>
-		<param name="attributeName"><![CDATA[quantity]]></param>
-	</smooks-resource>
-	<smooks-resource selector="order orderlines orderline product" useragent="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice" path="org.milyn.javabean.ProcessingPhaseBeanPopulator" >
-		<param name="beanId"><![CDATA[orderItem]]></param>
-		<param name="attributeName"><![CDATA[productId]]></param>
-
-	</smooks-resource>
-	<smooks-resource selector="order orderlines orderline product" useragent="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice" path="org.milyn.javabean.ProcessingPhaseBeanPopulator" >
-		<param name="beanId"><![CDATA[orderItem]]></param>
-		<param name="attributeName"><![CDATA[title]]></param>
-	</smooks-resource>
-	<smooks-resource selector="order orderlines orderline product" useragent="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice" path="org.milyn.javabean.ProcessingPhaseBeanPopulator" >
-		<param name="beanId"><![CDATA[orderItem]]></param>
-		<param name="attributeName"><![CDATA[price]]></param>
-	</smooks-resource>
-
-	<smooks-resource selector="order orderlines orderline" useragent="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice and to-type:text/xml:shiporder and to:dvdwarehouse_1:orderhandlingservice" path="/org/jboss/soa/esb/dvdstore/orderitem.st" >
-		<param name="encoding"><![CDATA[UTF-8]]></param>
-		<param name="visitBefore"><![CDATA[false]]></param>
-		<param name="action"><![CDATA[replace]]></param>
-	</smooks-resource>
-
-</smooks-resource-list>
\ No newline at end of file
+    <resource-config selector="decoder:LongDate">
+        <resource>org.milyn.javabean.decoders.DateDecoder</resource>
+        <param name="format">EEE MMM dd HH:mm:ss z yyyy</param>
+    </resource-config>
+    
+</smooks-resource-list>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/dvdstore/OrderHeader.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/dvdstore/OrderHeader.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/dvdstore/OrderHeader.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -21,6 +21,8 @@
 
 package org.jboss.soa.esb.dvdstore;
 
+import java.util.Date;
+
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  */
@@ -28,35 +30,34 @@
 	
 	// <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 String orderDate;
-	private String statusCode;
-	private String netAmount;
-	private String totalAmount;
-	private String tax;
+	private Date orderDate;
+	private int statusCode;
+	private double netAmount;
+	private double totalAmount;
+	private double tax;
 	
 	/**
 	 * @return Returns the netAmount.
 	 */
-	public String getNetAmount() {
+	public double getNetAmount() {
 		return netAmount;
 	}
 	/**
 	 * @param netAmount The netAmount to set.
 	 */
-	public void setNetAmount(String netAmount) {
-		// System.out.println("**** netAmount: " + netAmount);
+	public void setNetAmount(double netAmount) {
 		this.netAmount = netAmount;
 	}
 	/**
 	 * @return Returns the orderDate.
 	 */
-	public String getOrderDate() {
+	public Date getOrderDate() {
 		return orderDate;
 	}
 	/**
 	 * @param orderDate The orderDate to set.
 	 */
-	public void setOrderDate(String orderDate) {
+	public void setOrderDate(Date orderDate) {
 		this.orderDate = orderDate;
 	}
 	/**
@@ -74,37 +75,37 @@
 	/**
 	 * @return Returns the statusCode.
 	 */
-	public String getStatusCode() {
+	public int getStatusCode() {
 		return statusCode;
 	}
 	/**
 	 * @param statusCode The statusCode to set.
 	 */
-	public void setStatusCode(String statusCode) {
+	public void setStatusCode(int statusCode) {
 		this.statusCode = statusCode;
 	}
 	/**
 	 * @return Returns the tax.
 	 */
-	public String getTax() {
+	public double getTax() {
 		return tax;
 	}
 	/**
 	 * @param tax The tax to set.
 	 */
-	public void setTax(String tax) {
+	public void setTax(double tax) {
 		this.tax = tax;
 	}
 	/**
 	 * @return Returns the totalAmount.
 	 */
-	public String getTotalAmount() {
+	public double getTotalAmount() {
 		return totalAmount;
 	}
 	/**
 	 * @param totalAmount The totalAmount to set.
 	 */
-	public void setTotalAmount(String totalAmount) {
+	public void setTotalAmount(double totalAmount) {
 		this.totalAmount = totalAmount;
 	}
 	
@@ -113,6 +114,6 @@
 	 */
 	@Override
 	public String toString() {
-		return orderId + ", " + orderDate + ", " + statusCode + ", " + netAmount + ", " + totalAmount + ", " + tax + ", ";
+		return orderId + ", " + (orderDate == null?null:orderDate.getTime()) + ", " + statusCode + ", " + netAmount + ", " + totalAmount + ", " + tax + ", ";
 	}
 }

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/dvdstore/OrderItem.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/dvdstore/OrderItem.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/dvdstore/OrderItem.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -29,35 +29,35 @@
 	// <OrderLine position="1" quantity="1">
 	// 		<Product productId="364" title="The 40-Year-Old Virgin " price="29.98"/>
 	// </OrderLine>
-	private String position;
-	private String quantity;
+	private int position;
+	private int quantity;
 	private String productId;
 	private String title;
-	private String price;
+	private double price;
 	
 	/**
 	 * @return Returns the position.
 	 */
-	public String getPosition() {
+	public int getPosition() {
 		return position;
 	}
 	/**
 	 * @param position The position to set.
 	 */
-	public void setPosition(String position) {
+	public void setPosition(int position) {
 		//System.out.println("**** position: " + position);
 		this.position = position;
 	}
 	/**
 	 * @return Returns the price.
 	 */
-	public String getPrice() {
+	public double getPrice() {
 		return price;
 	}
 	/**
 	 * @param price The price to set.
 	 */
-	public void setPrice(String price) {
+	public void setPrice(double price) {
 		//System.out.println("**** price: " + price);
 		this.price = price;
 	}
@@ -76,13 +76,13 @@
 	/**
 	 * @return Returns the quantity.
 	 */
-	public String getQuantity() {
+	public int getQuantity() {
 		return quantity;
 	}
 	/**
 	 * @param quantity The quantity to set.
 	 */
-	public void setQuantity(String quantity) {
+	public void setQuantity(int quantity) {
 		this.quantity = quantity;
 	}
 	/**

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/samples/quickstart/transformxml2pojo/test/ReceiveJMSMessage.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/samples/quickstart/transformxml2pojo/test/ReceiveJMSMessage.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/samples/quickstart/transformxml2pojo/test/ReceiveJMSMessage.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -35,33 +35,87 @@
 	   QueueReceiver queueReceiver = null;
 	   InitialContext iniCtx = null;
 	   QueueConnectionFactory qcf = null;
+	   String receiveQueueName = "queue/quickstart_simple_transformation_Response";
+           private boolean initialised ;
+	   
 	   public ReceiveJMSMessage() {
 		   
 	   }
 	   public void receiveOne() {
-		   try {
-		   if (iniCtx == null) iniCtx = new InitialContext();
-	          if (qcf == null) qcf = (QueueConnectionFactory) iniCtx.lookup("ConnectionFactory");
-	          if (conn == null) {
-	              conn = qcf.createQueueConnection();
-	              conn.start();
-	          }
-	          String responseQueueName = "queue/quickstart_simple_transformation_Response";
-	          receiverQueue = (Queue) iniCtx.lookup(responseQueueName);
-	          receiverSession = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-	    	  queueReceiver = receiverSession.createReceiver(receiverQueue); 
-	    	  TextMessage msg = (TextMessage) queueReceiver.receive(2000);
-	    	  if (msg != null) {
+               if (!initialised) {
+                   initialise() ;
+               }
+               
+               if (receiverQueue != null) {
+                  try {
+                      TextMessage msg = (TextMessage) queueReceiver.receive();
+                      if (msg != null) {
 	    		  System.out.println("*********************************************************");
-	    		  System.out.println(msg);
+	    		  System.out.println(msg.getText());
 	    		  System.out.println("*********************************************************");
-	    	  }	
-		   } catch (Exception e) {
-			   System.out.println(e);
-		   }
+                      }
+                  } catch (final Exception ex) {
+                      cleanup() ;
+                      System.out.println(ex.getMessage()) ;
+                  }
+               }
+               
+               if (!initialised) {
+                   System.out.println("Pausing before reinitialising") ;
+                   try {
+                       Thread.sleep(5000) ;
+                   } catch (final InterruptedException ie) {
+                       // do nothing
+                   }
+               }
 	   }
+           
+           private void initialise()
+           {
+               try {
+                  if (iniCtx == null) iniCtx = new InitialContext();
+                  if (qcf == null) qcf = (QueueConnectionFactory) iniCtx.lookup("ConnectionFactory");
+                  if (conn == null) {
+                      conn = qcf.createQueueConnection();
+                      conn.start();
+                  }             
+                  receiverQueue = (Queue) iniCtx.lookup(receiveQueueName);
+                  receiverSession = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+                  queueReceiver = receiverSession.createReceiver(receiverQueue);
+                  initialised = true ;
+                  System.out.println("Initialised") ;
+               } catch (final Exception ex) {
+                   cleanup() ;
+               }
+           }
+           
+           public void cleanup() {
+               queueReceiver = null ;
+               receiverSession = null ;
+               receiverQueue = null ;
+               try {
+                   conn.stop() ;
+               } catch (final Exception ex) {
+                   // Do nothing ;
+               }
+               conn = null ;
+               qcf = null ;
+               iniCtx = null ;
+               initialised = false ;
+           }
+           
 	   public static void main(String[] args) {
-		      ReceiveJMSMessage receiver = new ReceiveJMSMessage();
+		      final ReceiveJMSMessage receiver = new ReceiveJMSMessage();
+		      
+		      if ((args.length > 0) && (args[0] != null)) {
+		    	  receiver.receiveQueueName = args[0];
+		    	  System.out.println("Receiving on: " + receiver.receiveQueueName );		    	 
+		      }
+                      Runtime.getRuntime().addShutdownHook(new Thread() {
+                          public void run() {
+                              receiver.cleanup() ;
+                          }
+                      }) ;
 		      while (true) { // loop until I'm killed
 		    	  receiver.receiveOne();
 		      }

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/deployment.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/deployment.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/deployment.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,8 +1,5 @@
 <jbossesb-deployment>
-    <loader-repository>
-        org.jboss.soa.esb:loader=simple-scoped
-        <loader-repository-config>
-            java2ParentDelegaton=false
-        </loader-repository-config>
-    </loader-repository>
-</jbossesb-deployment>
\ No newline at end of file
+  <depends>jboss.esb:deployment=smooks.esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_gw</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_esb</depends>
+</jbossesb-deployment>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbm-queue-service-scoped.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbm-queue-service-scoped.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -5,13 +5,13 @@
   </loader-repository>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_date_manipulation_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_date_manipulation_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbm-queue-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_date_manipulation_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_date_manipulation_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbmq-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbmq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_gw">
+        <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_date_manipulation_esb">
+        <depends optional-attribute-name="DestinationManager">
+          jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+</server>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/jboss-esb.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/jboss-esb.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -30,6 +30,7 @@
 					<property name="message" value="[transform_XML2XML_date_manipulation] Message before transformation" />
 				</action>
 				<action name="transform" class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
+                        <property name="resource-config" value="/smooks-res.xml" />
 					<property name="from" value="A" />
 					<property name="from-type" value="text/xml:messageAtA" />
 					<property name="to" value="B" />

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/smooks-res.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/smooks-res.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/smooks-res.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,55 +1,47 @@
-<?xml version="1.0"?>
-<!DOCTYPE smooks-resource-list PUBLIC "-//MILYN//DTD SMOOKS 1.0//EN" "http://www.milyn.org/dtd/smooksres-list-1.0.dtd">
-<smooks-resource-list>
+<?xml version='1.0' encoding='UTF-8'?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
 
 	<!--
 		Create an instance of the OrderDate bean and bind it to the beanId "orderDate".  This ID is 
 		used later in the XSLT to refer to this bean.
 	-->
-	<smooks-resource selector="Order" useragent="from-type:text/xml:messageAtA AND from:A AND to-type:text/xml:messageAtB AND to:B" path="org.milyn.javabean.ProcessingPhaseBeanPopulator" >
-		<param name="RESERVED:RESOURCE_NAME_PARAM"><![CDATA[JavaBean Create - Processing Phase]]></param>
-		<param name="beanId"><![CDATA[orderDate]]></param>
-		<param name="beanClass"><![CDATA[org.jboss.soa.esb.samples.quickstart.transformxml2xmldatemanipulation.test.OrderDate]]></param>
-		<param name="addToList"><![CDATA[false]]></param>
-
-	</smooks-resource>
+	<resource-config selector="Order" target-profile="from-type:text/xml:messageAtA AND from:A AND to-type:text/xml:messageAtB AND to:B">
+        <resource>org.milyn.javabean.ProcessingPhaseBeanPopulator</resource>
+        <param name="RESERVED:RESOURCE_NAME_PARAM"><![CDATA[JavaBean Create - Processing Phase]]></param>
+		<param name="beanId">orderDate</param>
+		<param name="beanClass">org.jboss.soa.esb.samples.quickstart.transformxml2xmldatemanipulation.test.OrderDate</param>
+        <param name="bindings">
+            <binding property="orderDate" selector="Order @orderDate" type="LongDate"/>
+        </param>
+	</resource-config>
 	
-	<!-- 
-		Populate the "orderDate" bean with the orderDate attribute value from the Order element.
-	-->
-	<smooks-resource selector="Order" useragent="from-type:text/xml:messageAtA AND from:A AND to-type:text/xml:messageAtB AND to:B" path="org.milyn.javabean.ProcessingPhaseBeanPopulator" >
-		<param name="RESERVED:RESOURCE_NAME_PARAM"><![CDATA[JavaBean Populate - Processing Phase]]></param>
-		<param name="beanId"><![CDATA[orderDate]]></param>
-		<param name="attributeName"><![CDATA[orderDate]]></param>
-	</smooks-resource>
-	
-	<!-- 
+    <resource-config selector="decoder:LongDate">
+        <resource>org.milyn.javabean.decoders.DateDecoder</resource>
+        <param name="format">EEE MMM dd HH:mm:ss z yyyy</param>
+    </resource-config>
+
+    <!--
 		Generate the new "OrderDate" element from the date data in the orderDate bean and insert the result before
 		the OrderLines element.
 	-->
-	<smooks-resource selector="OrderLines" useragent="from-type:text/xml:messageAtA AND from:A AND to-type:text/xml:messageAtB AND to:B" path="See 'resdata' parameter value" >
-		<param name="RESERVED:RESOURCE_NAME_PARAM"><![CDATA[XSLT (Templatelet)]]></param>
-		<param name="encoding"><![CDATA[UTF-8]]></param>
-
-		<param name="visitBefore"><![CDATA[false]]></param>
-		<param name="is-xslt-templatelet"><![CDATA[true]]></param>
-		<param name="restype"><![CDATA[xsl]]></param>
-		<param name="action"><![CDATA[insertbefore]]></param>
-		<param name="resdata"><![CDATA[<OrderDate>
+	<resource-config selector="OrderLines" target-profile="from-type:text/xml:messageAtA AND from:A AND to-type:text/xml:messageAtB AND to:B">
+        <resource type="xsl"><![CDATA[<OrderDate>
    <day><smooks-bean:select ognl="orderDate.day"/></day>
    <time><smooks-bean:select ognl="orderDate.time"/></time>
    <zone><smooks-bean:select ognl="orderDate.zone"/></zone>
    <month><smooks-bean:select ognl="orderDate.month"/></month>
    <year><smooks-bean:select ognl="orderDate.year"/></year>
-</OrderDate>]]></param>
-	</smooks-resource>
+</OrderDate>]]></resource>
+		<param name="RESERVED:RESOURCE_NAME_PARAM"><![CDATA[XSLT (Templatelet)]]></param>
+		<param name="action"><![CDATA[insertbefore]]></param>
+	</resource-config>
 	
 	<!-- 
 		Remove the orderDate attribute from the Order element - it's now in the message as an OrderDate element.
 	-->
-	<smooks-resource selector="Order" useragent="from-type:text/xml:messageAtA AND from:A AND to-type:text/xml:messageAtB AND to:B" path="org.milyn.cdres.trans.RemoveAttributeTU" >
-		<param name="RESERVED:RESOURCE_NAME_PARAM"><![CDATA[Remove Attribute]]></param>
+	<resource-config selector="Order" target-profile="from-type:text/xml:messageAtA AND from:A AND to-type:text/xml:messageAtB AND to:B">
+        <resource>org.milyn.cdres.trans.RemoveAttributeTU</resource>
 		<param name="attributeName"><![CDATA[orderDate]]></param>
-	</smooks-resource>
+	</resource-config>
 	
-</smooks-resource-list>
\ No newline at end of file
+</smooks-resource-list>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/src/org/jboss/soa/esb/samples/quickstart/transformxml2xmldatemanipulation/test/OrderDate.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/src/org/jboss/soa/esb/samples/quickstart/transformxml2xmldatemanipulation/test/OrderDate.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/src/org/jboss/soa/esb/samples/quickstart/transformxml2xmldatemanipulation/test/OrderDate.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -21,7 +21,6 @@
 
 package org.jboss.soa.esb.samples.quickstart.transformxml2xmldatemanipulation.test;
 
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
@@ -36,11 +35,6 @@
 	private Date orderDate;
 	
 	/**
-	 * Formatter for decoding the date from the message.
-	 */
-	private static SimpleDateFormat dateDecodeFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss z yyyy");
-	
-	/**
 	 * Formatters for encoding the date in the transformation.
 	 */
 	private static SimpleDateFormat dayFormat = new SimpleDateFormat("dd");
@@ -49,31 +43,25 @@
 	private static SimpleDateFormat yearFormat = new SimpleDateFormat("yy");
 	private static SimpleDateFormat timezoneFormat = new SimpleDateFormat("Z");
 	
-	public void setOrderDate(String orderDate) {
-		try {
-			// "Wed Nov 15 13:45:28 EST 2006"
-			// "EEE MMM dd HH:mm:ss z yyyy"
-			this.orderDate = dateDecodeFormat.parse(orderDate);
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
+	public void setOrderDate(Date orderDate) {
+        this.orderDate = orderDate;
 	}
 	public Date getOrderDate() {
 		return orderDate;
 	}
 	public String getDay() {
-		return dayFormat.format(orderDate);
+		return dayFormat.format(orderDate.getTime());
 	}
 	public String getTime() {
-		return timeFormat.format(orderDate);
+		return timeFormat.format(orderDate.getTime());
 	}
 	public String getMonth() {
-		return monthFormat.format(orderDate);
+		return monthFormat.format(orderDate.getTime());
 	}
 	public String getYear() {
-		return yearFormat.format(orderDate);
+		return yearFormat.format(orderDate.getTime());
 	}
 	public String getZone() {
-		return timezoneFormat.format(orderDate);
+		return timezoneFormat.format(orderDate.getTime());
 	}	
 }

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/deployment.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/deployment.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/deployment.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,8 +1,5 @@
 <jbossesb-deployment>
-    <loader-repository>
-        org.jboss.soa.esb:loader=simple-scoped
-        <loader-repository-config>
-            java2ParentDelegaton=false
-        </loader-repository-config>
-    </loader-repository>
-</jbossesb-deployment>
\ No newline at end of file
+  <depends>jboss.esb:deployment=smooks.esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_gw</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_esb</depends>
+</jbossesb-deployment>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/jbm-queue-service-scoped.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/jbm-queue-service-scoped.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -5,13 +5,13 @@
   </loader-repository>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_simple_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_simple_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/jbm-queue-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_simple_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_simple_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/jbmq-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/jbmq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_gw">
+    <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_transform_simple_esb">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/jboss-esb.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/jboss-esb.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -31,6 +31,7 @@
 					<property name="message" value="[transform_XML2XML_simple] Message before transformation" />
 				</action>
 				<action name="transform" class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
+                        <property name="resource-config" value="/smooks-res.xml" />
 					<property name="from" value="A" />
 					<property name="from-type" value="text/xml:messageAtA" />
 					<property name="to" value="B" />

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/smooks-res.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/smooks-res.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/smooks-res.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,19 +1,14 @@
-<?xml version="1.0"?>
-<!DOCTYPE smooks-resource-list PUBLIC "-//MILYN//DTD SMOOKS 1.0//EN" "http://www.milyn.org/dtd/smooksres-list-1.0.dtd">
-<smooks-resource-list>
+<?xml version='1.0' encoding='UTF-8'?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
 
-	<smooks-resource selector="OrderLine" useragent="from-type:text/xml:messageAtA AND from:A AND to-type:text/xml:messageAtB AND to:B" path="See 'resdata' parameter value" >
-		<param name="RESERVED:RESOURCE_NAME_PARAM"><![CDATA[XSLT (Templatelet)]]></param>
-		<param name="encoding"><![CDATA[UTF-8]]></param>
-		<param name="visitBefore"><![CDATA[false]]></param>
-		<param name="is-xslt-templatelet"><![CDATA[true]]></param>
-		<param name="restype"><![CDATA[xsl]]></param>
-		<param name="action"><![CDATA[replace]]></param>
-		<param name="resdata"><![CDATA[<line-item>
-    <product><xsl:value-of select="./Product/@productId" /></product>
-    <price><xsl:value-of select="./Product/@price" /></price>
-    <quantity><xsl:value-of select="@quantity" /></quantity>
-</line-item>
-]]></param>
-	</smooks-resource>
+	<resource-config selector="OrderLine" target-profile="from-type:text/xml:messageAtA AND from:A AND to-type:text/xml:messageAtB AND to:B">
+        <resource type="xsl">
+            <![CDATA[<line-item>
+                <product><xsl:value-of select="./Product/@productId" /></product>
+                <price><xsl:value-of select="./Product/@price" /></price>
+                <quantity><xsl:value-of select="@quantity" /></quantity>
+            </line-item>]]>
+        </resource>
+        <param name="RESERVED:RESOURCE_NAME_PARAM"><![CDATA[XSLT (Templatelet)]]></param>
+	</resource-config>
 </smooks-resource-list>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/build.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,12 +1,11 @@
 <project name="Quickstart_webservice_bpel" default="deploy" basedir=".">
 
-    <property name="additional.deploys" value="jbmq-service.xml,jbossesb-properties.xml,smooks-*.*"/>
     <property environment="env" />
 
     <!-- Import the base Ant build script... -->
     <import file="../conf/base-build.xml"/>
 
-    <target name="compile">
+    <target name="compile" depends="dependencies">
         <!-- Build the EJB Services (the webservice-unaware target services) -->
         <antcall target="build-ejb-service">
             <param name="servicename" value="order-manager" />
@@ -42,16 +41,15 @@
         </war>
     </target>
 
-    <target name="quickstart-specific-deploys">
-        <!-- Deply the quickstart apps. -->
+    <target name="quickstart-specific-deploys"
+        depends="assert-CATALINA_HOME-set, assert-ACTIVEBPEL_ENGINE-installed">
+        <!-- Deploy the quickstart apps. -->
         <copy overwrite="true" todir="${org.jboss.esb.server.deploy.dir}">
             <fileset dir="${build.dir}/order-manager" includes="order-manager-service.jar,order-manager.war" />
             <fileset dir="${build.dir}/shipping" includes="shipping-service.jar" />
         </copy>
 
         <!-- Deploy the ActiveBPEL components. -->
-        <antcall target="assert-CATALINA_HOME-set" />
-        <antcall target="assert-ACTIVEBPEL_ENGINE-installed" />
         <copy overwrite="true" todir="${env.CATALINA_HOME}/bpr">
             <fileset dir="bpel" includes="order_process.bpr" />
             <fileset dir="bpel/resources/supportServices/Customer" includes="customer.bpr" />
@@ -61,6 +59,15 @@
         </copy>
     </target>
 
+    <target name="quickstart-specific-undeploys"
+        depends="assert-CATALINA_HOME-set, assert-ACTIVEBPEL_ENGINE-installed">
+        <!-- Undeploy the quickstart apps. -->
+        <delete verbose="true" includemptydirs="true"
+            dir="${org.jboss.esb.server.deploy.dir}"
+            includes="order-manager-service.jar,order-manager.war shipping-service.jar" />
+        <!-- Should undeploy ActiveBPEL -->
+    </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>
@@ -108,4 +115,4 @@
         </jar>
     </target>
 
-</project>
\ No newline at end of file
+</project>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/deployment.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/deployment.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/deployment.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -6,4 +6,8 @@
     <!-- SOAPUI required for making SOAP invocations. In a sar so as to scope some of the soapui dependencies
          that clash with some AS dependencies. -->
     <depends>jboss.esb:service=SoapUIClientService</depends>
+    <depends>jboss.esb:deployment=smooks.esb</depends>
+    <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_bpel_gw</depends>
+    <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_bpel_esb</depends>
+    <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_bpel_esb_reply</depends>
 </jbossesb-deployment>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/jbm-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jbm-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/jbm-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_bpel_gw">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_bpel_esb">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_bpel_esb_reply">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+</server>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/jbmq-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/jbmq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_bpel_gw">
+        <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_webservice_bpel_esb">
+        <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_webservice_bpel_esb_reply">
+        <depends optional-attribute-name="DestinationManager">
+            jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+</server>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/jbmq-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/jbmq-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/jbmq-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,26 +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_webservice_bpel_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_webservice_bpel_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_webservice_bpel_esb_reply">
-        <depends optional-attribute-name="DestinationManager">
-            jboss.mq:service=DestinationManager
-        </depends>
-    </mbean>
-
-    <loader-repository>jboss.messaging:loader=ScopedLoaderRepository
-      <loader-repository-config>java2ParentDelegation=false</loader-repository-config>
-    </loader-repository>
-
-</server>
\ No newline at end of file

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/jboss-esb.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/jboss-esb.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -114,6 +114,7 @@
                 <!-- Transform the incoming CSV order approval record into a populated
                      com.activebpel.ordermanagement.SalesOrderNotification instance. -->
                 <action name="message-populator" class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
+                        <property name="resource-config" value="/smooks-res-csv2xml.xml" />
                     <property name="from" value="OrderManager"/>
                     <property name="from-type" value="text/csv:orderApproval"/>
                     <property name="to" value="RetailerCallback"/>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/smooks-cdr.lst
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/smooks-cdr.lst	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/smooks-cdr.lst	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,10 +0,0 @@
-####################################################
-# Uncomment out to load config from database
-####################################################
-#http://localhost:8080/jboss-esb-console/transform/smooks-config.jsp
-
-####################################################
-# Uncomment out to load config from local XML file
-####################################################
-/smooks-res.xml
-/org/milyn/templating/templating-cdu-creators-0.1.cdrl

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/smooks-res.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/smooks-res.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/smooks-res.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE smooks-resource-list PUBLIC "-//MILYN//DTD SMOOKS 1.0//EN" "http://www.milyn.org/dtd/smooksres-list-1.0.dtd" >
-        
-<smooks-resource-list default-useragent="from-type:text/csv:orderApproval and from:OrderManager and to-type:text/xml:SendSalesOrderNotification and to:RetailerCallback">
-
-    <!--
-    Set the parser for the message - CSV.
-    -->
-    <smooks-resource selector="org.xml.sax.driver" path="org.milyn.csv.CSVParser" >
-        <param name="fields" type="string-list">
-            orderNum,customerNumber,customerName,orderDate
-        </param>
-    </smooks-resource>
-
-    <!--
-    Suck the order number out of the CSV record and into the SalesOrderNotification bean.
-    -->
-	<smooks-resource selector="csv-record orderNum" path="org.milyn.javabean.ProcessingPhaseBeanPopulator">
-		<param name="beanId"><![CDATA[salesOrderNotification]]></param>
-        <param name="beanClass"><![CDATA[com.activebpel.ordermanagement.SalesOrderNotification]]></param>
-		<param name="setterName"><![CDATA[setOrderNumber]]></param>
-	</smooks-resource>
-
-</smooks-resource-list>
\ No newline at end of file

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/build.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -8,13 +8,13 @@
 	<!-- Import the base Ant build script... -->
 	<import file="../conf/base-build.xml"/>
 
-    <property name="additional.deploys" value="jbmq-service.xml"/>
-
-    <path id="quickstart-dependencies-classpath">
-        <fileset dir="${org.jboss.esb.server.home}/client" includes="jbossws-client.jar,jboss-remoting.jar" />
-    </path>
+    <target name="quickstart-specific-dependencies" depends="assert-ws-available">
+        <path id="quickstart-dependencies-classpath">
+            <fileset dir="${org.jboss.esb.server.home}/client" includes="jbossws-client.jar,jboss-remoting.jar" />
+        </path>
+    </target>
 	
-    <target name="quickstart-specific-assemblies" depends="assert-ws-available">
+    <target name="quickstart-specific-assemblies">
         <!-- Overriden from the target of the same name in base-build.xml. -->
         <!-- Called by the "deploy" target.  Don't call directly!! -->
 

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/deployment.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/deployment.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,5 @@
+<jbossesb-deployment>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_gw</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb_reply</depends>
+</jbossesb-deployment>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/jbm-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/jbm-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/jbm-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_gw">
+        <depends optional-attribute-name="ServerPeer">jboss.mq:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb">
+        <depends optional-attribute-name="ServerPeer">jboss.mq:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb_reply">
+        <depends optional-attribute-name="ServerPeer">jboss.mq:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+</server>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/jbmq-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/jbmq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_gw">
+        <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_webservice_jbossws_adapter_01_esb">
+        <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_webservice_jbossws_adapter_01_esb_reply">
+        <depends optional-attribute-name="DestinationManager">
+            jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+</server>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/jbmq-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/jbmq-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/jbmq-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,21 +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_webservice_jbossws_adapter_01_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_webservice_jbossws_adapter_01_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_webservice_jbossws_adapter_01_esb_reply">
-        <depends optional-attribute-name="DestinationManager">
-            jboss.mq:service=DestinationManager
-        </depends>
-    </mbean>
-</server>
\ No newline at end of file

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_war1/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_war1/build.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_war1/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -8,18 +8,14 @@
 	<!-- Import the base Ant build script... -->
 	<import file="../conf/base-build.xml"/>
 
-    <property name="additional.deploys" value="jbmq-service.xml"/>
+    <property name="war.build.dir" location="${build.dir}/war/classes"/>
 
     <target name="quickstart-specific-assemblies" depends="assert-ws-available, makewar"/>
 
-    <target name="quickstart-specific-clean">
-        <delete dir="war/classes"/>
-    </target>
-
     <target name="makewar" description="make war">
         <!-- Compile... -->
-        <mkdir dir="war/classes" />
-        <javac srcdir="war/src" destdir="war/classes" debug="true">
+        <mkdir dir="${war.build.dir}" />
+        <javac srcdir="war/src" destdir="${war.build.dir}" debug="true">
             <classpath>
                 <path refid="compile-classpath" />
                 <fileset dir="war/lib/ext" includes="*.jar" />
@@ -32,7 +28,7 @@
             <webinf dir="${basedir}/war/resources/WEB-INF">
                 <include name="jboss-web.xml"/>
             </webinf>
-            <classes dir="war/classes" includes="**/*.class"/>
+            <classes dir="${war.build.dir}" includes="**/*.class"/>
             <fileset dir="${basedir}/war/view">
                 <include name="**/*"/>
             </fileset>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_war1/deployment.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_war1/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_war1/deployment.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,4 @@
+<jbossesb-deployment>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_war1_esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_war1_esb_reply</depends>
+</jbossesb-deployment>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_war1/jbm-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/jbm-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_war1/jbm-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_war1/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_war1_esb">
+        <depends optional-attribute-name="ServerPeer">jboss.mq:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_war1_esb_reply">
+        <depends optional-attribute-name="ServerPeer">jboss.mq:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+</server>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_war1/jbmq-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_war1/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_war1/jbmq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_war1_esb">
+        <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_webservice_war1_esb_reply">
+        <depends optional-attribute-name="DestinationManager">
+            jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+</server>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_war1/jbmq-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_war1/jbmq-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_war1/jbmq-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,15 +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_webservice_war1_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_webservice_war1_esb_reply">
-        <depends optional-attribute-name="DestinationManager">
-            jboss.mq:service=DestinationManager
-        </depends>
-    </mbean>
-</server>
\ No newline at end of file

Modified: labs/jbossesb/workspace/dbevenius/product/services/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/build.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/services/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -6,6 +6,7 @@
         <ant dir="jbossesb" target="dist"/>
 		<ant dir="jbpm" target="dist"/>
 		<ant dir="jbrules" target="dist"/>
+		<ant dir="smooks" target="dist"/>
         <ant dir="soapui-client" target="sar"/>
     </target>
 
@@ -13,6 +14,7 @@
         <ant dir="jbossesb" target="clean"/>
 		<ant dir="jbpm" target="clean"/>
 		<ant dir="jbrules" target="clean"/>
+		<ant dir="smooks" target="clean"/>
         <ant dir="soapui-client" target="clean"/>
     </target>
 
@@ -20,6 +22,8 @@
 		<ant dir="jbossesb" target="test"/>
 		<ant dir="jbpm" target="test"/>
 		<ant dir="jbrules" target="test"/>
+		<ant dir="smooks" target="test"/>
+		<ant dir="soapui-client" target="test"/>
     </target>
     
     <target name="copy-buildfiles">
@@ -29,6 +33,10 @@
         <copy todir="jbpm" file="build.properties"/>
         <copy todir="jbrules" file="base-project-build.xml"/>
         <copy todir="jbrules" file="build.properties"/>
+        <copy todir="smooks" file="base-project-build.xml"/>
+        <copy todir="smooks" file="build.properties"/>
+        <copy todir="soapui-client" file="base-project-build.xml"/>
+        <copy todir="soapui-client" file="build.properties"/>
     </target>
 	
 </project>

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/lib/ext/build-time)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/c3p0-0.9.1-pre9.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/c3p0-0.9.1-pre9.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/lib/ext/build-time/c3p0-0.9.1-pre9.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/commons-io-1.3.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/commons-io-1.3.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/lib/ext/build-time/commons-io-1.3.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/commons-lang-2.1.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/commons-lang-2.1.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/lib/ext/build-time/commons-lang-2.1.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/hsqldb.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/hsqldb.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/lib/ext/build-time/hsqldb.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/jboss-system.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/jboss-system.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/lib/ext/build-time/jboss-system.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/jbossall-client.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/jbossall-client.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/lib/ext/build-time/jbossall-client.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/jbossts-common.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/jbossts-common.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/lib/ext/build-time/jbossts-common.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/junit-4.1.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/junit-4.1.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/lib/ext/build-time/junit-4.1.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/log4j.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/log4j.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/lib/ext/build-time/log4j.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/xercesImpl-2.7.1.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/build-time/xercesImpl-2.7.1.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/lib/ext/build-time/xercesImpl-2.7.1.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/jackrabbit-api-1.2.1.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/lib/ext/jackrabbit-api-1.2.1.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/jackrabbit-core-1.2.1.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/lib/ext/jackrabbit-core-1.2.1.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/jackrabbit-jcr-commons-1.2.1.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/lib/ext/jackrabbit-jcr-commons-1.2.1.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/jcr-1.0.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/lib/ext/jcr-1.0.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/lib/ext/lucene-core-2.0.0.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/lib/ext/lucene-core-2.0.0.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/MessageStoreFactory.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/MessageStoreFactory.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/MessageStoreFactory.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,104 +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 daniel.brum at jboss.com
- */
-
-
-package org.jboss.internal.soa.esb.persistence.format;
-
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.log4j.Logger;
-import org.jboss.soa.esb.services.persistence.MessageStore;
-import org.jboss.soa.esb.util.ClassUtil;
-/**
- * 
- * @author kurt.stam at jboss.com
- *
- */
-public class MessageStoreFactory {
-	
-	private final ConcurrentHashMap<String, MessageStore> messageStores = new ConcurrentHashMap<String, MessageStore>();
-	private static MessageStoreFactory theFactory;
-    private static Logger _log = Logger.getLogger(MessageStoreFactory.class);
-	
-	public MessageStoreFactory() {
-		reset();
-	}
-    /**
-     * Returns a the default MessageStore implementation (Database).
-     * @return MessageStore
-     */
-    public MessageStore getMessageStore() {
-        return getMessageStore(MessageStore.DEFAULT);
-    }
-	/**
-     * Returns an instance of a MessageStore, of the type 'className'. Multiple instances of the same
-     * type of MessageStore will be created for different sets of properties.
-     *
-     * @param className - classname of the message store.
-     * @return MessageStore
-	 */
-	public MessageStore getMessageStore(String className) {
-		if (className == null) {
-			className = MessageStore.DEFAULT;
-        }
-        String messageStoreKey = className;
-		MessageStore messageStore = messageStores.get(messageStoreKey);
-		if (messageStore == null) {
-            messageStore = getMessageStoreInstance(className);
-            messageStores.put(messageStoreKey, messageStore);
-        } 
-        return messageStore;
-	}
-	
-	public void reset ()
-	{
-		messageStores.clear();
-    }
-    /**
-     * Instantiates a 
-     * @param className
-     * @return
-     */
-    private MessageStore getMessageStoreInstance(String className) 
-    {
-        MessageStore messageStore=null;
-		try {
-			Class messageStoreClass = ClassUtil.forName(className, getClass());
-			messageStore = (MessageStore) messageStoreClass.newInstance();
-		} catch (ClassNotFoundException ex) {
-			_log.error(ex.getMessage(), ex);
-		} catch (IllegalAccessException ex) {
-            _log.error(ex.getMessage(), ex);
-		} catch (InstantiationException ex) {
-            _log.error(ex.getMessage(), ex);
-		}
-        return messageStore;
-	}
-    
-    public static  MessageStoreFactory getInstance()
-    {
-        if (theFactory==null) {
-            theFactory = new MessageStoreFactory();
-        }
-        return theFactory;
-    }
-
-}

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/MessageStoreFactory.java (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/MessageStoreFactory.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/MessageStoreFactory.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/MessageStoreFactory.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,104 @@
+/*
+ * 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 daniel.brum at jboss.com
+ */
+
+
+package org.jboss.internal.soa.esb.persistence.format;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.services.persistence.MessageStore;
+import org.jboss.soa.esb.util.ClassUtil;
+/**
+ * 
+ * @author kurt.stam at jboss.com
+ *
+ */
+public class MessageStoreFactory {
+	
+	private final ConcurrentHashMap<String, MessageStore> messageStores = new ConcurrentHashMap<String, MessageStore>();
+	private static MessageStoreFactory theFactory;
+    private static Logger _log = Logger.getLogger(MessageStoreFactory.class);
+	
+	public MessageStoreFactory() {
+		reset();
+	}
+    /**
+     * Returns a the default MessageStore implementation (Database).
+     * @return MessageStore
+     */
+    public MessageStore getMessageStore() {
+        return getMessageStore(MessageStore.DEFAULT);
+    }
+	/**
+     * Returns an instance of a MessageStore, of the type 'className'. Multiple instances of the same
+     * type of MessageStore will be created for different sets of properties.
+     *
+     * @param className - classname of the message store.
+     * @return MessageStore
+	 */
+	public MessageStore getMessageStore(String className) {
+		if (className == null) {
+			className = MessageStore.DEFAULT;
+        }
+        String messageStoreKey = className;
+		MessageStore messageStore = messageStores.get(messageStoreKey);
+		if (messageStore == null) {
+            messageStore = getMessageStoreInstance(className);
+            messageStores.put(messageStoreKey, messageStore);
+        } 
+        return messageStore;
+	}
+	
+	public void reset ()
+	{
+		messageStores.clear();
+    }
+    /**
+     * Instantiates a 
+     * @param className
+     * @return
+     */
+    private MessageStore getMessageStoreInstance(String className) 
+    {
+        MessageStore messageStore=null;
+		try {
+			Class messageStoreClass = ClassUtil.forName(className, getClass());
+			messageStore = (MessageStore) messageStoreClass.newInstance();
+		} catch (ClassNotFoundException ex) {
+			_log.error(ex.getMessage(), ex);
+		} catch (IllegalAccessException ex) {
+            _log.error(ex.getMessage(), ex);
+		} catch (InstantiationException ex) {
+            _log.error(ex.getMessage(), ex);
+		}
+        return messageStore;
+	}
+    
+    public static  MessageStoreFactory getInstance()
+    {
+        if (theFactory==null) {
+            theFactory = new MessageStoreFactory();
+        }
+        return theFactory;
+    }
+
+}

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,316 +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 daniel.brum at jboss.com
- */
-
-package org.jboss.internal.soa.esb.persistence.format.db;
-
-import java.io.Serializable;
-import java.net.URI;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.jboss.internal.soa.esb.message.urigen.DefaultMessageURIGenerator;
-import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
-import org.jboss.internal.soa.esb.thirdparty.Base64;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.urigen.MessageURIGenerator;
-import org.jboss.soa.esb.persistence.manager.ConnectionManagerException;
-import org.jboss.soa.esb.persistence.manager.ConnectionManagerFactory;
-import org.jboss.soa.esb.services.persistence.MessageStore;
-import org.jboss.soa.esb.services.persistence.MessageStoreException;
-import org.jboss.soa.esb.util.Util;
-
-public class DBMessageStoreImpl implements MessageStore
-{
-	private static Logger logger = Logger.getLogger(DBMessageStoreImpl.class);
-
-	protected ConnectionManager mgr = null;
-
-	protected Connection conn = null;
-
-	//protected ResultSet rs = null;
-
-	//protected PreparedStatement ps = null;
-	
-	protected MessageURIGenerator uriGenerator = new DefaultMessageURIGenerator();
-
-	public DBMessageStoreImpl()
-	{
-		try {
-			mgr = ConnectionManagerFactory.getConnectionManager();
-		} catch (ConnectionManagerException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.jboss.soa.esb.services.persistence.MessageStore#getMessageURIGenerator()
-	 */
-	public MessageURIGenerator getMessageURIGenerator() {
-		return uriGenerator;
-	}
-
-	/**
-	 * add's a @Message to the database persistence store
-	 * will set the 'delivered' flag to TRUE by default - assuming that the @Message has been delivered
-	 */
-	public synchronized URI addMessage (Message message, String classification) throws MessageStoreException
-	{
-		// String messageString = null;
-		URI uid = null;
-		try{
-			conn = mgr.getConnection();
-
-			uid = uriGenerator.generateMessageURI(message);
-
-			String messageString = Base64.encodeObject(Util.serialize(message));
-
-			// insert into the database
-			String sql = "insert into message(uuid, type, message, delivered, classification) values(?,?,?,?,?)";
-            PreparedStatement ps = conn.prepareStatement(sql);
-			ps.setString(1, uid.toString());
-			ps.setString(2, message.getType().toString());
-			ps.setString(3, messageString);
-			ps.setString(4, "TRUE");
-            ps.setString(5, classification);
-			ps.execute();
-            ps.close();
-
-		}
-		catch (Exception e)
-		{
-			logger.error(e);
-			throw new MessageStoreException(e);
-		} 
-		finally
-		{
-			release();
-		}
-
-		return uid;
-	}
-
-	/**
-	 * return a @Message based on the passed in key in the form of a JBoss ESB @URI
-	 * format for URI: "urn:jboss/esb/message/UID#" + UUID.randomUUID()" - see the method in this class @addMessage
-	 */
-	public synchronized Message getMessage (URI uid)
-			throws MessageStoreException
-	{
-
-		String sql = "select uuid,type,message from message where uuid=?";
-		Message message = null;
-
-		try
-		{
-			conn = mgr.getConnection();
-            PreparedStatement ps = conn.prepareStatement(sql);
-			ps.setString(1, uid.toString());
-
-			ResultSet rs = ps.executeQuery();
-			if (!rs.next())
-				throw new MessageStoreException("Non existing Message for UUID: " + uid);
-
-			message = Util.deserialize((Serializable) Base64.decodeToObject(rs
-					.getString(3)));
-
-		}
-		catch (SQLException e)
-		{
-			throw new MessageStoreException(e);
-		}
-		catch (Exception e)
-		{
-			logger.error(e);
-			throw new MessageStoreException(e);
-		} 
-		finally
-		{
-			release();
-		}
-
-		return message;
-
-	}
-	
-	/**
-	 * 
-	 * @param uid - key for message to set undelivered flag on
-	 * @throws MessageStoreException
-	 */
-	public void setUndelivered(URI uid) throws MessageStoreException{
-		String sql = "update message set delivered = 'FALSE' where uuid=?";
-		
-		try
-		{
-			conn = mgr.getConnection();
-			
-            PreparedStatement ps = conn.prepareStatement(sql);
-			ps.setString(1, uid.toString());
-			ps.execute();
-
-		}
-		catch (Exception e)
-		{
-			logger.error(e);
-			throw new MessageStoreException(e);
-		} 
-		finally
-		{
-			release();
-		}
-		
-	}
-	
-	public void setDelivered(URI uid) throws MessageStoreException{
-		String sql = "update message set delivered = 'TRUE' where uuid=?";
-		
-		try
-		{
-			conn = mgr.getConnection();
-			
-            PreparedStatement ps = conn.prepareStatement(sql);
-			ps.setString(1, "FALSE");
-			ps.execute();
-
-		}
-		catch (Exception e)
-		{
-			logger.error(e);
-			throw new MessageStoreException(e);
-		} 
-		finally
-		{
-			release();
-		}
-		
-	}
-	
-	/**
-	 * This method can be used to retrieve a collection of all the undelivered (delivered=FALSE) from the message-store
-	 * You should test for 'null' on the return type to see if any messages exist in the collection
-	 * @return Map<URI, Message> - a collection of all the undelivered messages in the message-store
-	 * @throws MessageStoreException
-	 */
-	public Map<URI, Message> getUndeliveredMessages(String classification) throws MessageStoreException {
-		HashMap<URI, Message> messages = new HashMap<URI, Message>();
-		String sql = "select uuid from message where delivered='FALSE'";
-        if (classification!=null) {
-            sql += " and classification='" + classification + "'";
-        }
-		
-		try
-		{
-			conn = mgr.getConnection();
-			Statement stmt;
-			ResultSet rs;
-			stmt = conn.createStatement();
-			rs = stmt.executeQuery(sql);
-			
-			while (rs.next()) {
-				URI uid = new URI(rs.getString(1));
-				Message msg = getMessage(uid);
-				messages.put(uid, msg);
-			}
-			rs.close();
-			stmt.close();
-
-		}
-		catch (Exception e)
-		{
-			logger.error(e);
-			throw new MessageStoreException(e);
-		} 
-		finally
-		{
-			release();
-		}
-		logger.info("retrieved " + messages.size() + " undelivered messages");
-		return messages;
-		
-	}
-    
-    /**
-     * This method can be used to retrieve a collection of all from the message-store
-     * You should test for 'null' on the return type to see if any messages exist in the collection
-     * @return Map<URI, Message> - a collection of all the undelivered messages in the message-store
-     * @throws MessageStoreException
-     */
-    public Map<URI, Message> getAllMessages(String classification) throws MessageStoreException {
-        HashMap<URI, Message> messages = new HashMap<URI, Message>();
-        String sql = "select uuid from message";
-        if (classification!=null) {
-            sql += " where classification='" + classification + "'";
-        }
-        
-        try
-        {
-            conn = mgr.getConnection();
-            Statement stmt;
-            ResultSet rs;
-            stmt = conn.createStatement();
-            rs = stmt.executeQuery(sql);
-            
-            while (rs.next()) {
-                URI uid = new URI(rs.getString(1));
-                Message msg = getMessage(uid);
-                messages.put(uid, msg);
-            }
-            rs.close();
-            stmt.close();
-
-        }
-        catch (Exception e)
-        {
-            logger.error(e);
-            throw new MessageStoreException(e);
-        } 
-        finally
-        {
-            release();
-        }
-        logger.info("retrieved " + messages.size() + " undelivered messages");
-        return messages;
-        
-    }
-
-	private void release ()
-	{
-
-		if (conn != null)
-		{
-			try
-			{
-				conn.close();
-			}
-			catch (Exception e2)
-			{
-			}
-		}
-	}
-
-}

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,316 @@
+/*
+ * 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 daniel.brum at jboss.com
+ */
+
+package org.jboss.internal.soa.esb.persistence.format.db;
+
+import java.io.Serializable;
+import java.net.URI;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.message.urigen.DefaultMessageURIGenerator;
+import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
+import org.jboss.internal.soa.esb.thirdparty.Base64;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.urigen.MessageURIGenerator;
+import org.jboss.soa.esb.persistence.manager.ConnectionManagerException;
+import org.jboss.soa.esb.persistence.manager.ConnectionManagerFactory;
+import org.jboss.soa.esb.services.persistence.MessageStore;
+import org.jboss.soa.esb.services.persistence.MessageStoreException;
+import org.jboss.soa.esb.util.Util;
+
+public class DBMessageStoreImpl implements MessageStore
+{
+	private static Logger logger = Logger.getLogger(DBMessageStoreImpl.class);
+
+	protected ConnectionManager mgr = null;
+
+	protected Connection conn = null;
+
+	//protected ResultSet rs = null;
+
+	//protected PreparedStatement ps = null;
+	
+	protected MessageURIGenerator uriGenerator = new DefaultMessageURIGenerator();
+
+	public DBMessageStoreImpl()
+	{
+		try {
+			mgr = ConnectionManagerFactory.getConnectionManager();
+		} catch (ConnectionManagerException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.jboss.soa.esb.services.persistence.MessageStore#getMessageURIGenerator()
+	 */
+	public MessageURIGenerator getMessageURIGenerator() {
+		return uriGenerator;
+	}
+
+	/**
+	 * add's a @Message to the database persistence store
+	 * will set the 'delivered' flag to TRUE by default - assuming that the @Message has been delivered
+	 */
+	public synchronized URI addMessage (Message message, String classification) throws MessageStoreException
+	{
+		// String messageString = null;
+		URI uid = null;
+		try{
+			conn = mgr.getConnection();
+
+			uid = uriGenerator.generateMessageURI(message);
+
+			String messageString = Base64.encodeObject(Util.serialize(message));
+
+			// insert into the database
+			String sql = "insert into message(uuid, type, message, delivered, classification) values(?,?,?,?,?)";
+            PreparedStatement ps = conn.prepareStatement(sql);
+			ps.setString(1, uid.toString());
+			ps.setString(2, message.getType().toString());
+			ps.setString(3, messageString);
+			ps.setString(4, "TRUE");
+            ps.setString(5, classification);
+			ps.execute();
+            ps.close();
+
+		}
+		catch (Exception e)
+		{
+			logger.error(e);
+			throw new MessageStoreException(e);
+		} 
+		finally
+		{
+			release();
+		}
+
+		return uid;
+	}
+
+	/**
+	 * return a @Message based on the passed in key in the form of a JBoss ESB @URI
+	 * format for URI: "urn:jboss/esb/message/UID#" + UUID.randomUUID()" - see the method in this class @addMessage
+	 */
+	public synchronized Message getMessage (URI uid)
+			throws MessageStoreException
+	{
+
+		String sql = "select uuid,type,message from message where uuid=?";
+		Message message = null;
+
+		try
+		{
+			conn = mgr.getConnection();
+            PreparedStatement ps = conn.prepareStatement(sql);
+			ps.setString(1, uid.toString());
+
+			ResultSet rs = ps.executeQuery();
+			if (!rs.next())
+				throw new MessageStoreException("Non existing Message for UUID: " + uid);
+
+			message = Util.deserialize((Serializable) Base64.decodeToObject(rs
+					.getString(3)));
+
+		}
+		catch (SQLException e)
+		{
+			throw new MessageStoreException(e);
+		}
+		catch (Exception e)
+		{
+			logger.error(e);
+			throw new MessageStoreException(e);
+		} 
+		finally
+		{
+			release();
+		}
+
+		return message;
+
+	}
+	
+	/**
+	 * 
+	 * @param uid - key for message to set undelivered flag on
+	 * @throws MessageStoreException
+	 */
+	public void setUndelivered(URI uid) throws MessageStoreException{
+		String sql = "update message set delivered = 'FALSE' where uuid=?";
+		
+		try
+		{
+			conn = mgr.getConnection();
+			
+            PreparedStatement ps = conn.prepareStatement(sql);
+			ps.setString(1, uid.toString());
+			ps.execute();
+
+		}
+		catch (Exception e)
+		{
+			logger.error(e);
+			throw new MessageStoreException(e);
+		} 
+		finally
+		{
+			release();
+		}
+		
+	}
+	
+	public void setDelivered(URI uid) throws MessageStoreException{
+		String sql = "update message set delivered = 'TRUE' where uuid=?";
+		
+		try
+		{
+			conn = mgr.getConnection();
+			
+            PreparedStatement ps = conn.prepareStatement(sql);
+			ps.setString(1, "FALSE");
+			ps.execute();
+
+		}
+		catch (Exception e)
+		{
+			logger.error(e);
+			throw new MessageStoreException(e);
+		} 
+		finally
+		{
+			release();
+		}
+		
+	}
+	
+	/**
+	 * This method can be used to retrieve a collection of all the undelivered (delivered=FALSE) from the message-store
+	 * You should test for 'null' on the return type to see if any messages exist in the collection
+	 * @return Map<URI, Message> - a collection of all the undelivered messages in the message-store
+	 * @throws MessageStoreException
+	 */
+	public Map<URI, Message> getUndeliveredMessages(String classification) throws MessageStoreException {
+		HashMap<URI, Message> messages = new HashMap<URI, Message>();
+		String sql = "select uuid from message where delivered='FALSE'";
+        if (classification!=null) {
+            sql += " and classification='" + classification + "'";
+        }
+		
+		try
+		{
+			conn = mgr.getConnection();
+			Statement stmt;
+			ResultSet rs;
+			stmt = conn.createStatement();
+			rs = stmt.executeQuery(sql);
+			
+			while (rs.next()) {
+				URI uid = new URI(rs.getString(1));
+				Message msg = getMessage(uid);
+				messages.put(uid, msg);
+			}
+			rs.close();
+			stmt.close();
+
+		}
+		catch (Exception e)
+		{
+			logger.error(e);
+			throw new MessageStoreException(e);
+		} 
+		finally
+		{
+			release();
+		}
+		logger.info("retrieved " + messages.size() + " undelivered messages");
+		return messages;
+		
+	}
+    
+    /**
+     * This method can be used to retrieve a collection of all from the message-store
+     * You should test for 'null' on the return type to see if any messages exist in the collection
+     * @return Map<URI, Message> - a collection of all the undelivered messages in the message-store
+     * @throws MessageStoreException
+     */
+    public Map<URI, Message> getAllMessages(String classification) throws MessageStoreException {
+        HashMap<URI, Message> messages = new HashMap<URI, Message>();
+        String sql = "select uuid from message";
+        if (classification!=null) {
+            sql += " where classification='" + classification + "'";
+        }
+        
+        try
+        {
+            conn = mgr.getConnection();
+            Statement stmt;
+            ResultSet rs;
+            stmt = conn.createStatement();
+            rs = stmt.executeQuery(sql);
+            
+            while (rs.next()) {
+                URI uid = new URI(rs.getString(1));
+                Message msg = getMessage(uid);
+                messages.put(uid, msg);
+            }
+            rs.close();
+            stmt.close();
+
+        }
+        catch (Exception e)
+        {
+            logger.error(e);
+            throw new MessageStoreException(e);
+        } 
+        finally
+        {
+            release();
+        }
+        logger.info("retrieved " + messages.size() + " undelivered messages");
+        return messages;
+        
+    }
+
+	private void release ()
+	{
+
+		if (conn != null)
+		{
+			try
+			{
+				conn.close();
+			}
+			catch (Exception e2)
+			{
+			}
+		}
+	}
+
+}

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRConnectionManager.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRConnectionManager.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRConnectionManager.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,167 +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 derek.adams at sapience360.com
- */
-
-package org.jboss.internal.soa.esb.persistence.format.jcr;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Properties;
-
-import javax.jcr.Repository;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.jcr.SimpleCredentials;
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.jackrabbit.core.TransientRepository;
-import org.apache.jackrabbit.core.config.RepositoryConfig;
-import org.jboss.soa.esb.common.Configuration;
-import org.jboss.soa.esb.helpers.NamingContext;
-import org.jboss.system.server.ServerConfig;
-import org.jboss.system.server.ServerConfigLocator;
-
-/**
- * Manages connections to a JSR 170 content repository.
- * 
- * @author Derek Adams
- */
-public class JCRConnectionManager {
-
-	/** Singleton instance */
-	private static JCRConnectionManager instance;
-
-	/** Repository instance */
-	private Repository repository;
-
-	/** Repository session */
-	private Session session;
-
-	/**
-	 * Singleton constructor.
-	 */
-	private JCRConnectionManager() {
-	}
-
-	/**
-	 * Get the singleton manager instance.
-	 * 
-	 * @return
-	 */
-	public static JCRConnectionManager getInstance() {
-		if (instance == null) {
-			instance = new JCRConnectionManager();
-		}
-		return instance;
-	}
-
-	/**
-	 * Initialize the repository.
-	 * 
-	 * @param config
-	 * @param home
-	 * @return
-	 * @throws RepositoryException
-	 */
-	protected Repository initRepository(File config, File home) throws RepositoryException {
-		RepositoryConfig rconfig = RepositoryConfig.create(config.getPath(), home.getPath());
-		try {
-			return new TransientRepository(rconfig);
-		} catch (IOException e) {
-			throw new RepositoryException(e);
-		}
-	}
-
-	/**
-	 * Get the repository instance.
-	 * 
-	 * @return
-	 */
-	protected Repository getRepository() throws RepositoryException {
-		if (repository == null) {
-			// If JNDI path specified, load the repository from JNDI.
-			if (!StringUtils.isEmpty(Configuration.getJcrStoreJNDIPath())) {
-				Properties environment = new Properties();
-				environment.setProperty(Context.PROVIDER_URL, Configuration.getJndiServerURL());
-				environment.setProperty(Context.INITIAL_CONTEXT_FACTORY,
-						Configuration.getJndiServerContextFactory());
-				environment.setProperty(Context.URL_PKG_PREFIXES,
-						Configuration.getJndiServerPkgPrefix());
-				Context context = NamingContext.getServerContext(environment);
-				try {
-					repository = (Repository) context.lookup(Configuration.getJcrStoreJNDIPath());
-				} catch (NamingException e) {
-					throw new RepositoryException(e);
-				}
-			}
-			// If no JNDI path is specified, init the repository with default
-			// settings based on the respository.xml in the conf directory.
-			else {
-				try {
-					ClassLoader loader = Thread.currentThread().getContextClassLoader();
-					URL url = loader.getResource("repository.xml");
-					URI uri = new URI(url.toString());
-					File repositoryConfig = new File(uri);
-					ServerConfig config = ServerConfigLocator.locate();
-					File dataDir = config.getServerDataDir();
-					File repositoryFolder = new File(dataDir, "repository");
-					repository = initRepository(repositoryConfig, repositoryFolder);
-				} catch (URISyntaxException e) {
-					throw new RepositoryException(e);
-				}
-			}
-		}
-		return repository;
-	}
-
-	/**
-	 * Open a session on the repository.
-	 * 
-	 * @return
-	 * @throws RepositoryException
-	 */
-	public Session newRepositorySession() throws RepositoryException {
-		String username = Configuration.getJcrStoreUsername();
-		String password = Configuration.getJcrStorePassword();
-		if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) {
-			throw new RepositoryException(
-					"JCR username and password must be specified in configuration.");
-		}
-		return getRepository().login(new SimpleCredentials(username, password.toCharArray()));
-	}
-
-	/**
-	 * Get the existing repository session or create a new one.
-	 * 
-	 * @return
-	 * @throws RepositoryException
-	 */
-	public Session getSharedSession() throws RepositoryException {
-		if (session == null) {
-			session = newRepositorySession();
-		}
-		return session;
-	}
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRConnectionManager.java (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRConnectionManager.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRConnectionManager.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRConnectionManager.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,167 @@
+/*
+ * 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 derek.adams at sapience360.com
+ */
+
+package org.jboss.internal.soa.esb.persistence.format.jcr;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Properties;
+
+import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+import javax.naming.Context;
+import javax.naming.NamingException;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.jackrabbit.core.TransientRepository;
+import org.apache.jackrabbit.core.config.RepositoryConfig;
+import org.jboss.soa.esb.common.Configuration;
+import org.jboss.soa.esb.helpers.NamingContext;
+import org.jboss.system.server.ServerConfig;
+import org.jboss.system.server.ServerConfigLocator;
+
+/**
+ * Manages connections to a JSR 170 content repository.
+ * 
+ * @author Derek Adams
+ */
+public class JCRConnectionManager {
+
+	/** Singleton instance */
+	private static JCRConnectionManager instance;
+
+	/** Repository instance */
+	private Repository repository;
+
+	/** Repository session */
+	private Session session;
+
+	/**
+	 * Singleton constructor.
+	 */
+	private JCRConnectionManager() {
+	}
+
+	/**
+	 * Get the singleton manager instance.
+	 * 
+	 * @return
+	 */
+	public static JCRConnectionManager getInstance() {
+		if (instance == null) {
+			instance = new JCRConnectionManager();
+		}
+		return instance;
+	}
+
+	/**
+	 * Initialize the repository.
+	 * 
+	 * @param config
+	 * @param home
+	 * @return
+	 * @throws RepositoryException
+	 */
+	protected Repository initRepository(File config, File home) throws RepositoryException {
+		RepositoryConfig rconfig = RepositoryConfig.create(config.getPath(), home.getPath());
+		try {
+			return new TransientRepository(rconfig);
+		} catch (IOException e) {
+			throw new RepositoryException(e);
+		}
+	}
+
+	/**
+	 * Get the repository instance.
+	 * 
+	 * @return
+	 */
+	protected Repository getRepository() throws RepositoryException {
+		if (repository == null) {
+			// If JNDI path specified, load the repository from JNDI.
+			if (!StringUtils.isEmpty(Configuration.getJcrStoreJNDIPath())) {
+				Properties environment = new Properties();
+				environment.setProperty(Context.PROVIDER_URL, Configuration.getJndiServerURL());
+				environment.setProperty(Context.INITIAL_CONTEXT_FACTORY,
+						Configuration.getJndiServerContextFactory());
+				environment.setProperty(Context.URL_PKG_PREFIXES,
+						Configuration.getJndiServerPkgPrefix());
+				Context context = NamingContext.getServerContext(environment);
+				try {
+					repository = (Repository) context.lookup(Configuration.getJcrStoreJNDIPath());
+				} catch (NamingException e) {
+					throw new RepositoryException(e);
+				}
+			}
+			// If no JNDI path is specified, init the repository with default
+			// settings based on the respository.xml in the conf directory.
+			else {
+				try {
+					ClassLoader loader = Thread.currentThread().getContextClassLoader();
+					URL url = loader.getResource("repository.xml");
+					URI uri = new URI(url.toString());
+					File repositoryConfig = new File(uri);
+					ServerConfig config = ServerConfigLocator.locate();
+					File dataDir = config.getServerDataDir();
+					File repositoryFolder = new File(dataDir, "repository");
+					repository = initRepository(repositoryConfig, repositoryFolder);
+				} catch (URISyntaxException e) {
+					throw new RepositoryException(e);
+				}
+			}
+		}
+		return repository;
+	}
+
+	/**
+	 * Open a session on the repository.
+	 * 
+	 * @return
+	 * @throws RepositoryException
+	 */
+	public Session newRepositorySession() throws RepositoryException {
+		String username = Configuration.getJcrStoreUsername();
+		String password = Configuration.getJcrStorePassword();
+		if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) {
+			throw new RepositoryException(
+					"JCR username and password must be specified in configuration.");
+		}
+		return getRepository().login(new SimpleCredentials(username, password.toCharArray()));
+	}
+
+	/**
+	 * Get the existing repository session or create a new one.
+	 * 
+	 * @return
+	 * @throws RepositoryException
+	 */
+	public Session getSharedSession() throws RepositoryException {
+		if (session == null) {
+			session = newRepositorySession();
+		}
+		return session;
+	}
+}
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,273 +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 derek.adams at sapience360.com
- */
-
-package org.jboss.internal.soa.esb.persistence.format.jcr;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.net.URI;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.jcr.Node;
-import javax.jcr.NodeIterator;
-import javax.jcr.PathNotFoundException;
-import javax.jcr.Property;
-import javax.jcr.PropertyIterator;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.jcr.Value;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-import org.jboss.internal.soa.esb.message.urigen.JcrMessageURIGenerator;
-import org.jboss.soa.esb.common.Configuration;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.message.properties.MessagePropertyFacade;
-import org.jboss.soa.esb.message.urigen.MessageURIGenerator;
-import org.jboss.soa.esb.message.urigen.URIGenerationException;
-import org.jboss.soa.esb.services.persistence.MessageStore;
-import org.jboss.soa.esb.services.persistence.MessageStoreException;
-
-/**
- * Message store that persists messages to a JSR 170 content repository.
- * 
- * @author Derek Adams
- */
-public class JCRMessageStoreImpl implements MessageStore {
-
-	/** Static logger instance */
-	private static Logger LOGGER = Logger.getLogger(JCRMessageStoreImpl.class);
-
-	/** Generator for JCR-specific message URIs */
-	protected MessageURIGenerator uriGenerator = new JcrMessageURIGenerator();
-
-	/** Root node under which JCR messages are stored (lazy-loaded) */
-	protected Node messageStoreRootNode;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.jboss.soa.esb.services.persistence.MessageStore#addMessage(org.jboss.soa.esb.message.Message)
-	 */
-	public URI addMessage(Message message, String classification) throws MessageStoreException {
-		try {
-			Session session = JCRConnectionManager.getInstance().newRepositorySession();
-			Node root = getMessageStoreRootNode(session);
-			URI uid = saveMessage(root, message);
-			session.save();
-			return uid;
-		} catch (RepositoryException e) {
-			throw new MessageStoreException(e);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.jboss.soa.esb.services.persistence.MessageStore#getMessage(java.net.URI)
-	 */
-	public Message getMessage(URI uri) throws MessageStoreException {
-		try {
-			Session session = JCRConnectionManager.getInstance().newRepositorySession();
-			Node root = getMessageStoreRootNode(session);
-			return loadMessage(root, uri);
-		} catch (RepositoryException e) {
-			throw new MessageStoreException(e);
-		}
-	}
-
-	/**
-	 * Save a message to the content repository.
-	 * 
-	 * @param message
-	 * @return
-	 * @throws RepositoryException
-	 */
-	protected URI saveMessage(Node root, Message message) throws RepositoryException {
-		try {
-			URI messageURI = uriGenerator.generateMessageURI(message);
-			MessagePropertyFacade msgProps = new MessagePropertyFacade(message);
-			msgProps.setMessageId(messageURI.toString());
-			Node messageNode = root.addNode(messageURI.toString());
-			Node bodyNode = messageNode.addNode(JCRNodeNames.BODY_NODE_NAME);
-			if (message.getBody().getByteArray() != null) {
-				ByteArrayInputStream stream = new ByteArrayInputStream(
-						message.getBody().getByteArray());
-				bodyNode.setProperty(JCRNodeNames.BODY_CONTENT_PROP_NAME, stream);
-			}
-			for (String propName : message.getProperties().getNames()) {
-				Object propObj = message.getProperties().getProperty(propName);
-				if (propObj instanceof String) {
-					messageNode.setProperty(propName, (String) propObj);
-				} else if (propObj instanceof Calendar) {
-					messageNode.setProperty(propName, (Calendar) propObj);
-				} else if (propObj instanceof Boolean) {
-					messageNode.setProperty(propName, (Boolean) propObj);
-				} else if (propObj instanceof Long) {
-					messageNode.setProperty(propName, (Long) propObj);
-				}
-			}
-			if (LOGGER.isInfoEnabled()) {
-				LOGGER.info("Saved node to content repository:");
-				dumpNodeToLog(messageNode);
-			}
-			return messageURI;
-		} catch (URIGenerationException e) {
-			throw new RepositoryException(e);
-		}
-	}
-
-	/**
-	 * Load a message from the content repository.
-	 * 
-	 * @param root
-	 * @param uri
-	 * @return
-	 * @throws RepositoryException
-	 */
-	protected Message loadMessage(Node root, URI uri) throws RepositoryException {
-		try {
-			Node messageNode = root.getNode(uri.toString());
-			Node bodyNode = messageNode.getNode(JCRNodeNames.BODY_NODE_NAME);
-			Property bodyContents = bodyNode.getProperty(JCRNodeNames.BODY_CONTENT_PROP_NAME);
-			Message message = MessageFactory.getInstance().getMessage();
-			if (bodyContents != null) {
-				byte[] contentBytes = IOUtils.toByteArray(bodyContents.getStream());
-				message.getBody().setByteArray(contentBytes);
-			}
-			if (LOGGER.isInfoEnabled()) {
-				LOGGER.info("Loaded node from content repository:");
-				dumpNodeToLog(messageNode);
-			}
-			return message;
-		} catch (IOException e) {
-			throw new RepositoryException(e);
-		}
-	}
-
-	/**
-	 * Dumps the contents of a JCR node to the logger.
-	 * 
-	 * @param node
-	 * @throws RepositoryException
-	 */
-	protected void dumpNodeToLog(Node node) throws RepositoryException {
-		LOGGER.info(node.getPath());
-		if (node.getName().equals("jcr:system")) {
-			return;
-		}
-
-		// Display all node properties.
-		PropertyIterator properties = node.getProperties();
-		while (properties.hasNext()) {
-			Property property = properties.nextProperty();
-			if (property.getDefinition().isMultiple()) {
-				Value[] values = property.getValues();
-				for (int i = 0; i < values.length; i++) {
-					LOGGER.info(property.getPath() + " = " + values[i].getString());
-				}
-			} else {
-				LOGGER.info(property.getPath() + " = " + property.getString());
-			}
-		}
-
-		// Recurse into subnodes.
-		NodeIterator nodes = node.getNodes();
-		while (nodes.hasNext()) {
-			dumpNodeToLog(nodes.nextNode());
-		}
-	}
-
-	/**
-	 * Get the root node under which messages are stored. Create the root path
-	 * if needed.
-	 * 
-	 * @param session
-	 * @return
-	 * @throws RepositoryException
-	 */
-	protected Node getMessageStoreRootNode(Session session) throws RepositoryException {
-		if (messageStoreRootNode == null) {
-			if (StringUtils.isEmpty(Configuration.getJcrStoreRootNodePath())) {
-				throw new RepositoryException("JCR root node path not specified in configuration.");
-			}
-			Node current = session.getRootNode();
-			String[] nodeNames = Configuration.getJcrStoreRootNodePath().split("/");
-			for (String nodeName : nodeNames) {
-				try {
-					current = current.getNode(nodeName);
-				} catch (PathNotFoundException e) {
-					current = current.addNode(nodeName);
-				}
-			}
-			session.save();
-			messageStoreRootNode = current;
-		}
-		return messageStoreRootNode;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.jboss.soa.esb.services.persistence.MessageStore#getMessageURIGenerator()
-	 */
-	public MessageURIGenerator getMessageURIGenerator() {
-		return uriGenerator;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.jboss.soa.esb.services.persistence.MessageStore#getUndeliveredMessages()
-	 */
-	public Map<URI, Message> getUndeliveredMessages(String classification) throws MessageStoreException {
-		return new HashMap<URI, Message>();
-	}
-    
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.jboss.soa.esb.services.persistence.MessageStore#getUndeliveredMessages()
-     */
-    public Map<URI, Message> getAllMessages(String classification) throws MessageStoreException {
-        return new HashMap<URI, Message>();
-    }
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.jboss.soa.esb.services.persistence.MessageStore#setDelivered(java.net.URI)
-	 */
-	public void setDelivered(URI uid) throws MessageStoreException {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.jboss.soa.esb.services.persistence.MessageStore#setUndelivered(java.net.URI)
-	 */
-	public void setUndelivered(URI uid) throws MessageStoreException {
-	}
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,273 @@
+/*
+ * 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 derek.adams at sapience360.com
+ */
+
+package org.jboss.internal.soa.esb.persistence.format.jcr;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.net.URI;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.jcr.Node;
+import javax.jcr.NodeIterator;
+import javax.jcr.PathNotFoundException;
+import javax.jcr.Property;
+import javax.jcr.PropertyIterator;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.Value;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.message.urigen.JcrMessageURIGenerator;
+import org.jboss.soa.esb.common.Configuration;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.message.properties.MessagePropertyFacade;
+import org.jboss.soa.esb.message.urigen.MessageURIGenerator;
+import org.jboss.soa.esb.message.urigen.URIGenerationException;
+import org.jboss.soa.esb.services.persistence.MessageStore;
+import org.jboss.soa.esb.services.persistence.MessageStoreException;
+
+/**
+ * Message store that persists messages to a JSR 170 content repository.
+ * 
+ * @author Derek Adams
+ */
+public class JCRMessageStoreImpl implements MessageStore {
+
+	/** Static logger instance */
+	private static Logger LOGGER = Logger.getLogger(JCRMessageStoreImpl.class);
+
+	/** Generator for JCR-specific message URIs */
+	protected MessageURIGenerator uriGenerator = new JcrMessageURIGenerator();
+
+	/** Root node under which JCR messages are stored (lazy-loaded) */
+	protected Node messageStoreRootNode;
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.jboss.soa.esb.services.persistence.MessageStore#addMessage(org.jboss.soa.esb.message.Message)
+	 */
+	public URI addMessage(Message message, String classification) throws MessageStoreException {
+		try {
+			Session session = JCRConnectionManager.getInstance().newRepositorySession();
+			Node root = getMessageStoreRootNode(session);
+			URI uid = saveMessage(root, message);
+			session.save();
+			return uid;
+		} catch (RepositoryException e) {
+			throw new MessageStoreException(e);
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.jboss.soa.esb.services.persistence.MessageStore#getMessage(java.net.URI)
+	 */
+	public Message getMessage(URI uri) throws MessageStoreException {
+		try {
+			Session session = JCRConnectionManager.getInstance().newRepositorySession();
+			Node root = getMessageStoreRootNode(session);
+			return loadMessage(root, uri);
+		} catch (RepositoryException e) {
+			throw new MessageStoreException(e);
+		}
+	}
+
+	/**
+	 * Save a message to the content repository.
+	 * 
+	 * @param message
+	 * @return
+	 * @throws RepositoryException
+	 */
+	protected URI saveMessage(Node root, Message message) throws RepositoryException {
+		try {
+			URI messageURI = uriGenerator.generateMessageURI(message);
+			MessagePropertyFacade msgProps = new MessagePropertyFacade(message);
+			msgProps.setMessageId(messageURI.toString());
+			Node messageNode = root.addNode(messageURI.toString());
+			Node bodyNode = messageNode.addNode(JCRNodeNames.BODY_NODE_NAME);
+			if (message.getBody().getByteArray() != null) {
+				ByteArrayInputStream stream = new ByteArrayInputStream(
+						message.getBody().getByteArray());
+				bodyNode.setProperty(JCRNodeNames.BODY_CONTENT_PROP_NAME, stream);
+			}
+			for (String propName : message.getProperties().getNames()) {
+				Object propObj = message.getProperties().getProperty(propName);
+				if (propObj instanceof String) {
+					messageNode.setProperty(propName, (String) propObj);
+				} else if (propObj instanceof Calendar) {
+					messageNode.setProperty(propName, (Calendar) propObj);
+				} else if (propObj instanceof Boolean) {
+					messageNode.setProperty(propName, (Boolean) propObj);
+				} else if (propObj instanceof Long) {
+					messageNode.setProperty(propName, (Long) propObj);
+				}
+			}
+			if (LOGGER.isInfoEnabled()) {
+				LOGGER.info("Saved node to content repository:");
+				dumpNodeToLog(messageNode);
+			}
+			return messageURI;
+		} catch (URIGenerationException e) {
+			throw new RepositoryException(e);
+		}
+	}
+
+	/**
+	 * Load a message from the content repository.
+	 * 
+	 * @param root
+	 * @param uri
+	 * @return
+	 * @throws RepositoryException
+	 */
+	protected Message loadMessage(Node root, URI uri) throws RepositoryException {
+		try {
+			Node messageNode = root.getNode(uri.toString());
+			Node bodyNode = messageNode.getNode(JCRNodeNames.BODY_NODE_NAME);
+			Property bodyContents = bodyNode.getProperty(JCRNodeNames.BODY_CONTENT_PROP_NAME);
+			Message message = MessageFactory.getInstance().getMessage();
+			if (bodyContents != null) {
+				byte[] contentBytes = IOUtils.toByteArray(bodyContents.getStream());
+				message.getBody().setByteArray(contentBytes);
+			}
+			if (LOGGER.isInfoEnabled()) {
+				LOGGER.info("Loaded node from content repository:");
+				dumpNodeToLog(messageNode);
+			}
+			return message;
+		} catch (IOException e) {
+			throw new RepositoryException(e);
+		}
+	}
+
+	/**
+	 * Dumps the contents of a JCR node to the logger.
+	 * 
+	 * @param node
+	 * @throws RepositoryException
+	 */
+	protected void dumpNodeToLog(Node node) throws RepositoryException {
+		LOGGER.info(node.getPath());
+		if (node.getName().equals("jcr:system")) {
+			return;
+		}
+
+		// Display all node properties.
+		PropertyIterator properties = node.getProperties();
+		while (properties.hasNext()) {
+			Property property = properties.nextProperty();
+			if (property.getDefinition().isMultiple()) {
+				Value[] values = property.getValues();
+				for (int i = 0; i < values.length; i++) {
+					LOGGER.info(property.getPath() + " = " + values[i].getString());
+				}
+			} else {
+				LOGGER.info(property.getPath() + " = " + property.getString());
+			}
+		}
+
+		// Recurse into subnodes.
+		NodeIterator nodes = node.getNodes();
+		while (nodes.hasNext()) {
+			dumpNodeToLog(nodes.nextNode());
+		}
+	}
+
+	/**
+	 * Get the root node under which messages are stored. Create the root path
+	 * if needed.
+	 * 
+	 * @param session
+	 * @return
+	 * @throws RepositoryException
+	 */
+	protected Node getMessageStoreRootNode(Session session) throws RepositoryException {
+		if (messageStoreRootNode == null) {
+			if (StringUtils.isEmpty(Configuration.getJcrStoreRootNodePath())) {
+				throw new RepositoryException("JCR root node path not specified in configuration.");
+			}
+			Node current = session.getRootNode();
+			String[] nodeNames = Configuration.getJcrStoreRootNodePath().split("/");
+			for (String nodeName : nodeNames) {
+				try {
+					current = current.getNode(nodeName);
+				} catch (PathNotFoundException e) {
+					current = current.addNode(nodeName);
+				}
+			}
+			session.save();
+			messageStoreRootNode = current;
+		}
+		return messageStoreRootNode;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.jboss.soa.esb.services.persistence.MessageStore#getMessageURIGenerator()
+	 */
+	public MessageURIGenerator getMessageURIGenerator() {
+		return uriGenerator;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.jboss.soa.esb.services.persistence.MessageStore#getUndeliveredMessages()
+	 */
+	public Map<URI, Message> getUndeliveredMessages(String classification) throws MessageStoreException {
+		return new HashMap<URI, Message>();
+	}
+    
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.jboss.soa.esb.services.persistence.MessageStore#getUndeliveredMessages()
+     */
+    public Map<URI, Message> getAllMessages(String classification) throws MessageStoreException {
+        return new HashMap<URI, Message>();
+    }
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.jboss.soa.esb.services.persistence.MessageStore#setDelivered(java.net.URI)
+	 */
+	public void setDelivered(URI uid) throws MessageStoreException {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.jboss.soa.esb.services.persistence.MessageStore#setUndelivered(java.net.URI)
+	 */
+	public void setUndelivered(URI uid) throws MessageStoreException {
+	}
+}
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRNodeNames.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRNodeNames.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRNodeNames.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,36 +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 derek.adams at sapience360.com
- */
-
-package org.jboss.internal.soa.esb.persistence.format.jcr;
-
-/**
- * Constants for JCR message store node names.
- * 
- * @author Derek Adams
- */
-public interface JCRNodeNames {
-
-	/** Constant for the body node name */
-	public static final String BODY_NODE_NAME = "Body";
-
-	/** Constant for the body content property name */
-	public static final String BODY_CONTENT_PROP_NAME = "Content";
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRNodeNames.java (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRNodeNames.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRNodeNames.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/jcr/JCRNodeNames.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,36 @@
+/*
+ * 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 derek.adams at sapience360.com
+ */
+
+package org.jboss.internal.soa.esb.persistence.format.jcr;
+
+/**
+ * Constants for JCR message store node names.
+ * 
+ * @author Derek Adams
+ */
+public interface JCRNodeNames {
+
+	/** Constant for the body node name */
+	public static final String BODY_NODE_NAME = "Body";
+
+	/** Constant for the body content property name */
+	public static final String BODY_CONTENT_PROP_NAME = "Content";
+}
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/soa (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/soa)

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

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/soa/esb/actions (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/soa/esb/actions)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/soa/esb/actions/MessagePersister.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/soa/esb/actions/MessagePersister.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/soa/esb/actions/MessagePersister.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,92 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-/**
- * Routes the Message argument to a fixed list of services ([category,name]) 
- * @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
- * @since Version 4.0
- */
-package org.jboss.soa.esb.actions;
-
-import org.apache.log4j.Logger;
-import org.jboss.internal.soa.esb.persistence.format.MessageStoreFactory;
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.services.persistence.MessageStore;
-import org.jboss.soa.esb.services.persistence.MessageStoreException;
-import org.jboss.soa.esb.services.registry.RegistryException;
-import org.jboss.soa.esb.services.routing.MessageRouterException;
-
-public class MessagePersister extends AbstractActionPipelineProcessor
-{
-    public final static String SERVICE_CATEGORY = "JBossESB-Internal";
-    public final static String SERVICE_NAME = "DeadLetterService";
-    public final static String MESSAGE_STORE_CLASS = "message-store-class";
-    public final static String CLASSIFICATION_ATTR = "classfication";
-    
-    protected ConfigTree config;
-    protected MessageStore messageStore;
-    private String classification;
-	private Logger log = Logger.getLogger(this.getClass());
-
-	public MessagePersister(ConfigTree config) throws ConfigurationException, RegistryException, MessageRouterException
-	{
-        this.config = config;
-	}
-	/** 
-     * Persists the message to the MessageStore
-	 */
-	public Message process(Message message) throws ActionProcessingException
-	{
-        try {
-            messageStore.addMessage(message, classification);
-        } catch (MessageStoreException mse) {
-            log.error("Could not store undeliverable message.", mse);
-        }
-		return message;
-	}
-    /* (non-Javadoc)
-     * @see org.jboss.soa.esb.actions.ActionLifecycle#initialise()
-     */
-    public void initialise() throws ActionLifecycleException {
-        //Reading the config
-        String messageStoreClass = config.getAttribute(MESSAGE_STORE_CLASS);
-        String classificationValue   = config.getAttribute(CLASSIFICATION_ATTR);
-        if (classificationValue!=null) {
-            classification = classificationValue;
-        }
-        if (log.isDebugEnabled()) {
-            log.debug("MessagePersister started with classification=" + classification 
-                + " and message-store-class=" + messageStore);
-        }
-        messageStore = MessageStoreFactory.getInstance().getMessageStore(messageStoreClass);
-    }
-    /* (non-Javadoc)
-     * @see org.jboss.soa.esb.actions.ActionLifecycle#destroy()
-     */
-    public void destroy() throws ActionLifecycleException {
-       classification=null;
-    }
-    
-    
-}

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/soa/esb/actions/MessagePersister.java (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/soa/esb/actions/MessagePersister.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/soa/esb/actions/MessagePersister.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/java/org/jboss/soa/esb/actions/MessagePersister.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+/**
+ * Routes the Message argument to a fixed list of services ([category,name]) 
+ * @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
+ * @since Version 4.0
+ */
+package org.jboss.soa.esb.actions;
+
+import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.persistence.format.MessageStoreFactory;
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.services.persistence.MessageStore;
+import org.jboss.soa.esb.services.persistence.MessageStoreException;
+import org.jboss.soa.esb.services.registry.RegistryException;
+import org.jboss.soa.esb.services.routing.MessageRouterException;
+
+public class MessagePersister extends AbstractActionPipelineProcessor
+{
+    public final static String SERVICE_CATEGORY = "JBossESB-Internal";
+    public final static String SERVICE_NAME = "DeadLetterService";
+    public final static String MESSAGE_STORE_CLASS = "message-store-class";
+    public final static String CLASSIFICATION_ATTR = "classfication";
+    
+    protected ConfigTree config;
+    protected MessageStore messageStore;
+    private String classification;
+	private Logger log = Logger.getLogger(this.getClass());
+
+	public MessagePersister(ConfigTree config) throws ConfigurationException, RegistryException, MessageRouterException
+	{
+        this.config = config;
+	}
+	/** 
+     * Persists the message to the MessageStore
+	 */
+	public Message process(Message message) throws ActionProcessingException
+	{
+        try {
+            messageStore.addMessage(message, classification);
+        } catch (MessageStoreException mse) {
+            log.error("Could not store undeliverable message.", mse);
+        }
+		return message;
+	}
+    /* (non-Javadoc)
+     * @see org.jboss.soa.esb.actions.ActionLifecycle#initialise()
+     */
+    public void initialise() throws ActionLifecycleException {
+        //Reading the config
+        String messageStoreClass = config.getAttribute(MESSAGE_STORE_CLASS);
+        String classificationValue   = config.getAttribute(CLASSIFICATION_ATTR);
+        if (classificationValue!=null) {
+            classification = classificationValue;
+        }
+        if (log.isDebugEnabled()) {
+            log.debug("MessagePersister started with classification=" + classification 
+                + " and message-store-class=" + messageStore);
+        }
+        messageStore = MessageStoreFactory.getInstance().getMessageStore(messageStoreClass);
+    }
+    /* (non-Javadoc)
+     * @see org.jboss.soa.esb.actions.ActionLifecycle#destroy()
+     */
+    public void destroy() throws ActionLifecycleException {
+       classification=null;
+    }
+    
+    
+}

Modified: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/META-INF/deployment.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/META-INF/deployment.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/META-INF/deployment.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jbossesb-deployment>
-  <depends>jboss.messaging.destination:service=Queue,name=DeadMessageQueue</depends>
+  <depends>jboss.esb.destination:service=Queue,name=DeadMessageQueue</depends>
 </jbossesb-deployment>

Modified: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/META-INF/jboss-esb.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/META-INF/jboss-esb.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -30,7 +30,7 @@
                <action name="PersistAction" 
                		class="org.jboss.soa.esb.actions.MessagePersister" >
                		<property name="classfication" value="DLQ"/>
-               		<property name="message-store-type" value="urn:jboss/esb/persistence/type/DATABASE"/>
+               		<property name="message-store-class" value="org.jboss.internal.soa.esb.persistence.format.db.DBMessageStoreImpl"/>
                </action>
                <action name="notificationAction" 
                		class="org.jboss.soa.esb.actions.Notifier">

Modified: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/jbm-queue-service.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=DeadMessageQueue"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-  </mbean>
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.destination:service=Queue,name=DeadMessageQueue"
+           xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+    </mbean>
 </server>

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/jbmq-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/jbmq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.destination:service=Queue,name=DeadMessageQueue">
+        <depends optional-attribute-name="DestinationManager">
+            jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+</server>

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/jbossesb-service.xml (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/jbossesb-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/jbossesb-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/jbossesb-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+   <mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
+       name="jboss.esb:service=MessageStoreDatabaseInitializer">
+      <attribute name="Datasource">java:/JBossESBDS</attribute>
+      <attribute name="ExistsSql">select * from message</attribute>
+      <attribute name="SqlFiles">
+         message-store-sql/hsqldb/create_database.sql
+      </attribute>
+      <depends>jboss.jca:service=DataSourceBinding,name=JBossESBDS</depends>
+   </mbean>
+</server>
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/hsqldb (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/hsqldb)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/hsqldb/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/hsqldb/create_database.sql	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/hsqldb/create_database.sql	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,10 +0,0 @@
-
-CREATE TABLE message
-(
-  uuid VARCHAR NOT NULL,
-  type VARCHAR NOT NULL,
-  message VARCHAR NOT NULL,
-  delivered VARCHAR NOT NULL,
-  classification VARCHAR,
-  CONSTRAINT pk_uid PRIMARY KEY (uuid)
-);

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/hsqldb/create_database.sql (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/hsqldb/create_database.sql)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/hsqldb/create_database.sql	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/hsqldb/create_database.sql	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,10 @@
+
+CREATE TABLE message
+(
+  uuid VARCHAR NOT NULL,
+  type VARCHAR NOT NULL,
+  message VARCHAR NOT NULL,
+  delivered VARCHAR NOT NULL,
+  classification VARCHAR,
+  CONSTRAINT pk_uid PRIMARY KEY (uuid)
+);

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/hsqldb/drop_database.sql
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/hsqldb/drop_database.sql	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/hsqldb/drop_database.sql	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1 +0,0 @@
-DROP TABLE message IF EXISTS;

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/hsqldb/drop_database.sql (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/hsqldb/drop_database.sql)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/hsqldb/drop_database.sql	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/hsqldb/drop_database.sql	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1 @@
+DROP TABLE message IF EXISTS;

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/mysql (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/mysql)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/mysql/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/mysql/create_database.sql	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/mysql/create_database.sql	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,15 +0,0 @@
-CREATE DATABASE jbossesb;
-
-GRANT ALL PRIVILEGES ON jbossesb.* TO 'jbossesb' IDENTIFIED BY 'jbossesb';
-
-USE jbossesb;
-
-CREATE TABLE message
-(
-  uuid varchar(128) NOT NULL,
-  type varchar(128) NOT NULL,
-  message text(4000) NOT NULL,
-  delivered varchar(10) NOT NULL,
-  classification varchar(10),
-  PRIMARY KEY  (`uuid`)
-);

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/mysql/create_database.sql (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/mysql/create_database.sql)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/mysql/create_database.sql	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/mysql/create_database.sql	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,15 @@
+CREATE DATABASE jbossesb;
+
+GRANT ALL PRIVILEGES ON jbossesb.* TO 'jbossesb' IDENTIFIED BY 'jbossesb';
+
+USE jbossesb;
+
+CREATE TABLE message
+(
+  uuid varchar(128) NOT NULL,
+  type varchar(128) NOT NULL,
+  message text(4000) NOT NULL,
+  delivered varchar(10) NOT NULL,
+  classification varchar(10),
+  PRIMARY KEY  (`uuid`)
+);

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/postgresql (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/postgresql)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/postgresql/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/postgresql/create_database.sql	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/postgresql/create_database.sql	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,19 +0,0 @@
--- Database: jbossesb
-
--- DROP DATABASE jbossesb;
-
-CREATE DATABASE jbossesb
-WITH OWNER = postgres
-ENCODING = 'SQL_ASCII'
-TABLESPACE = pg_default;
-
-
-CREATE TABLE message
-(
-  uuid text NOT NULL,
-  "type" text NOT NULL,
-  message text NOT NULL,
-  delivered text NOT NULL,
-  classification text,
-  CONSTRAINT pk_uid PRIMARY KEY (uuid)
-);

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/postgresql/create_database.sql (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/postgresql/create_database.sql)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/postgresql/create_database.sql	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/main/resources/message-store-sql/postgresql/create_database.sql	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,19 @@
+-- Database: jbossesb
+
+-- DROP DATABASE jbossesb;
+
+CREATE DATABASE jbossesb
+WITH OWNER = postgres
+ENCODING = 'SQL_ASCII'
+TABLESPACE = pg_default;
+
+
+CREATE TABLE message
+(
+  uuid text NOT NULL,
+  "type" text NOT NULL,
+  message text NOT NULL,
+  delivered text NOT NULL,
+  classification text,
+  CONSTRAINT pk_uid PRIMARY KEY (uuid)
+);

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/MessagePersisterTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/MessagePersisterTest.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/MessagePersisterTest.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,161 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.soa.esb.esb.persistence.actions;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.InputStream;
-import java.net.URI;
-import java.sql.Connection;
-import java.sql.Statement;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.Map;
-
-import junit.framework.JUnit4TestAdapter;
-
-import org.apache.log4j.xml.DOMConfigurator;
-import org.jboss.internal.soa.esb.persistence.format.MessageStoreFactory;
-import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
-import org.jboss.soa.esb.actions.MessagePersister;
-import org.jboss.soa.esb.common.Configuration;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.persistence.manager.ConnectionManagerFactory;
-import org.jboss.soa.esb.services.persistence.MessageStore;
-import org.jboss.soa.esb.testutils.HsqldbUtil;
-import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
-import org.jboss.soa.esb.util.ClassUtil;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Testing the MessagePersister.
- * 
- * @author <a href="mailto:kurt.stam at redhat.com">Kurt Stam</a>
- * 
- */
-public class MessagePersisterTest
-{
-	/**
-	 * Testing the MessagePersister.
-	 */
-	@Test
-	public void sendMessage()
-	{
-		try
-		{
-            Date now = new Date();
-            String body = "<message>First Message " + now + " </message>";
-            Message msg = MessageFactory.getInstance().getMessage();
-            msg.getBody().setByteArray(body.getBytes());
-            
-           
-            InputStream inputStream = ClassUtil.getResourceAsStream("MessagePersisterTest.xml", this.getClass());
-            ConfigTree config = ConfigTree.fromInputStream(inputStream);
-
-            MessagePersister persister = new MessagePersister(config);
-            persister.initialise();
-            persister.process(msg);
-            
-             //now we can check the messageStore to see if our message made it in there.
-            System.out.println("Reading the messages in the messageStore");
-            
-            MessageStore store = MessageStoreFactory.getInstance().getMessageStore();
-            Map<URI, Message> messages = store.getAllMessages("TEST");
-            messages = store.getAllMessages("TEST");
-            Iterator<Message> iter=messages.values().iterator();
-            while (iter.hasNext()) {
-                Message message=iter.next();
-                String bodyFromStore = new String(message.getBody().getByteArray());
-                System.out.println("Body=" + bodyFromStore);
-            }
-            System.out.println("Getting message for classification TEST:" + messages);
-            assertEquals(1, messages.size());
-            
-            //Now check if it is the same message
-            Message message=messages.values().iterator().next();
-            String bodyFromStore = new String(message.getBody().getByteArray());
-            assertEquals(body, bodyFromStore);
-		}
-		catch (Exception re)
-		{
-			re.printStackTrace();
-			assertTrue(false);
-		}
-	}
-
-
-	public static junit.framework.Test suite()
-	{
-		return new JUnit4TestAdapter(MessagePersisterTest.class);
-	}
-    
-    @BeforeClass
-    public static void runBeforeAllTests()
-    {
-        try {
-            File testResourceDir = TestEnvironmentUtil.findResourceDirectory("./product/services/jbossesb/src/test/resources/");
-            System.out.println("Current dir=" + testResourceDir.getCanonicalPath());
-            DOMConfigurator.configure(testResourceDir.getCanonicalPath() + "/log4j.xml");
-            File buildDir = TestEnvironmentUtil.findResourceDirectory("./product/services/jbossesb/build/");
-            File resourceDir = TestEnvironmentUtil.findResourceDirectory("./product/services/jbossesb/src/main/resources/");
-            System.setProperty("org.jboss.soa.esb.propertyFile", "jbossesb-unittest-properties.xml");                    
-            if ("org.hsqldb.jdbcDriver".equals(Configuration.getStoreDriver())) {
-                HsqldbUtil.startHsqldb(buildDir + "/hsqltestdb", "jbossesb");
-                
-                //Drop what is there now, if exists. We want to start fresh.                
-                String sqlCreateCmd    = TestEnvironmentUtil.readTextFile(new File(resourceDir.getCanonicalPath() + "/message-store-sql/hsqldb/create_database.sql"));
-                String sqlDropCmd      = TestEnvironmentUtil.readTextFile(new File(resourceDir.getAbsolutePath() + "/message-store-sql/hsqldb/drop_database.sql"));
-                
-                ConnectionManager mgr = ConnectionManagerFactory.getConnectionManager();
-                mgr.init();
-                Connection con = mgr.getConnection();
-                Statement stmnt = con.createStatement();
-                System.out.println("Dropping the schema if exist");
-                stmnt.execute(sqlDropCmd);
-                System.out.println("Creating the message store schema");
-                stmnt.execute(sqlCreateCmd);
-            }
-        } catch (Throwable e) {
-            e.printStackTrace();
-            System.out.println("We should stop testing, since we don't have a db.");
-            assertTrue(false);
-        }
-        
-    }
-    
-    @AfterClass
-    public static void runAfterAllTests() throws Exception{
-        Thread.sleep(2000);
-        if (Configuration.getStoreDriver().equals("org.hsqldb.jdbcDriver")) {
-            HsqldbUtil.stopHsqldb(Configuration.getStoreUrl(),
-                    Configuration.getStoreUser(),Configuration.getStorePwd() );
-        }
-    }
-
-}

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/MessagePersisterTest.java (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/MessagePersisterTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/MessagePersisterTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/MessagePersisterTest.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,161 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.esb.persistence.actions;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.InputStream;
+import java.net.URI;
+import java.sql.Connection;
+import java.sql.Statement;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.Map;
+
+import junit.framework.JUnit4TestAdapter;
+
+import org.apache.log4j.xml.DOMConfigurator;
+import org.jboss.internal.soa.esb.persistence.format.MessageStoreFactory;
+import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
+import org.jboss.soa.esb.actions.MessagePersister;
+import org.jboss.soa.esb.common.Configuration;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.persistence.manager.ConnectionManagerFactory;
+import org.jboss.soa.esb.services.persistence.MessageStore;
+import org.jboss.soa.esb.testutils.HsqldbUtil;
+import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
+import org.jboss.soa.esb.util.ClassUtil;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * Testing the MessagePersister.
+ * 
+ * @author <a href="mailto:kurt.stam at redhat.com">Kurt Stam</a>
+ * 
+ */
+public class MessagePersisterTest
+{
+	/**
+	 * Testing the MessagePersister.
+	 */
+	@Test
+	public void sendMessage()
+	{
+		try
+		{
+            Date now = new Date();
+            String body = "<message>First Message " + now + " </message>";
+            Message msg = MessageFactory.getInstance().getMessage();
+            msg.getBody().setByteArray(body.getBytes());
+            
+           
+            InputStream inputStream = ClassUtil.getResourceAsStream("MessagePersisterTest.xml", this.getClass());
+            ConfigTree config = ConfigTree.fromInputStream(inputStream);
+
+            MessagePersister persister = new MessagePersister(config);
+            persister.initialise();
+            persister.process(msg);
+            
+             //now we can check the messageStore to see if our message made it in there.
+            System.out.println("Reading the messages in the messageStore");
+            
+            MessageStore store = MessageStoreFactory.getInstance().getMessageStore();
+            Map<URI, Message> messages = store.getAllMessages("TEST");
+            messages = store.getAllMessages("TEST");
+            Iterator<Message> iter=messages.values().iterator();
+            while (iter.hasNext()) {
+                Message message=iter.next();
+                String bodyFromStore = new String(message.getBody().getByteArray());
+                System.out.println("Body=" + bodyFromStore);
+            }
+            System.out.println("Getting message for classification TEST:" + messages);
+            assertEquals(1, messages.size());
+            
+            //Now check if it is the same message
+            Message message=messages.values().iterator().next();
+            String bodyFromStore = new String(message.getBody().getByteArray());
+            assertEquals(body, bodyFromStore);
+		}
+		catch (Exception re)
+		{
+			re.printStackTrace();
+			assertTrue(false);
+		}
+	}
+
+
+	public static junit.framework.Test suite()
+	{
+		return new JUnit4TestAdapter(MessagePersisterTest.class);
+	}
+    
+    @BeforeClass
+    public static void runBeforeAllTests()
+    {
+        try {
+            File testResourceDir = TestEnvironmentUtil.findResourceDirectory("./product/services/jbossesb/src/test/resources/");
+            System.out.println("Current dir=" + testResourceDir.getCanonicalPath());
+            DOMConfigurator.configure(testResourceDir.getCanonicalPath() + "/log4j.xml");
+            File buildDir = TestEnvironmentUtil.findResourceDirectory("./product/services/jbossesb/build/");
+            File resourceDir = TestEnvironmentUtil.findResourceDirectory("./product/services/jbossesb/src/main/resources/");
+            System.setProperty("org.jboss.soa.esb.propertyFile", "jbossesb-unittest-properties.xml");                    
+            if ("org.hsqldb.jdbcDriver".equals(Configuration.getStoreDriver())) {
+                HsqldbUtil.startHsqldb(buildDir + "/hsqltestdb", "jbossesb");
+                
+                //Drop what is there now, if exists. We want to start fresh.                
+                String sqlCreateCmd    = TestEnvironmentUtil.readTextFile(new File(resourceDir.getCanonicalPath() + "/message-store-sql/hsqldb/create_database.sql"));
+                String sqlDropCmd      = TestEnvironmentUtil.readTextFile(new File(resourceDir.getAbsolutePath() + "/message-store-sql/hsqldb/drop_database.sql"));
+                
+                ConnectionManager mgr = ConnectionManagerFactory.getConnectionManager();
+                mgr.init();
+                Connection con = mgr.getConnection();
+                Statement stmnt = con.createStatement();
+                System.out.println("Dropping the schema if exist");
+                stmnt.execute(sqlDropCmd);
+                System.out.println("Creating the message store schema");
+                stmnt.execute(sqlCreateCmd);
+            }
+        } catch (Throwable e) {
+            e.printStackTrace();
+            System.out.println("We should stop testing, since we don't have a db.");
+            assertTrue(false);
+        }
+        
+    }
+    
+    @AfterClass
+    public static void runAfterAllTests() throws Exception{
+        Thread.sleep(2000);
+        if (Configuration.getStoreDriver().equals("org.hsqldb.jdbcDriver")) {
+            HsqldbUtil.stopHsqldb(Configuration.getStoreUrl(),
+                    Configuration.getStoreUser(),Configuration.getStorePwd() );
+        }
+    }
+
+}

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/MessagePersisterTest.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/MessagePersisterTest.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/MessagePersisterTest.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,6 +0,0 @@
-<action 
-    name="PersistAction" 
-	class="org.jboss.soa.esb.actions.MessagePersister" 
-	classfication="TEST" 
-	message-store-class="org.jboss.internal.soa.esb.persistence.format.db.DBMessageStoreImpl"/>
-

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/MessagePersisterTest.xml (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/MessagePersisterTest.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/MessagePersisterTest.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/MessagePersisterTest.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,6 @@
+<action 
+    name="PersistAction" 
+	class="org.jboss.soa.esb.actions.MessagePersister" 
+	classfication="TEST" 
+	message-store-class="org.jboss.internal.soa.esb.persistence.format.db.DBMessageStoreImpl"/>
+

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/tests (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/tests)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,298 +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 daniel.brum at jboss.com
- */
-
-package org.jboss.soa.esb.esb.persistence.tests;
-
-/**
- * @author dbrum
- * 
- * 
- */
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.net.URI;
-import java.sql.Connection;
-import java.sql.Statement;
-import java.util.Map;
-
-import junit.framework.JUnit4TestAdapter;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.xml.DOMConfigurator;
-import org.jboss.internal.soa.esb.persistence.format.MessageStoreFactory;
-import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
-import org.jboss.soa.esb.common.Configuration;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.message.format.MessageType;
-import org.jboss.soa.esb.persistence.manager.ConnectionManagerException;
-import org.jboss.soa.esb.persistence.manager.ConnectionManagerFactory;
-import org.jboss.soa.esb.services.persistence.MessageStore;
-import org.jboss.soa.esb.testutils.HsqldbUtil;
-import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class MessageStoreUnitTest
-{
-
-	private static Logger log = Logger.getLogger(MessageStoreUnitTest.class);
-	
-    @Test
-	public void testDefaultMessageStore ()
-	{
-		MessageStore store = MessageStoreFactory.getInstance().getMessageStore();
-		assertEquals((store != null), true);
-	}
-
-    @Test
-	public void testURIMessageStore ()
-	{
-		// only DB supported for now
-		MessageStore store1 = MessageStoreFactory.getInstance().getMessageStore();
-		assertEquals((store1 != null), true);
-	}
-	
-    @Test
-	public void testSettingUndeliverable () throws Exception
-	{
-		//test setting one message to undelivered status
-//		 add new messages
-		Message msg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
-		assertEquals((msg != null), true);
-		
-		MessageStore store = MessageStoreFactory.getInstance().getMessageStore();
-		assertEquals((store != null), true);
-		
-		URI uid = store.addMessage(msg, MessageStore.DEFAULT_CLASSIFICATION);
-		store.setUndelivered(uid);
-
-	}
-	
-    @Test
-	public void testSettingDeliverable() throws Exception
-	{
-		//test setting one message to delivered status
-//		 add new messages
-		Message msg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
-		assertEquals((msg != null), true);
-		
-		MessageStore store = MessageStoreFactory.getInstance().getMessageStore();
-		assertEquals((store != null), true);
-		
-		URI uid = store.addMessage(msg,MessageStore.DEFAULT_CLASSIFICATION);
-		store.setDelivered(uid);
-
-	}
-	
-    @Test
-	public void testManyUndeliveredMessages() throws Exception {
-		Message msg1, msg2, msg3, msg4;
-		msg1 = MessageFactory.getInstance().getMessage(
-				MessageType.JBOSS_XML);
-		msg2 = MessageFactory.getInstance().getMessage(
-				MessageType.JAVA_SERIALIZED);
-		msg3 = MessageFactory.getInstance().getMessage(
-				MessageType.JBOSS_XML);
-		msg4 = MessageFactory.getInstance().getMessage(
-				MessageType.JAVA_SERIALIZED);
-		
-		assertEquals((msg1 != null), true);
-		assertEquals((msg2 != null), true);
-		assertEquals((msg3 != null), true);
-		assertEquals((msg4 != null), true);
-
-
-		MessageStore store = MessageStoreFactory.getInstance().getMessageStore();
-		assertEquals((store != null), true);
-		
-		URI uid1 = store.addMessage(msg1,MessageStore.DEFAULT_CLASSIFICATION);
-		URI uid2 = store.addMessage(msg2,MessageStore.DEFAULT_CLASSIFICATION);
-		URI uid3 = store.addMessage(msg3,MessageStore.DEFAULT_CLASSIFICATION);
-		URI uid4 = store.addMessage(msg4,MessageStore.DEFAULT_CLASSIFICATION);
-		
-		store.setUndelivered(uid1);
-		store.setUndelivered(uid2);
-		store.setUndelivered(uid3);
-		store.setUndelivered(uid4);
-		
-		Map<URI, Message> messages = store.getUndeliveredMessages(MessageStore.DEFAULT_CLASSIFICATION);
-		assertEquals((messages != null), true);
-
-	}
-
-    @Test
-	public void testStoreAndRetrieve () throws Exception
-	{
-		// add new messages
-		Message msg1 = MessageFactory.getInstance().getMessage(
-				MessageType.JBOSS_XML);
-		Message msg2 = MessageFactory.getInstance().getMessage(
-				MessageType.JAVA_SERIALIZED);
-		assertEquals((msg1 != null), true);
-		assertEquals((msg2 != null), true);
-
-		MessageStore store = MessageStoreFactory.getInstance().getMessageStore();
-		assertEquals((store != null), true);
-
-		// set some properties inside the Message
-		msg1.getProperties().setProperty("prop1", "val1");
-		msg2.getProperties().setProperty("prop1", "val1");
-		msg1.getProperties().setProperty("prop2", "val2");
-		msg2.getProperties().setProperty("prop2", "val2");
-
-		// set the body inside the Message
-		msg1.getBody().setByteArray(("TEST BODY").getBytes());
-		msg2.getBody().setByteArray(("TEST BODY").getBytes());
-
-		// set some object attachments inside the Message
-		msg1.getAttachment().addItem(new String("TEST ATTACHMENT1"));
-		msg1.getAttachment().addItem(new String("TEST ATTACHMENT2"));
-		msg2.getAttachment().addItem(new String("TEST ATTACHMENT1"));
-		msg2.getAttachment().addItem(new String("TEST ATTACHMENT2"));
-
-		// keep track of the UID to use in retrieving the Message
-		URI uid1 = null;
-		uid1 = store.addMessage(msg1, MessageStore.DEFAULT_CLASSIFICATION);
-//		System.out.println(uid1);
-		assertEquals((uid1 != null), true);
-
-		URI uid2 = null;
-		uid2 = store.addMessage(msg2,MessageStore.DEFAULT_CLASSIFICATION);
-//		System.out.println(uid2);
-		assertEquals((uid2 != null), true);
-
-		// now retrieve the messages
-		try
-		{
-			Message msgIn1 = store.getMessage(uid1);
-			assertEquals((msgIn1 != null), true);
-
-			Message msgIn2 = store.getMessage(uid2);
-			assertEquals((msgIn2 != null), true);
-		}
-		catch (Exception e)
-		{
-			log.error( e );
-		}
-	}
-
-    @Test
-	public void testDBConnectionManager ()
-	{
-		MessageStore store = MessageStoreFactory.getInstance().getMessageStore();
-		assertEquals((store != null), true);
-		ConnectionManager mgr=null;
-		try {
-			mgr = ConnectionManagerFactory.getConnectionManager();
-		} catch (ConnectionManagerException e) {
-			// TODO Auto-generated catch block
-//			e.printStackTrace();
-		}
-		assertEquals((mgr != null), true);
-	}
-
-    @BeforeClass
-    public static void runBeforeAllTests()
-    {
-        try {
-            File testResourceDir = TestEnvironmentUtil.findResourceDirectory("./product/services/jbossesb/src/test/resources/");
-            System.out.println("Current dir=" + testResourceDir.getCanonicalPath());
-            DOMConfigurator.configure(testResourceDir.getCanonicalPath() + "/log4j.xml");
-            File buildDir = TestEnvironmentUtil.findResourceDirectory("./product/services/jbossesb/build/");
-            File resourceDir = TestEnvironmentUtil.findResourceDirectory("./product/services/jbossesb/src/main/resources/");
-            System.setProperty("org.jboss.soa.esb.propertyFile", "jbossesb-unittest-properties.xml");                    
-            if ("org.hsqldb.jdbcDriver".equals(Configuration.getStoreDriver())) {
-                HsqldbUtil.startHsqldb(buildDir + "/hsqltestdb", "jbossesb");
-                
-                //Drop what is there now, if exists. We want to start fresh.                
-                String sqlCreateCmd    = TestEnvironmentUtil.readTextFile(new File(resourceDir.getCanonicalPath() + "/message-store-sql/hsqldb/create_database.sql"));
-                String sqlDropCmd      = TestEnvironmentUtil.readTextFile(new File(resourceDir.getAbsolutePath() + "/message-store-sql/hsqldb/drop_database.sql"));
-                
-                ConnectionManager mgr = ConnectionManagerFactory.getConnectionManager();
-                mgr.init();
-                Connection con = mgr.getConnection();
-                Statement stmnt = con.createStatement();
-                System.out.println("Dropping the schema if exist");
-                stmnt.execute(sqlDropCmd);
-                System.out.println("Creating the message store schema");
-                stmnt.execute(sqlCreateCmd);
-            }
-        } catch (Throwable e) {
-            e.printStackTrace();
-            System.out.println("We should stop testing, since we don't have a db.");
-            assertTrue(false);
-        }
-        
-    }
-	@AfterClass
-	public static void runAfterAllTests ()
-	{
-        
-		try
-		{
-			if (Configuration.getStoreDriver().equals("org.hsqldb.jdbcDriver"))
-				HsqldbUtil.stopHsqldb(Configuration.getStoreUrl(),
-						Configuration.getStoreUser(), Configuration
-								.getStorePwd());
-		}
-		catch (Exception e)
-		{ // 
-			log.error( e );
-		}
-	}
-
-	/**
-	 * Read the file into a String.
-	 * 
-	 * @param file -
-	 *            the file to be read
-	 * @return String with the content of the file
-	 * @throws IOException -
-	 *             when we can't read the file
-	 */
-	public static String readTextFile (File file) throws IOException
-	{
-		StringBuffer sb = new StringBuffer(1024);
-		BufferedReader reader = new BufferedReader(new FileReader(file
-				.getPath()));
-		char[] chars = new char[1];
-		while ((reader.read(chars)) > -1)
-		{
-			sb.append(String.valueOf(chars));
-			chars = new char[1];
-		}
-		reader.close();
-		return sb.toString();
-	}
-
-	public static junit.framework.Test suite ()
-	{
-		return new JUnit4TestAdapter(MessageStoreUnitTest.class);
-	}
-
-}

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,298 @@
+/*
+ * 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 daniel.brum at jboss.com
+ */
+
+package org.jboss.soa.esb.esb.persistence.tests;
+
+/**
+ * @author dbrum
+ * 
+ * 
+ */
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.net.URI;
+import java.sql.Connection;
+import java.sql.Statement;
+import java.util.Map;
+
+import junit.framework.JUnit4TestAdapter;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.xml.DOMConfigurator;
+import org.jboss.internal.soa.esb.persistence.format.MessageStoreFactory;
+import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
+import org.jboss.soa.esb.common.Configuration;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.persistence.manager.ConnectionManagerException;
+import org.jboss.soa.esb.persistence.manager.ConnectionManagerFactory;
+import org.jboss.soa.esb.services.persistence.MessageStore;
+import org.jboss.soa.esb.testutils.HsqldbUtil;
+import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class MessageStoreUnitTest
+{
+
+	private static Logger log = Logger.getLogger(MessageStoreUnitTest.class);
+	
+    @Test
+	public void testDefaultMessageStore ()
+	{
+		MessageStore store = MessageStoreFactory.getInstance().getMessageStore();
+		assertEquals((store != null), true);
+	}
+
+    @Test
+	public void testURIMessageStore ()
+	{
+		// only DB supported for now
+		MessageStore store1 = MessageStoreFactory.getInstance().getMessageStore();
+		assertEquals((store1 != null), true);
+	}
+	
+    @Test
+	public void testSettingUndeliverable () throws Exception
+	{
+		//test setting one message to undelivered status
+//		 add new messages
+		Message msg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
+		assertEquals((msg != null), true);
+		
+		MessageStore store = MessageStoreFactory.getInstance().getMessageStore();
+		assertEquals((store != null), true);
+		
+		URI uid = store.addMessage(msg, MessageStore.DEFAULT_CLASSIFICATION);
+		store.setUndelivered(uid);
+
+	}
+	
+    @Test
+	public void testSettingDeliverable() throws Exception
+	{
+		//test setting one message to delivered status
+//		 add new messages
+		Message msg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
+		assertEquals((msg != null), true);
+		
+		MessageStore store = MessageStoreFactory.getInstance().getMessageStore();
+		assertEquals((store != null), true);
+		
+		URI uid = store.addMessage(msg,MessageStore.DEFAULT_CLASSIFICATION);
+		store.setDelivered(uid);
+
+	}
+	
+    @Test
+	public void testManyUndeliveredMessages() throws Exception {
+		Message msg1, msg2, msg3, msg4;
+		msg1 = MessageFactory.getInstance().getMessage(
+				MessageType.JBOSS_XML);
+		msg2 = MessageFactory.getInstance().getMessage(
+				MessageType.JAVA_SERIALIZED);
+		msg3 = MessageFactory.getInstance().getMessage(
+				MessageType.JBOSS_XML);
+		msg4 = MessageFactory.getInstance().getMessage(
+				MessageType.JAVA_SERIALIZED);
+		
+		assertEquals((msg1 != null), true);
+		assertEquals((msg2 != null), true);
+		assertEquals((msg3 != null), true);
+		assertEquals((msg4 != null), true);
+
+
+		MessageStore store = MessageStoreFactory.getInstance().getMessageStore();
+		assertEquals((store != null), true);
+		
+		URI uid1 = store.addMessage(msg1,MessageStore.DEFAULT_CLASSIFICATION);
+		URI uid2 = store.addMessage(msg2,MessageStore.DEFAULT_CLASSIFICATION);
+		URI uid3 = store.addMessage(msg3,MessageStore.DEFAULT_CLASSIFICATION);
+		URI uid4 = store.addMessage(msg4,MessageStore.DEFAULT_CLASSIFICATION);
+		
+		store.setUndelivered(uid1);
+		store.setUndelivered(uid2);
+		store.setUndelivered(uid3);
+		store.setUndelivered(uid4);
+		
+		Map<URI, Message> messages = store.getUndeliveredMessages(MessageStore.DEFAULT_CLASSIFICATION);
+		assertEquals((messages != null), true);
+
+	}
+
+    @Test
+	public void testStoreAndRetrieve () throws Exception
+	{
+		// add new messages
+		Message msg1 = MessageFactory.getInstance().getMessage(
+				MessageType.JBOSS_XML);
+		Message msg2 = MessageFactory.getInstance().getMessage(
+				MessageType.JAVA_SERIALIZED);
+		assertEquals((msg1 != null), true);
+		assertEquals((msg2 != null), true);
+
+		MessageStore store = MessageStoreFactory.getInstance().getMessageStore();
+		assertEquals((store != null), true);
+
+		// set some properties inside the Message
+		msg1.getProperties().setProperty("prop1", "val1");
+		msg2.getProperties().setProperty("prop1", "val1");
+		msg1.getProperties().setProperty("prop2", "val2");
+		msg2.getProperties().setProperty("prop2", "val2");
+
+		// set the body inside the Message
+		msg1.getBody().setByteArray(("TEST BODY").getBytes());
+		msg2.getBody().setByteArray(("TEST BODY").getBytes());
+
+		// set some object attachments inside the Message
+		msg1.getAttachment().addItem(new String("TEST ATTACHMENT1"));
+		msg1.getAttachment().addItem(new String("TEST ATTACHMENT2"));
+		msg2.getAttachment().addItem(new String("TEST ATTACHMENT1"));
+		msg2.getAttachment().addItem(new String("TEST ATTACHMENT2"));
+
+		// keep track of the UID to use in retrieving the Message
+		URI uid1 = null;
+		uid1 = store.addMessage(msg1, MessageStore.DEFAULT_CLASSIFICATION);
+//		System.out.println(uid1);
+		assertEquals((uid1 != null), true);
+
+		URI uid2 = null;
+		uid2 = store.addMessage(msg2,MessageStore.DEFAULT_CLASSIFICATION);
+//		System.out.println(uid2);
+		assertEquals((uid2 != null), true);
+
+		// now retrieve the messages
+		try
+		{
+			Message msgIn1 = store.getMessage(uid1);
+			assertEquals((msgIn1 != null), true);
+
+			Message msgIn2 = store.getMessage(uid2);
+			assertEquals((msgIn2 != null), true);
+		}
+		catch (Exception e)
+		{
+			log.error( e );
+		}
+	}
+
+    @Test
+	public void testDBConnectionManager ()
+	{
+		MessageStore store = MessageStoreFactory.getInstance().getMessageStore();
+		assertEquals((store != null), true);
+		ConnectionManager mgr=null;
+		try {
+			mgr = ConnectionManagerFactory.getConnectionManager();
+		} catch (ConnectionManagerException e) {
+			// TODO Auto-generated catch block
+//			e.printStackTrace();
+		}
+		assertEquals((mgr != null), true);
+	}
+
+    @BeforeClass
+    public static void runBeforeAllTests()
+    {
+        try {
+            File testResourceDir = TestEnvironmentUtil.findResourceDirectory("./product/services/jbossesb/src/test/resources/");
+            System.out.println("Current dir=" + testResourceDir.getCanonicalPath());
+            DOMConfigurator.configure(testResourceDir.getCanonicalPath() + "/log4j.xml");
+            File buildDir = TestEnvironmentUtil.findResourceDirectory("./product/services/jbossesb/build/");
+            File resourceDir = TestEnvironmentUtil.findResourceDirectory("./product/services/jbossesb/src/main/resources/");
+            System.setProperty("org.jboss.soa.esb.propertyFile", "jbossesb-unittest-properties.xml");                    
+            if ("org.hsqldb.jdbcDriver".equals(Configuration.getStoreDriver())) {
+                HsqldbUtil.startHsqldb(buildDir + "/hsqltestdb", "jbossesb");
+                
+                //Drop what is there now, if exists. We want to start fresh.                
+                String sqlCreateCmd    = TestEnvironmentUtil.readTextFile(new File(resourceDir.getCanonicalPath() + "/message-store-sql/hsqldb/create_database.sql"));
+                String sqlDropCmd      = TestEnvironmentUtil.readTextFile(new File(resourceDir.getAbsolutePath() + "/message-store-sql/hsqldb/drop_database.sql"));
+                
+                ConnectionManager mgr = ConnectionManagerFactory.getConnectionManager();
+                mgr.init();
+                Connection con = mgr.getConnection();
+                Statement stmnt = con.createStatement();
+                System.out.println("Dropping the schema if exist");
+                stmnt.execute(sqlDropCmd);
+                System.out.println("Creating the message store schema");
+                stmnt.execute(sqlCreateCmd);
+            }
+        } catch (Throwable e) {
+            e.printStackTrace();
+            System.out.println("We should stop testing, since we don't have a db.");
+            assertTrue(false);
+        }
+        
+    }
+	@AfterClass
+	public static void runAfterAllTests ()
+	{
+        
+		try
+		{
+			if (Configuration.getStoreDriver().equals("org.hsqldb.jdbcDriver"))
+				HsqldbUtil.stopHsqldb(Configuration.getStoreUrl(),
+						Configuration.getStoreUser(), Configuration
+								.getStorePwd());
+		}
+		catch (Exception e)
+		{ // 
+			log.error( e );
+		}
+	}
+
+	/**
+	 * Read the file into a String.
+	 * 
+	 * @param file -
+	 *            the file to be read
+	 * @return String with the content of the file
+	 * @throws IOException -
+	 *             when we can't read the file
+	 */
+	public static String readTextFile (File file) throws IOException
+	{
+		StringBuffer sb = new StringBuffer(1024);
+		BufferedReader reader = new BufferedReader(new FileReader(file
+				.getPath()));
+		char[] chars = new char[1];
+		while ((reader.read(chars)) > -1)
+		{
+			sb.append(String.valueOf(chars));
+			chars = new char[1];
+		}
+		reader.close();
+		return sb.toString();
+	}
+
+	public static junit.framework.Test suite ()
+	{
+		return new JUnit4TestAdapter(MessageStoreUnitTest.class);
+	}
+
+}

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/MessageStoreClient.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/MessageStoreClient.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/MessageStoreClient.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -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 daniel.brum at jboss.com
- */
-
-package org.jboss.soa.esb.messagestore;
-
-import java.net.URI;
-import java.util.Random;
-import java.util.Vector;
-
-import org.apache.log4j.Logger;
-import org.jboss.internal.soa.esb.persistence.format.MessageStoreFactory;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.message.format.MessageType;
-import org.jboss.soa.esb.services.persistence.MessageStore;
-
-/**
- * @author dbrum
- * 
- */
-public class MessageStoreClient implements Runnable
-{
-
-	private static Logger logger = Logger.getLogger(MessageStoreTest.class);
-
-	public void run ()
-	{
-		long startTime = System.currentTimeMillis();
-
-		int requestors = 1000; // number of persist calls to make
-		Vector<URI> writeList = new Vector<URI>();
-
-		// get the database store
-		MessageStore store = MessageStoreFactory.getInstance().getMessageStore();
-
-		// messages to persist
-		Message msg[] = { MessageFactory.getInstance().getMessage(
-				MessageType.JBOSS_XML), MessageFactory.getInstance()
-				.getMessage(MessageType.JAVA_SERIALIZED) };
-
-		// set some content inside the Messages
-		for (int x = 0; x < msg.length; x++)
-		{
-			msg[x].getBody().setByteArray("TEST BODY".getBytes());
-			msg[x].getProperties().setProperty("prop" + x, "val" + x);
-			msg[x].getAttachment().addItem(new String("TEST ATTACHMENT"));
-		}
-
-		// loop through adding the messages
-
-		Random rndMsg = new Random();
-		for (int x = 0; x <= requestors; x++)
-		{
-			try
-			{
-				URI uid = store.addMessage(msg[rndMsg.nextInt(2)], MessageStore.DEFAULT_CLASSIFICATION);
-				if (uid != null) writeList.add(uid);
-				else
-					System.err
-							.println("null was found... not adding uid to list...");
-			}
-			catch (Exception ex)
-			{
-				logger.error("Adding message failed.", ex);
-			}
-		}
-
-		logger
-				.info("total messages persisted to db: " + (writeList.size() - 1));
-
-		// loop back reading the messages from the db
-		Vector<Message> readList = new Vector<Message>();
-		for (int x = 0; x < writeList.size(); x++)
-		{
-			try
-			{
-				readList.add(store.getMessage(writeList.get(x)));
-			}
-			catch (Exception e)
-			{
-				logger.error(e);
-			}
-		}
-		logger.info("total messages read from db: " + (readList.size() - 1));
-		logger.info("time to finish write/read for this client: " + (System
-				.currentTimeMillis() - startTime) + " milliseconds.");
-
-	}
-}

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/MessageStoreClient.java (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/MessageStoreClient.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/MessageStoreClient.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/MessageStoreClient.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -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 daniel.brum at jboss.com
+ */
+
+package org.jboss.soa.esb.messagestore;
+
+import java.net.URI;
+import java.util.Random;
+import java.util.Vector;
+
+import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.persistence.format.MessageStoreFactory;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.services.persistence.MessageStore;
+
+/**
+ * @author dbrum
+ * 
+ */
+public class MessageStoreClient implements Runnable
+{
+
+	private static Logger logger = Logger.getLogger(MessageStoreTest.class);
+
+	public void run ()
+	{
+		long startTime = System.currentTimeMillis();
+
+		int requestors = 1000; // number of persist calls to make
+		Vector<URI> writeList = new Vector<URI>();
+
+		// get the database store
+		MessageStore store = MessageStoreFactory.getInstance().getMessageStore();
+
+		// messages to persist
+		Message msg[] = { MessageFactory.getInstance().getMessage(
+				MessageType.JBOSS_XML), MessageFactory.getInstance()
+				.getMessage(MessageType.JAVA_SERIALIZED) };
+
+		// set some content inside the Messages
+		for (int x = 0; x < msg.length; x++)
+		{
+			msg[x].getBody().setByteArray("TEST BODY".getBytes());
+			msg[x].getProperties().setProperty("prop" + x, "val" + x);
+			msg[x].getAttachment().addItem(new String("TEST ATTACHMENT"));
+		}
+
+		// loop through adding the messages
+
+		Random rndMsg = new Random();
+		for (int x = 0; x <= requestors; x++)
+		{
+			try
+			{
+				URI uid = store.addMessage(msg[rndMsg.nextInt(2)], MessageStore.DEFAULT_CLASSIFICATION);
+				if (uid != null) writeList.add(uid);
+				else
+					System.err
+							.println("null was found... not adding uid to list...");
+			}
+			catch (Exception ex)
+			{
+				logger.error("Adding message failed.", ex);
+			}
+		}
+
+		logger
+				.info("total messages persisted to db: " + (writeList.size() - 1));
+
+		// loop back reading the messages from the db
+		Vector<Message> readList = new Vector<Message>();
+		for (int x = 0; x < writeList.size(); x++)
+		{
+			try
+			{
+				readList.add(store.getMessage(writeList.get(x)));
+			}
+			catch (Exception e)
+			{
+				logger.error(e);
+			}
+		}
+		logger.info("total messages read from db: " + (readList.size() - 1));
+		logger.info("time to finish write/read for this client: " + (System
+				.currentTimeMillis() - startTime) + " milliseconds.");
+
+	}
+}

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/MessageStoreTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/MessageStoreTest.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/MessageStoreTest.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,159 +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 daniel.brum at jboss.com
- */
-
-package org.jboss.soa.esb.messagestore;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.net.URI;
-import java.sql.Connection;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-import junit.framework.JUnit4TestAdapter;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.xml.DOMConfigurator;
-import org.jboss.internal.soa.esb.persistence.format.MessageStoreFactory;
-import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
-import org.jboss.soa.esb.common.Configuration;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.message.format.MessageType;
-import org.jboss.soa.esb.persistence.manager.ConnectionManagerFactory;
-import org.jboss.soa.esb.services.persistence.MessageStore;
-import org.jboss.soa.esb.testutils.HsqldbUtil;
-import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @author dbrum
- *
- */
-public class MessageStoreTest  {
-	private static Logger logger = Logger.getLogger(MessageStoreTest.class);
-
-    
-	@Test
-	public void testMultiClientLoad() throws Exception {
-		int clients = 5;
-		Thread[] xx = new Thread[clients];
-		for (int i=0; i<clients; i++) {
-			xx[i] = new Thread(new MessageStoreClient());
-		}
-		for (int i=0; i<clients; i++) {
-			xx[i].start();
-		}
-		//clean up the threads
-		for (int i=0; i<clients; i++) {
-			xx[i] = null;
-		}
-	}
-	
-	@Test
-	public void testSingleLoad() throws Exception {
-		long startTime=System.currentTimeMillis();
-		int requestors = 1000;	//number of persist calls to make
-		List<URI> uriList = new ArrayList<URI>();
-		//get the database store
-		MessageStore store = MessageStoreFactory.getInstance().getMessageStore();
-		//messages to persist
-		Message msg[] = { MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML), 
-						 MessageFactory.getInstance().getMessage(MessageType.JAVA_SERIALIZED)};		
-		//set some content inside the Messages
-		for (int x=0; x<msg.length; x++) {
-			msg[x].getBody().setByteArray("TEST BODY".getBytes());
-			msg[x].getProperties().setProperty("prop"+x, "val"+x);
-			msg[x].getAttachment().addItem(new String("TEST ATTACHMENT"));						
-		}
-		//loop through adding the messages
-		Random rndMsg = new Random();
-		for (int x=0; x<=requestors; x++) {
-			URI uid = store.addMessage(msg[rndMsg.nextInt(2)], MessageStore.DEFAULT_CLASSIFICATION);	
-			if (uid == null) 
-				System.out.println("null returned from addMessage() call to uid");
-			else
-				uriList.add(uid);
-		}
-		logger.info("total messages persisted to db: " + (uriList.size()-1));
-		//loop back reading the messages from the db
-		List<Message> messages = new ArrayList<Message>();
-		for (int x=0; x<uriList.size(); x++) {
-			messages.add(store.getMessage(uriList.get(x)));
-		}
-		logger.info("total messages read from db: " + (uriList.size()));
-		logger.info("time to finish write/read for this client: " + (System.currentTimeMillis() - startTime) + " milliseconds.");
-	}
-	
-    @BeforeClass
-    public static void runBeforeAllTests()
-    {
-        try {
-            File testResourceDir = TestEnvironmentUtil.findResourceDirectory("./product/services/jbossesb/src/test/resources/");
-            System.out.println("Current dir=" + testResourceDir.getCanonicalPath());
-            DOMConfigurator.configure(testResourceDir.getCanonicalPath() + "/log4j.xml");
-            File buildDir = TestEnvironmentUtil.findResourceDirectory("./product/services/jbossesb/build/");
-            File resourceDir = TestEnvironmentUtil.findResourceDirectory("./product/services/jbossesb/src/main/resources/");
-            System.setProperty("org.jboss.soa.esb.propertyFile", "jbossesb-unittest-properties.xml");                    
-            if ("org.hsqldb.jdbcDriver".equals(Configuration.getStoreDriver())) {
-                HsqldbUtil.startHsqldb(buildDir + "/hsqltestdb", "jbossesb");
-                
-                //Drop what is there now, if exists. We want to start fresh.                
-                String sqlCreateCmd    = TestEnvironmentUtil.readTextFile(new File(resourceDir.getCanonicalPath() + "/message-store-sql/hsqldb/create_database.sql"));
-                String sqlDropCmd      = TestEnvironmentUtil.readTextFile(new File(resourceDir.getAbsolutePath() + "/message-store-sql/hsqldb/drop_database.sql"));
-                
-                ConnectionManager mgr = ConnectionManagerFactory.getConnectionManager();
-                mgr.init();
-                Connection con = mgr.getConnection();
-                Statement stmnt = con.createStatement();
-                System.out.println("Dropping the schema if exist");
-                stmnt.execute(sqlDropCmd);
-                System.out.println("Creating the message store schema");
-                stmnt.execute(sqlCreateCmd);
-            }
-        } catch (Throwable e) {
-            e.printStackTrace();
-            System.out.println("We should stop testing, since we don't have a db.");
-            assertTrue(false);
-        }
-    }
-	
-	@AfterClass
-	public static void runAfterAllTests() throws Exception{
-		Thread.sleep(2000);
-        System.out.println("Stopping");
-		if (Configuration.getStoreDriver().equals("org.hsqldb.jdbcDriver")) {
-			HsqldbUtil.stopHsqldb(Configuration.getStoreUrl(),
-					Configuration.getStoreUser(),Configuration.getStorePwd() );
-		}
-	}
-	
-	public static junit.framework.Test suite() {
-		return new JUnit4TestAdapter(MessageStoreTest.class);
-	}
-	
-	
-}

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/MessageStoreTest.java (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/MessageStoreTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/MessageStoreTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/MessageStoreTest.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,159 @@
+/*
+ * 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 daniel.brum at jboss.com
+ */
+
+package org.jboss.soa.esb.messagestore;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.net.URI;
+import java.sql.Connection;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import junit.framework.JUnit4TestAdapter;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.xml.DOMConfigurator;
+import org.jboss.internal.soa.esb.persistence.format.MessageStoreFactory;
+import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
+import org.jboss.soa.esb.common.Configuration;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.persistence.manager.ConnectionManagerFactory;
+import org.jboss.soa.esb.services.persistence.MessageStore;
+import org.jboss.soa.esb.testutils.HsqldbUtil;
+import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * @author dbrum
+ *
+ */
+public class MessageStoreTest  {
+	private static Logger logger = Logger.getLogger(MessageStoreTest.class);
+
+    
+	@Test
+	public void testMultiClientLoad() throws Exception {
+		int clients = 5;
+		Thread[] xx = new Thread[clients];
+		for (int i=0; i<clients; i++) {
+			xx[i] = new Thread(new MessageStoreClient());
+		}
+		for (int i=0; i<clients; i++) {
+			xx[i].start();
+		}
+		//clean up the threads
+		for (int i=0; i<clients; i++) {
+			xx[i] = null;
+		}
+	}
+	
+	@Test
+	public void testSingleLoad() throws Exception {
+		long startTime=System.currentTimeMillis();
+		int requestors = 1000;	//number of persist calls to make
+		List<URI> uriList = new ArrayList<URI>();
+		//get the database store
+		MessageStore store = MessageStoreFactory.getInstance().getMessageStore();
+		//messages to persist
+		Message msg[] = { MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML), 
+						 MessageFactory.getInstance().getMessage(MessageType.JAVA_SERIALIZED)};		
+		//set some content inside the Messages
+		for (int x=0; x<msg.length; x++) {
+			msg[x].getBody().setByteArray("TEST BODY".getBytes());
+			msg[x].getProperties().setProperty("prop"+x, "val"+x);
+			msg[x].getAttachment().addItem(new String("TEST ATTACHMENT"));						
+		}
+		//loop through adding the messages
+		Random rndMsg = new Random();
+		for (int x=0; x<=requestors; x++) {
+			URI uid = store.addMessage(msg[rndMsg.nextInt(2)], MessageStore.DEFAULT_CLASSIFICATION);	
+			if (uid == null) 
+				System.out.println("null returned from addMessage() call to uid");
+			else
+				uriList.add(uid);
+		}
+		logger.info("total messages persisted to db: " + (uriList.size()-1));
+		//loop back reading the messages from the db
+		List<Message> messages = new ArrayList<Message>();
+		for (int x=0; x<uriList.size(); x++) {
+			messages.add(store.getMessage(uriList.get(x)));
+		}
+		logger.info("total messages read from db: " + (uriList.size()));
+		logger.info("time to finish write/read for this client: " + (System.currentTimeMillis() - startTime) + " milliseconds.");
+	}
+	
+    @BeforeClass
+    public static void runBeforeAllTests()
+    {
+        try {
+            File testResourceDir = TestEnvironmentUtil.findResourceDirectory("./product/services/jbossesb/src/test/resources/");
+            System.out.println("Current dir=" + testResourceDir.getCanonicalPath());
+            DOMConfigurator.configure(testResourceDir.getCanonicalPath() + "/log4j.xml");
+            File buildDir = TestEnvironmentUtil.findResourceDirectory("./product/services/jbossesb/build/");
+            File resourceDir = TestEnvironmentUtil.findResourceDirectory("./product/services/jbossesb/src/main/resources/");
+            System.setProperty("org.jboss.soa.esb.propertyFile", "jbossesb-unittest-properties.xml");                    
+            if ("org.hsqldb.jdbcDriver".equals(Configuration.getStoreDriver())) {
+                HsqldbUtil.startHsqldb(buildDir + "/hsqltestdb", "jbossesb");
+                
+                //Drop what is there now, if exists. We want to start fresh.                
+                String sqlCreateCmd    = TestEnvironmentUtil.readTextFile(new File(resourceDir.getCanonicalPath() + "/message-store-sql/hsqldb/create_database.sql"));
+                String sqlDropCmd      = TestEnvironmentUtil.readTextFile(new File(resourceDir.getAbsolutePath() + "/message-store-sql/hsqldb/drop_database.sql"));
+                
+                ConnectionManager mgr = ConnectionManagerFactory.getConnectionManager();
+                mgr.init();
+                Connection con = mgr.getConnection();
+                Statement stmnt = con.createStatement();
+                System.out.println("Dropping the schema if exist");
+                stmnt.execute(sqlDropCmd);
+                System.out.println("Creating the message store schema");
+                stmnt.execute(sqlCreateCmd);
+            }
+        } catch (Throwable e) {
+            e.printStackTrace();
+            System.out.println("We should stop testing, since we don't have a db.");
+            assertTrue(false);
+        }
+    }
+	
+	@AfterClass
+	public static void runAfterAllTests() throws Exception{
+		Thread.sleep(2000);
+        System.out.println("Stopping");
+		if (Configuration.getStoreDriver().equals("org.hsqldb.jdbcDriver")) {
+			HsqldbUtil.stopHsqldb(Configuration.getStoreUrl(),
+					Configuration.getStoreUser(),Configuration.getStorePwd() );
+		}
+	}
+	
+	public static junit.framework.Test suite() {
+		return new JUnit4TestAdapter(MessageStoreTest.class);
+	}
+	
+	
+}

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/resources/jbossesb-unittest-properties.xml (from rev 12348, labs/jbossesb/trunk/product/services/jbossesb/src/test/resources/jbossesb-unittest-properties.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/resources/jbossesb-unittest-properties.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/resources/jbossesb-unittest-properties.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,88 @@
+<?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.context.factory" value="org.jnp.interfaces.NamingContextFactory"/>
+		<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="org.apache.juddi.registry.local.InquiryService#inquire"/>
+    	<property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.registry.local.PublishService#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.LocalTransport"/>
+    </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"/>
+    	<property name="org.jboss.soa.esb.ftp.localdir" value="/tmp"/>
+    	<property name="org.jboss.soa.esb.ftp.remotedir" value="/tmp"/>
+    </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">
+    	
+    	<!--  connection manager type -->
+	    <property name="org.jboss.soa.esb.persistence.db.conn.manager" 		value="org.jboss.soa.esb.persistence.manager.StandaloneConnectionManager"/>	    
+	    <!--  property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.soa.esb.persistence.manager.J2eeConnectionManager"/ -->
+	    
+	    <!-- this property is only used if using the j2ee connection manager -->
+	    <property name="org.jboss.soa.esb.persistence.db.datasource.name" 	value="java:/JBossesbDS"/>
+		
+		<!-- standalone connection pooling settings -->
+		<property name="org.jboss.soa.esb.persistence.db.connection.url" 	value="jdbc:hsqldb:hsql://localhost:9001/jbossesb"/>
+		<property name="org.jboss.soa.esb.persistence.db.jdbc.driver" 		value="org.hsqldb.jdbcDriver"/>
+		<property name="org.jboss.soa.esb.persistence.db.user" 				value="sa"/>
+		<property name="org.jboss.soa.esb.persistence.db.pwd" 				value=""/>		
+		<property name="org.jboss.soa.esb.persistence.db.pool.initial.size"	value="2"/>
+		<property name="org.jboss.soa.esb.persistence.db.pool.min.size"		value="2"/>
+		<property name="org.jboss.soa.esb.persistence.db.pool.max.size"		value="5"/>
+		<!--table managed by pool to test for valid connections - created by pool automatically -->
+		<property name="org.jboss.soa.esb.persistence.db.pool.test.table"	value="pooltest"/>		
+		<property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis"	value="5000"/> 
+		
+    </properties>    
+    <properties name="filters">
+    	<property name="org.jboss.soa.esb.courier.filter.1" value="org.jboss.internal.soa.esb.message.metadata.MetaDataFilter"/>
+    </properties>
+</esb>

Modified: labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/resources/log4j.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/resources/log4j.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbossesb/src/test/resources/log4j.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -41,17 +41,20 @@
       <priority value="ERROR"/>
    </category>
    <category name="org.jboss">
-      <priority value="WARN"/>
+      <priority value="INFO"/>
    </category>
    <category name="org.jboss.soa.esb">
-      <priority value="ERROR"/>
+      <priority value="INFO"/>
    </category>
    <category name="org.jboss.internal.soa.esb">
-      <priority value="ERROR"/>
+      <priority value="INFO"/>
    </category>
    <category name="org.apache">
       <priority value="ERROR"/>
    </category>
+    <category name="com">
+      <priority value="ERROR"/>
+   </category>
    <category name="org.jboss.soa.esb.services.jbpm">
       <priority value="DEBUG"/>
    </category>

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/antlr-2.7.6.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/antlr-3.0b7.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbrules/lib/ext/antlr-3.0b7.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/antlr-3.0ea8.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/commons-jci-core-1.0-406301.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/commons-jci-janino-2.4.3.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/commons-lang-2.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/commons-logging.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/core-3.2.1.v_677_R32x.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbrules/lib/ext/core-3.2.1.v_677_R32x.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/drools-compiler-3.0.4.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/drools-compiler-4.0.0.11754MR2.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbrules/lib/ext/drools-compiler-4.0.0.11754MR2.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/drools-core-3.0.4.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/drools-core-4.0.0.11754MR2.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbrules/lib/ext/drools-core-4.0.0.11754MR2.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/drools-decisiontables-4.0.0.11754MR2.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbrules/lib/ext/drools-decisiontables-4.0.0.11754MR2.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/drools-jsr94-4.0.0.11754MR2.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbrules/lib/ext/drools-jsr94-4.0.0.11754MR2.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/janino-2.4.3.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/janino-2.5.6.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbrules/lib/ext/janino-2.5.6.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/jsr94-1.1.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbrules/lib/ext/jsr94-1.1.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/jxl-2.4.2.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbrules/lib/ext/jxl-2.4.2.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/mvel14-1.2beta16.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbrules/lib/ext/mvel14-1.2beta16.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/stringtemplate-2.3b6.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/jbrules/lib/ext/xpp3-1.1.3.4.O.jar (from rev 12348, labs/jbossesb/trunk/product/services/jbrules/lib/ext/xpp3-1.1.3.4.O.jar)
===================================================================
(Binary files differ)

Modified: labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -131,7 +131,7 @@
     			}
     			if (ruleSet != null) ruleSets.put(ruleSet, newRuleSet);
     		}
-    		WorkingMemory workingMemory = ruleBase.newWorkingMemory();
+    		WorkingMemory workingMemory = ruleBase.newStatefulSession();
     		logger.log(Priority.DEBUG,
     				"Obtained message=" + message + " with ruleSet=" + ruleSet);
     		workingMemory.setGlobal("destinations", destinations);

Modified: labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/main/resources/XPathLanguage.dsl
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/main/resources/XPathLanguage.dsl	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/main/resources/XPathLanguage.dsl	2007-06-06 14:23:48 UTC (rev 12351)
@@ -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}") )
-[then]Log : "{message}"=System.out.println("{message}");
-[then]Destination : "{message}"=destinations.add("{message}");
+#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}") )
+[then]Log : "{message}"=System.out.println("{message}");
+[then]Destination : "{message}"=destinations.add("{message}");

Modified: labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/test/resources/JBossESBPricingRoutingRules.drl
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/test/resources/JBossESBPricingRoutingRules.drl	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/test/resources/JBossESBPricingRoutingRules.drl	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,41 +1,41 @@
-#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.internal.soa.esb.services.routing.cbr.Order 
-
-#declare any global variables here
-global java.util.List destinations;
-
-
-rule "Pricing Rule - low quantity"
-	
-	when
-	    m     : Message ()
-		order : Order( quantity < 10)
-	then
-		System.out.println("low volume");
-		#we can modify the object
-		order.setDiscount(0);
-		#demonstrate that we can add a new object to the message
-		m.getBody().add("DiscountObject","0%");
-		#set the routing destination
-		destinations.add("normal-shipping-destination");
-end
-
-rule "Prioing Rule - high quantity"
-	
-	when
-	    m     : Message ()
-		order : Order( quantity >= 10)
-	then 
-		System.out.println("high volume");
-		#we can modify the object
-		order.setDiscount(10);
-		#demonstrate that we can add a new object to the message
-		m.getBody().add("DiscountObject","10%");
-		#sets the routing destination
-		destinations.add("express-shipping-destination");
+#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.internal.soa.esb.services.routing.cbr.Order 
+
+#declare any global variables here
+global java.util.List destinations;
+
+
+rule "Pricing Rule - low quantity"
+	
+	when
+	    m     : Message ()
+		order : Order( quantity < 10)
+	then
+		System.out.println("low volume");
+		#we can modify the object
+		order.setDiscount(0);
+		#demonstrate that we can add a new object to the message
+		m.getBody().add("DiscountObject","0%");
+		#set the routing destination
+		destinations.add("normal-shipping-destination");
+end
+
+rule "Prioing Rule - high quantity"
+	
+	when
+	    m     : Message ()
+		order : Order( quantity >= 10)
+	then 
+		System.out.println("high volume");
+		#we can modify the object
+		order.setDiscount(10);
+		#demonstrate that we can add a new object to the message
+		m.getBody().add("DiscountObject","10%");
+		#sets the routing destination
+		destinations.add("express-shipping-destination");
 end
\ No newline at end of file

Modified: labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/test/resources/JBossESBPricingRules.drl
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/test/resources/JBossESBPricingRules.drl	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/test/resources/JBossESBPricingRules.drl	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,37 +1,37 @@
-#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.internal.soa.esb.services.routing.cbr.Order 
-
-#declare any global variables here
-global java.util.List destinations;
-
-
-rule "Pricing Rule - low quantity"
-	
-	when
-	    m     : Message ()
-		order : Order( quantity < 10)
-	then
-		System.out.println("low volume");
-		#we can modify the object
-		order.setDiscount(0);
-		#demonstrate that we can add a new object to the message
-		m.getBody().add("DiscountObject","0%");
-end
-
-rule "Prioing Rule - high quantity"
-	
-	when
-	    m     : Message ()
-		order : Order( quantity >= 10)
-	then 
-		System.out.println("high volume");
-		#we can modify the object
-		order.setDiscount(10);
-		#demonstrate that we can add a new object to the message
-		m.getBody().add("DiscountObject","10%");
+#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.internal.soa.esb.services.routing.cbr.Order 
+
+#declare any global variables here
+global java.util.List destinations;
+
+
+rule "Pricing Rule - low quantity"
+	
+	when
+	    m     : Message ()
+		order : Order( quantity < 10)
+	then
+		System.out.println("low volume");
+		#we can modify the object
+		order.setDiscount(0);
+		#demonstrate that we can add a new object to the message
+		m.getBody().add("DiscountObject","0%");
+end
+
+rule "Prioing Rule - high quantity"
+	
+	when
+	    m     : Message ()
+		order : Order( quantity >= 10)
+	then 
+		System.out.println("high volume");
+		#we can modify the object
+		order.setDiscount(10);
+		#demonstrate that we can add a new object to the message
+		m.getBody().add("DiscountObject","10%");
 end
\ No newline at end of file

Modified: labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/test/resources/JBossESBRules-XPath.drl
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/test/resources/JBossESBRules-XPath.drl	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/test/resources/JBossESBRules-XPath.drl	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,47 +1,47 @@
-#created on: Nov 8, 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;
-
-expander XPathLanguage.dsl
-
-#declare any global variables here
-global java.util.List destinations;
-
-rule "Routing Rule using XPATH match"
-	
-	when
-		xpathMatch "/jbossesb"
-	then 
-		Log : "XPath Matched";
-		Destination : "XML_XPath_Destination";
-end
-
-rule "Routing Rule using XPATH equals"
-	
-	when
-		xpathEquals "/Dave", "rocks"
-	then 
-		Log : "XPath Equals";
-		Destination : "XML_XPath_Dave_Destination";
-end
-
-rule "Routing Rule using XPATH greater than"
-	
-	when
-	    xpathGreaterThan "/price" , "1.00"
-	then 
-		Log : "XPath Greater Then";
-		Destination : "XML_XPath_GreaterThan_Destination";
-end
-
-rule "Routing Rule using XPATH less than"
-	
-	when
-		xpathLessThan "/price", "1.00"
-	then 
-		Log : "XPath Less Then";
-		Destination : "XML_XPath_LessThan_Destination";
-end
+#created on: Nov 8, 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;
+
+expander XPathLanguage.dsl
+
+#declare any global variables here
+global java.util.List destinations;
+
+rule "Routing Rule using XPATH match"
+	
+	when
+		xpathMatch "/jbossesb"
+	then 
+		Log : "XPath Matched";
+		Destination : "XML_XPath_Destination";
+end
+
+rule "Routing Rule using XPATH equals"
+	
+	when
+		xpathEquals "/Dave", "rocks"
+	then 
+		Log : "XPath Equals";
+		Destination : "XML_XPath_Dave_Destination";
+end
+
+rule "Routing Rule using XPATH greater than"
+	
+	when
+	    xpathGreaterThan "/price", "1.00"
+	then 
+		Log : "XPath Greater Then";
+		Destination : "XML_XPath_GreaterThan_Destination";
+end
+
+rule "Routing Rule using XPATH less than"
+	
+	when
+		xpathLessThan "/price", "1.00"
+	then 
+		Log : "XPath Less Then";
+		Destination : "XML_XPath_LessThan_Destination";
+end

Modified: labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/test/resources/JBossESBRules.drl
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/test/resources/JBossESBRules.drl	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/test/resources/JBossESBRules.drl	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,29 +1,29 @@
-#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;
-
-#declare any global variables here
-global java.util.List destinations;
-
-
-rule "Routing Rule - Serialized based message"
-	
-	when
-		Message( type == MessageType.JAVA_SERIALIZED)
-	then
-		System.out.println("Serialized");
-		destinations.add("serialized-destination");
-		
-end
-
-rule "Routing Rule - XML based message"
-	
-	when
-		Message( type == MessageType.JBOSS_XML)
-	then 
-		System.out.println("JBoss_XML"); 
-		destinations.add("xml-destination");
+#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;
+
+#declare any global variables here
+global java.util.List destinations;
+
+
+rule "Routing Rule - Serialized based message"
+	
+	when
+		Message( type == MessageType.JAVA_SERIALIZED)
+	then
+		System.out.println("Serialized");
+		destinations.add("serialized-destination");
+		
+end
+
+rule "Routing Rule - XML based message"
+	
+	when
+		Message( type == MessageType.JBOSS_XML)
+	then 
+		System.out.println("JBoss_XML"); 
+		destinations.add("xml-destination");
 end
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks (from rev 12348, labs/jbossesb/trunk/product/services/smooks)


Property changes on: labs/jbossesb/workspace/dbevenius/product/services/smooks
___________________________________________________________________
Name: svn:ignore
   + build


Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/base-project-build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/base-project-build.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/base-project-build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,97 +0,0 @@
-<project name="ESB-services-base-build" basedir=".">
-    <!-- 
-    		WARNING: Your edits maybe overwritten!
-    		
-    Only edit this file in the product/services directory. This
-    file is copied down into each services project directory to be
-    able to work on each subproject in a selfcontained manner.
-    
-    If you edit this file, please run the 'copy-buildfiles' target
-    from services to copy the new version down to the project directories.
-    
-     -->
-	<dirname property="services.dir" file="${ant.file.base-build}"/>
-	<property file="${services.dir}/build.properties"/>
-    
-	<target name="clean">
-		<delete dir="build" />
-	</target>
-	
-	<target name="prepare" depends="clean">
-		<mkdir dir="build/${ant.project.name}.esb/META-INF" />
-		<mkdir dir="build/classes" />
-	</target>
-	
-	<path id="classpath">
-		<pathelement location="build/${ant.project.name}.esb" />
-		<pathelement location="build/classes" />
-		<pathelement location="build/test/classes" />
-		<fileset dir="lib/ext" includes="*.jar" />
-		<fileset dir="lib/ext/build-time" includes="*.jar" />
-		<fileset dir="${esb.product.lib.dir}" includes="*.jar" /> <!-- Product Jars. -->
-		<pathelement location="src/test/resources"/>
-        <fileset dir="../../lib/ext" includes="jboss-system.jar" />
-	</path>
-	
-	<target name="echoCP">
-		<property name="cp" refid="classpath" />
-		<echo message="Classpath is ${cp}" />
-	</target>
-
-    <target name="check.for.files">
-	    <fileset id="fs" dir="build/classes"/>
-	    <condition property="dir_empty">
-	        <length length="0">
-	    		<fileset refid="fs"/>
-	  		</length>
-	  </condition>
-    </target>
-    
-	<target name="compile" depends="prepare">
-		<javac srcdir="src/main/java" destdir="build/classes" debug="on" >
-			<classpath refid="classpath" />
-		</javac>
-	</target>
-	
-	<target name="jar" depends="compile,check.for.files" unless="dir_empty">
-		<jar basedir="build/classes" destfile="build/jbossesb-${ant.project.name}.jar" includes="**/*.class"/>
-	</target>
-
-    <target name="esb" depends="jar">
-        <copy todir="build/${ant.project.name}.esb/" >
-        	<fileset dir="lib/ext" includes="*.jar"/>
-        	<fileset dir="src/main/resources/" includes="**/*"/>
-        	<fileset dir="build" includes="*.jar"/>
-         </copy>
-    </target>
-	
-	<target name="dist" depends="esb">
-		<!-- copying to jbossesb/lib -->
-    	<mkdir dir="${esb.product.lib.dir}/${ant.project.name}.esb"/>
-    	<copy todir="${esb.product.lib.dir}/${ant.project.name}.esb">
-    		<fileset dir="build/${ant.project.name}.esb"  includes="**/*" />
-    	</copy>
-	</target>
-    
-    <target name="base.test" depends="esb">
-    	<mkdir dir="build/test/classes"/>
-    	<mkdir dir="build/test/report"/>
-    	<javac srcdir="src/test/java" destdir="build/test/classes" debug="on" >
-			<classpath refid="classpath" />
-		</javac>
-    	<copy todir="build/test/classes" >
-    		<fileset dir="src/test/java" includes="**/*.xml" />
-    	</copy>
-		<junit fork="yes" haltonfailure="true" haltonerror="true" showoutput="off">
-			<formatter type="plain" usefile="false" />
-			<classpath refid="classpath" />
-			<sysproperty key="log4j.configuration" value="log4j.xml" />
-			<test name="${testcase}" if="testcase" />
-			<batchtest unless="testcase" todir="build/test/report">
-				<fileset dir="build/test/classes" includes="**/*Test.class" />
-			</batchtest>
-		</junit>
-    </target>
-	
-
-</project>
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/base-project-build.xml (from rev 12348, labs/jbossesb/trunk/product/services/smooks/base-project-build.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/smooks/base-project-build.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/base-project-build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,97 @@
+<project name="ESB-services-base-build" basedir=".">
+    <!-- 
+    		WARNING: Your edits maybe overwritten!
+    		
+    Only edit this file in the product/services directory. This
+    file is copied down into each services project directory to be
+    able to work on each subproject in a selfcontained manner.
+    
+    If you edit this file, please run the 'copy-buildfiles' target
+    from services to copy the new version down to the project directories.
+    
+     -->
+	<dirname property="services.dir" file="${ant.file.base-build}"/>
+	<property file="${services.dir}/build.properties"/>
+    
+	<target name="clean">
+		<delete dir="build" />
+	</target>
+	
+	<target name="prepare" depends="clean">
+		<mkdir dir="build/${ant.project.name}.esb/META-INF" />
+		<mkdir dir="build/classes" />
+	</target>
+	
+	<path id="classpath">
+		<pathelement location="build/${ant.project.name}.esb" />
+		<pathelement location="build/classes" />
+		<pathelement location="build/test/classes" />
+		<fileset dir="lib/ext" includes="*.jar" />
+		<fileset dir="lib/ext/build-time" includes="*.jar" />
+		<fileset dir="${esb.product.lib.dir}" includes="*.jar" /> <!-- Product Jars. -->
+		<pathelement location="src/test/resources"/>
+        <fileset dir="../../lib/ext" includes="jboss-system.jar" />
+	</path>
+	
+	<target name="echoCP">
+		<property name="cp" refid="classpath" />
+		<echo message="Classpath is ${cp}" />
+	</target>
+
+    <target name="check.for.files">
+	    <fileset id="fs" dir="build/classes"/>
+	    <condition property="dir_empty">
+	        <length length="0">
+	    		<fileset refid="fs"/>
+	  		</length>
+	  </condition>
+    </target>
+    
+	<target name="compile" depends="prepare">
+		<javac srcdir="src/main/java" destdir="build/classes" debug="on" >
+			<classpath refid="classpath" />
+		</javac>
+	</target>
+	
+	<target name="jar" depends="compile,check.for.files" unless="dir_empty">
+		<jar basedir="build/classes" destfile="build/jbossesb-${ant.project.name}.jar" includes="**/*.class"/>
+	</target>
+
+    <target name="esb" depends="jar">
+        <copy todir="build/${ant.project.name}.esb/" >
+        	<fileset dir="lib/ext" includes="*.jar"/>
+        	<fileset dir="src/main/resources/" includes="**/*"/>
+        	<fileset dir="build" includes="*.jar"/>
+         </copy>
+    </target>
+	
+	<target name="dist" depends="esb">
+		<!-- copying to jbossesb/lib -->
+    	<mkdir dir="${esb.product.lib.dir}/${ant.project.name}.esb"/>
+    	<copy todir="${esb.product.lib.dir}/${ant.project.name}.esb">
+    		<fileset dir="build/${ant.project.name}.esb"  includes="**/*" />
+    	</copy>
+	</target>
+    
+    <target name="base.test" depends="esb">
+    	<mkdir dir="build/test/classes"/>
+    	<mkdir dir="build/test/report"/>
+    	<javac srcdir="src/test/java" destdir="build/test/classes" debug="on" >
+			<classpath refid="classpath" />
+		</javac>
+    	<copy todir="build/test/classes" >
+    		<fileset dir="src/test/java" includes="**/*.xml" />
+    	</copy>
+		<junit fork="yes" haltonfailure="true" haltonerror="true" showoutput="off">
+			<formatter type="plain" usefile="false" />
+			<classpath refid="classpath" />
+			<sysproperty key="log4j.configuration" value="log4j.xml" />
+			<test name="${testcase}" if="testcase" />
+			<batchtest unless="testcase" todir="build/test/report">
+				<fileset dir="build/test/classes" includes="**/*Test.class" />
+			</batchtest>
+		</junit>
+    </target>
+	
+
+</project>
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/build.properties
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/build.properties	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/build.properties	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1 +0,0 @@
-esb.product.lib.dir=../../../product/build/jbossesb/lib
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/build.properties (from rev 12348, labs/jbossesb/trunk/product/services/smooks/build.properties)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/smooks/build.properties	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/build.properties	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1 @@
+esb.product.lib.dir=../../../product/build/jbossesb/lib
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/build.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,8 +0,0 @@
-<project name="smooks" default="test" basedir=".">
-	
-	<!-- Import the base Ant build script... -->
-	<import file="base-project-build.xml"/>
-	
-	<target name="test" depends="base.test"/>
-
-</project>

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/build.xml (from rev 12348, labs/jbossesb/trunk/product/services/smooks/build.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/smooks/build.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,8 @@
+<project name="smooks" default="test" basedir=".">
+	
+	<!-- Import the base Ant build script... -->
+	<import file="base-project-build.xml"/>
+	
+	<target name="test" depends="base.test"/>
+
+</project>

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib (from rev 12348, labs/jbossesb/trunk/product/services/smooks/lib)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext (from rev 12348, labs/jbossesb/trunk/product/services/smooks/lib/ext)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time (from rev 12348, labs/jbossesb/trunk/product/services/smooks/lib/ext/build-time)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time/commons-logging-1.0.4.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time/commons-logging-1.0.4.jar (from rev 12348, labs/jbossesb/trunk/product/services/smooks/lib/ext/build-time/commons-logging-1.0.4.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time/jbossall-client.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time/jbossall-client.jar (from rev 12348, labs/jbossesb/trunk/product/services/smooks/lib/ext/build-time/jbossall-client.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time/jbossts-common.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time/jbossts-common.jar (from rev 12348, labs/jbossesb/trunk/product/services/smooks/lib/ext/build-time/jbossts-common.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time/junit-4.1.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time/junit-4.1.jar (from rev 12348, labs/jbossesb/trunk/product/services/smooks/lib/ext/build-time/junit-4.1.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time/log4j.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/build-time/log4j.jar (from rev 12348, labs/jbossesb/trunk/product/services/smooks/lib/ext/build-time/log4j.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-commons-0.9-SNAPSHOT.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-commons-0.9-SNAPSHOT.jar (from rev 12348, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-commons-0.9-SNAPSHOT.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-edisax-0.2-SNAPSHOT.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-edisax-0.2-SNAPSHOT.jar (from rev 12348, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-edisax-0.2-SNAPSHOT.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-core-0.9-SNAPSHOT.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-core-0.9-SNAPSHOT.jar (from rev 12348, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-core-0.9-SNAPSHOT.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-csv-0.1.1.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-csv-0.1.1.jar (from rev 12348, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-csv-0.1.1.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-edi-0.2-SNAPSHOT.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-edi-0.2-SNAPSHOT.jar (from rev 12348, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-edi-0.2-SNAPSHOT.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-javabean-0.3-SNAPSHOT.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-javabean-0.3-SNAPSHOT.jar (from rev 12348, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-javabean-0.3-SNAPSHOT.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-misc-0.2.1.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-misc-0.2.1.jar (from rev 12348, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-misc-0.2.1.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-scripting-0.1.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-scripting-0.1.jar (from rev 12348, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-scripting-0.1.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-templating-0.2.1.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-templating-0.2.1.jar (from rev 12348, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-templating-0.2.1.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main/java)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main/java/org)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksConfiguration.java
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksConfiguration.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksConfiguration.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,58 +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, JBoss Inc.
- */
-package org.jboss.soa.esb.actions.converters;
-
-import org.apache.log4j.Logger;
-import org.jboss.soa.esb.util.ClassUtil;
-
-import java.util.Properties;
-import java.io.InputStream;
-import java.io.IOException;
-
-/**
- * Smooks-dot-esb configuration properties.
- * 
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-class SmooksConfiguration extends Properties {
-
-    private static final Logger logger = Logger.getLogger(SmooksConfiguration.class);
-    public static final String SMOOKS_ESB_PROPERTIES = "/smooks.esb.properties";
-
-    SmooksConfiguration() {
-        InputStream configStream = ClassUtil.getResourceAsStream(SMOOKS_ESB_PROPERTIES, SmooksConfiguration.class);
-
-        if(configStream == null) {
-            logger.warn("Smooks.esb configuration file '" + SMOOKS_ESB_PROPERTIES + "' not found on classpath.");
-        } else {
-            try {
-                load(configStream);
-            } catch (IOException e) {
-                logger.warn("Error loading Smooks.esb configuration file '" + SMOOKS_ESB_PROPERTIES + "'.", e);
-            } finally {
-                try {
-                    configStream.close();
-                } catch (IOException e) {
-                    logger.warn("Error closing stream for Smooks.esb configuration file '" + SMOOKS_ESB_PROPERTIES + "'.", e);
-                }
-            }
-        }
-    }
-}

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksConfiguration.java (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksConfiguration.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksConfiguration.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksConfiguration.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,58 @@
+/*
+ * 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, JBoss Inc.
+ */
+package org.jboss.soa.esb.actions.converters;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.util.ClassUtil;
+
+import java.util.Properties;
+import java.io.InputStream;
+import java.io.IOException;
+
+/**
+ * Smooks-dot-esb configuration properties.
+ * 
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+class SmooksConfiguration extends Properties {
+
+    private static final Logger logger = Logger.getLogger(SmooksConfiguration.class);
+    public static final String SMOOKS_ESB_PROPERTIES = "/smooks.esb.properties";
+
+    SmooksConfiguration() {
+        InputStream configStream = ClassUtil.getResourceAsStream(SMOOKS_ESB_PROPERTIES, SmooksConfiguration.class);
+
+        if(configStream == null) {
+            logger.warn("Smooks.esb configuration file '" + SMOOKS_ESB_PROPERTIES + "' not found on classpath.");
+        } else {
+            try {
+                load(configStream);
+            } catch (IOException e) {
+                logger.warn("Error loading Smooks.esb configuration file '" + SMOOKS_ESB_PROPERTIES + "'.", e);
+            } finally {
+                try {
+                    configStream.close();
+                } catch (IOException e) {
+                    logger.warn("Error closing stream for Smooks.esb configuration file '" + SMOOKS_ESB_PROPERTIES + "'.", e);
+                }
+            }
+        }
+    }
+}

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksInstanceManager.java
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksInstanceManager.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksInstanceManager.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,356 +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, JBoss Inc.
- */
-package org.jboss.soa.esb.actions.converters;
-
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.helpers.NamingContext;
-import org.jboss.internal.soa.esb.assertion.AssertArgument;
-import org.apache.log4j.Logger;
-import org.milyn.Smooks;
-import org.milyn.SmooksException;
-import org.milyn.resource.URIResourceLocator;
-import org.xml.sax.SAXException;
-
-import javax.jms.*;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.InitialContext;
-import java.io.InputStream;
-import java.io.IOException;
-
-/**
- * Smooks instance manager.
- * <p/>
- * Manages configuration updates.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-class SmooksInstanceManager {
-
-    private static Logger logger = Logger.getLogger(SmooksInstanceManager.class);
-    private static String UPDATE_TOPIC_NAME = "update.notification.topic";
-    private SmooksConfiguration config = new SmooksConfiguration();
-    private String configurationSourceName;
-    private String configurationSourceURI;
-    private Smooks smooksInstance;
-    private ConfigurationUpdateListener configUpdateListener;
-
-    protected SmooksInstanceManager(String configurationSourceName, String configurationSourceURI) throws SmooksException {
-        AssertArgument.isNotNullAndNotEmpty(configurationSourceURI, "configurationSourceURI");
-        if(configurationSourceName != null) {
-            this.configurationSourceName = configurationSourceName;
-        } else {
-            // Just set the name to be the URI...
-            logger.warn("No 'configurationSourceName' specified for Smooks Configuration '" + configurationSourceURI + "'.  Defaulting name to '" + configurationSourceURI + "'.");
-            this.configurationSourceName = configurationSourceURI;
-        }
-        this.configurationSourceURI = configurationSourceURI;
-
-        smooksInstance = createSmooksInstance();
-        configUpdateListener = new ConfigurationUpdateListener();
-    }
-
-    protected Smooks getSmooksInstance() {
-        return smooksInstance;
-    }
-
-    protected void close() {
-        configUpdateListener.close();
-    }
-
-    private Smooks createSmooksInstance() throws SmooksException{
-        InputStream configListStream;
-
-        try {
-            configListStream = (new URIResourceLocator()).getResource(configurationSourceURI);
-        } catch (IOException e) {
-            throw new SmooksException("Failed to locate Smooks resource [" + configurationSourceURI + "].", e);
-        }
-        if(configListStream == null) {
-            throw new SmooksException("Failed to locate Smooks resource [" + configurationSourceURI + "].");
-        }
-
-        try {
-            return new Smooks(configListStream);
-        } catch (SAXException e) {
-            throw new SmooksException("Invalid Smooks resource config '" + configurationSourceURI + "'.", e);
-        } catch (IOException e) {
-            throw new SmooksException("Error reading Smooks resource config '" + configurationSourceURI + "'.", e);
-        } finally {
-            try {
-                configListStream.close();
-            } catch (IOException e) {
-                logger.warn("Error closing Smooks resource config stream for resource '" + configurationSourceURI + "'.", e);
-            }
-        }
-    }
-
-    /**
-     * JMS Listener for receiving configuration update notifications.
-     * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
-     */
-    private class ConfigurationUpdateListener implements MessageListener {
-
-    	private TopicConnection conn = null;
-    	private TopicSession session = null;
-    	private Topic topic = null;
-
-        /**
-    	 * Private constructor.
-    	 * <p/>
-    	 * Connects the listener to the topic.
-    	 */
-    	private ConfigurationUpdateListener() {
-    		try {
-    			connect();
-    		} catch(Throwable t) {
-				logger.error("Unexpected error while attempting to connect Transformation configuration Update Listener.  Update listener not enabled!", t);
-				close();
-				return;
-    		}
-    	}
-
-		/**
-    	 * Receive a notification message.
-    	 */
-		public void onMessage(javax.jms.Message message) {
-            if(message instanceof TextMessage) {
-                try {
-                    String updatedSourceName = ((TextMessage)message).getText();
-
-                    if(updatedSourceName != null && updatedSourceName.equals(configurationSourceName)) {
-                        logger.info("Transformation configuration update notification received for configuration source '" + configurationSourceName + "'.  Resetting SmooksTransformer in order to force a configuration re-read.");
-                        smooksInstance = createSmooksInstance();
-                    }
-                } catch (JMSException e) {
-                    logger.warn("Error reading Smooks Update Notification configuration source name from JMS message.", e);
-                    return;
-                }
-            } else {
-                logger.info("Transformation configuration update notification received (global notification).  Resetting SmooksTransformer in order to force a configuration re-read.");
-                smooksInstance = createSmooksInstance();
-            }
-        }
-
-        private ConnectionFactory getJmsConnectionFactory() throws ConfigurationException {
-            ConnectionFactory factory = null;
-            Context context;
-            String connectionFactoryRuntime = config.getProperty(ConnectionFactory.class.getName(), "ConnectionFactory");
-
-            context = getNamingContext();
-            try {
-                factory = (ConnectionFactory) context.lookup(connectionFactoryRuntime);
-            } catch (NamingException e) {
-                throw new ConfigurationException("JNDI lookup of JMS Connection Factory [" + connectionFactoryRuntime + "] failed.", e);
-            } catch (ClassCastException e) {
-                throw new ConfigurationException("JNDI lookup of JMS Connection Factory failed.  Class [" + connectionFactoryRuntime + "] is not an instance of [" + ConnectionFactory.class.getName() + "].", e);
-            } finally {
-                if (context!=null) {
-                    try {
-                        context.close();
-                    } catch (NamingException ne) {
-                        logger.error("Failed to close Naming Context.", ne);
-                    }
-                }
-            }
-
-            return factory;
-        }
-
-        private Context getNamingContext() throws ConfigurationException {
-            Context context;
-
-            try {
-                context = new InitialContext(config);
-            } catch (NamingException e) {
-                throw new ConfigurationException("Failed to load InitialContext: " + config);
-            }
-            if(context == null) {
-                throw new ConfigurationException("Failed to Server JNDI context.  Check that '" + Context.PROVIDER_URL + "', '" + Context.INITIAL_CONTEXT_FACTORY + "', '" + Context.URL_PKG_PREFIXES + "' are correctly configured in " + SmooksConfiguration.SMOOKS_ESB_PROPERTIES + ".");
-            }
-            
-            return context;
-        }
-
-        /**
-		 * Connect to the configured topic.
-		 */
-    	private boolean connect() {
-            String notificationTopicName = config.getProperty(UPDATE_TOPIC_NAME, "topic/org.jboss.soa.esb.transformation.Update");
-    		TopicConnectionFactory connectionFactory = null;
-
-			logger.debug("Attempting to connect Transformation Configuration Update Listener to update notification topic '" + notificationTopicName + "'.");
-
-    		// Get the Topic ConnectionFactory...
-    		try {
-				connectionFactory = (TopicConnectionFactory) getJmsConnectionFactory();
-			} catch (ConfigurationException e) {
-				logger.error("Lookup of the JMS ConnectionFactory failed for the Transformation configuration Update Listener. Update listener not enabled!", e);
-				return false;
-			} catch (ClassCastException e) {
-				logger.error("Invalid JMS ConnectionFactory config for the Transformation configuration Update Listener.  ConnectionFactory doesn't implement " + TopicConnectionFactory.class.getName() + ". Update listener not enabled!", e);
-				return false;
-			}
-
-			// Create the topic connection...
-			try {
-				conn = connectionFactory.createTopicConnection();
-			} catch (JMSException e) {
-				logger.error("Failed to open JMS TopicConnection for the Transformation configuration Update Listener. Update listener not enabled!", e);
-				return false;
-			}
-
-			// Lookup the topic...
-			try {
-				Context context = getNamingContext();
-
-                topic = (Topic) context.lookup(notificationTopicName);
-                context.close();
-			} catch (ConfigurationException e) {
-				logger.error("Topic lookup failed for the Transformation configuration Update Listener.  Topic name '" + notificationTopicName + "'.  \n\t\tThis JMS Topic may not be deployed, or this ESB instance may not be looking at the correct JMS provider (check properties '" + UPDATE_TOPIC_NAME + "' and '" + Context.PROVIDER_URL + "' in '" + SmooksConfiguration.SMOOKS_ESB_PROPERTIES + "').  \n\t\tUpdate listener not enabled!", e);
-				close();
-				return false;
-			} catch (NamingException e) {
-				logger.warn("Topic lookup failed for the Transformation configuration Update Listener.  Topic name '" + notificationTopicName + "'.  \n\tThis JMS Topic may not be deployed, or this ESB instance may not be looking at the correct JMS provider (check properties '" + UPDATE_TOPIC_NAME + "' and '" + Context.PROVIDER_URL + "' in '" + SmooksConfiguration.SMOOKS_ESB_PROPERTIES + "').  \n\tUpdate listener not enabled!");
-				close();
-				return false;
-			}
-
-			// Create the TopicSession...
-			try {
-				session = conn.createTopicSession(false, TopicSession.AUTO_ACKNOWLEDGE);
-			} catch (JMSException e) {
-				logger.error("TopicSession creation failed for the Transformation configuration Update Listener.  Update listener not enabled!", e);
-				close();
-				return false;
-			}
-
-			// Start the connection...
-			try {
-				conn.start();
-			} catch (JMSException e) {
-				logger.error("Failed to start JMS TopicConnection for the Transformation configuration Update Listener.  Update listener not enabled!", e);
-				close();
-				return false;
-			}
-
-			// Bind "this" listener to the topic...
-			try {
-				TopicSubscriber topicSubscriber = session.createSubscriber(topic);
-				topicSubscriber.setMessageListener(this);
-			} catch (JMSException e) {
-				logger.error("Failed to start JMS TopicConnection for the Transformation configuration Update Listener.  Update listener not enabled!", e);
-				close();
-				return false;
-			}
-
-			// Listen for exceptions on the connection...
-			try {
-				conn.setExceptionListener(new ExceptionListener());
-			} catch (JMSException e) {
-				logger.error("Failed to attach an ExceptionListener for the Transformation configuration Update Listener.  Update listener not enabled!", e);
-				close();
-				return false;
-			}
-
-            logger.info("Successfully connected update notification listener to nofification topic '" + notificationTopicName + "' for Smooks configuration source '" + configurationSourceName + "' (" + configurationSourceURI + ").");
-
-			return true;
-    	}
-
-    	@Override
-		protected void finalize() throws Throwable {
-    		close();
-			super.finalize();
-		}
-
-		/**
-    	 * Close out the listener and all it's resources.
-    	 */
-		private void close() {
-			try {
-				if(conn != null) {
-					conn.stop();
-                    logger.debug("Closing JMS Connection for update notification listener for Smooks configuration source '" + configurationSourceName + "'.");
-				}
-			} catch (Throwable e) {
-				logger.error("Failed to stop Update Listener JMS connection.", e);
-				conn = null;
-			}
-			try {
-				if(session != null) {
-					session.close();
-                    logger.debug("Closing JMS Session for update notification listener for Smooks configuration source '" + configurationSourceName + "'.");
-				}
-			} catch (Throwable e) {
-				logger.error("Failed to close Update Listener JMS session.", e);
-			} finally {
-				session = null;
-			}
-			try {
-				if(conn != null) {
-					conn.close();
-                    logger.debug("Closing JMS Topic for update notification listener for Smooks configuration source '" + configurationSourceName + "'.");
-				}
-			} catch (Throwable e) {
-				logger.error("Failed to close Update Listener JMS connection.", e);
-			} finally {
-				conn = null;
-			}
-			topic = null;
-            logger.debug("Update notification listener for Smooks configuration source '" + configurationSourceName + "' is now stopped!");
-		}
-
-		/**
-		 * Exception Listener.
-		 * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
-		 */
-		private class ExceptionListener implements javax.jms.ExceptionListener {
-
-			/**
-			 * We want this listener to handle only one exception.
-			 * It will close all existing resources and create a new instance
-			 * once it successfully reconnects.
-			 */
-			private boolean hasHandledOneException = false;
-
-			/* (non-Javadoc)
-			 * @see javax.jms.ExceptionListener#onException(javax.jms.JMSException)
-			 */
-			public void onException(JMSException e) {
-				synchronized (ExceptionListener.class) {
-					if(!hasHandledOneException) {
-						logger.error("JMS Exception on Transformation Configuration Update Listener.", e);
-						close();
-						while(!connect()) {
-							try {
-								Thread.sleep(5000);
-							} catch (InterruptedException e1) {
-								logger.error("Interrupted during reconnect attempt.  Aborting reconnect!  Will need restart to reconnect.", e);
-							}
-						}
-						hasHandledOneException = true;
-					}
-				}
-			}
-		}
-    }
-
-}

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksInstanceManager.java (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksInstanceManager.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksInstanceManager.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksInstanceManager.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,356 @@
+/*
+ * 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, JBoss Inc.
+ */
+package org.jboss.soa.esb.actions.converters;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.helpers.NamingContext;
+import org.jboss.internal.soa.esb.assertion.AssertArgument;
+import org.apache.log4j.Logger;
+import org.milyn.Smooks;
+import org.milyn.SmooksException;
+import org.milyn.resource.URIResourceLocator;
+import org.xml.sax.SAXException;
+
+import javax.jms.*;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.InitialContext;
+import java.io.InputStream;
+import java.io.IOException;
+
+/**
+ * Smooks instance manager.
+ * <p/>
+ * Manages configuration updates.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+class SmooksInstanceManager {
+
+    private static Logger logger = Logger.getLogger(SmooksInstanceManager.class);
+    private static String UPDATE_TOPIC_NAME = "update.notification.topic";
+    private SmooksConfiguration config = new SmooksConfiguration();
+    private String configurationSourceName;
+    private String configurationSourceURI;
+    private Smooks smooksInstance;
+    private ConfigurationUpdateListener configUpdateListener;
+
+    protected SmooksInstanceManager(String configurationSourceName, String configurationSourceURI) throws SmooksException {
+        AssertArgument.isNotNullAndNotEmpty(configurationSourceURI, "configurationSourceURI");
+        if(configurationSourceName != null) {
+            this.configurationSourceName = configurationSourceName;
+        } else {
+            // Just set the name to be the URI...
+            logger.warn("No 'configurationSourceName' specified for Smooks Configuration '" + configurationSourceURI + "'.  Defaulting name to '" + configurationSourceURI + "'.");
+            this.configurationSourceName = configurationSourceURI;
+        }
+        this.configurationSourceURI = configurationSourceURI;
+
+        smooksInstance = createSmooksInstance();
+        configUpdateListener = new ConfigurationUpdateListener();
+    }
+
+    protected Smooks getSmooksInstance() {
+        return smooksInstance;
+    }
+
+    protected void close() {
+        configUpdateListener.close();
+    }
+
+    private Smooks createSmooksInstance() throws SmooksException{
+        InputStream configListStream;
+
+        try {
+            configListStream = (new URIResourceLocator()).getResource(configurationSourceURI);
+        } catch (IOException e) {
+            throw new SmooksException("Failed to locate Smooks resource [" + configurationSourceURI + "].", e);
+        }
+        if(configListStream == null) {
+            throw new SmooksException("Failed to locate Smooks resource [" + configurationSourceURI + "].");
+        }
+
+        try {
+            return new Smooks(configListStream);
+        } catch (SAXException e) {
+            throw new SmooksException("Invalid Smooks resource config '" + configurationSourceURI + "'.", e);
+        } catch (IOException e) {
+            throw new SmooksException("Error reading Smooks resource config '" + configurationSourceURI + "'.", e);
+        } finally {
+            try {
+                configListStream.close();
+            } catch (IOException e) {
+                logger.warn("Error closing Smooks resource config stream for resource '" + configurationSourceURI + "'.", e);
+            }
+        }
+    }
+
+    /**
+     * JMS Listener for receiving configuration update notifications.
+     * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+     */
+    private class ConfigurationUpdateListener implements MessageListener {
+
+    	private TopicConnection conn = null;
+    	private TopicSession session = null;
+    	private Topic topic = null;
+
+        /**
+    	 * Private constructor.
+    	 * <p/>
+    	 * Connects the listener to the topic.
+    	 */
+    	private ConfigurationUpdateListener() {
+    		try {
+    			connect();
+    		} catch(Throwable t) {
+				logger.error("Unexpected error while attempting to connect Transformation configuration Update Listener.  Update listener not enabled!", t);
+				close();
+				return;
+    		}
+    	}
+
+		/**
+    	 * Receive a notification message.
+    	 */
+		public void onMessage(javax.jms.Message message) {
+            if(message instanceof TextMessage) {
+                try {
+                    String updatedSourceName = ((TextMessage)message).getText();
+
+                    if(updatedSourceName != null && updatedSourceName.equals(configurationSourceName)) {
+                        logger.info("Transformation configuration update notification received for configuration source '" + configurationSourceName + "'.  Resetting SmooksTransformer in order to force a configuration re-read.");
+                        smooksInstance = createSmooksInstance();
+                    }
+                } catch (JMSException e) {
+                    logger.warn("Error reading Smooks Update Notification configuration source name from JMS message.", e);
+                    return;
+                }
+            } else {
+                logger.info("Transformation configuration update notification received (global notification).  Resetting SmooksTransformer in order to force a configuration re-read.");
+                smooksInstance = createSmooksInstance();
+            }
+        }
+
+        private ConnectionFactory getJmsConnectionFactory() throws ConfigurationException {
+            ConnectionFactory factory = null;
+            Context context;
+            String connectionFactoryRuntime = config.getProperty(ConnectionFactory.class.getName(), "ConnectionFactory");
+
+            context = getNamingContext();
+            try {
+                factory = (ConnectionFactory) context.lookup(connectionFactoryRuntime);
+            } catch (NamingException e) {
+                throw new ConfigurationException("JNDI lookup of JMS Connection Factory [" + connectionFactoryRuntime + "] failed.", e);
+            } catch (ClassCastException e) {
+                throw new ConfigurationException("JNDI lookup of JMS Connection Factory failed.  Class [" + connectionFactoryRuntime + "] is not an instance of [" + ConnectionFactory.class.getName() + "].", e);
+            } finally {
+                if (context!=null) {
+                    try {
+                        context.close();
+                    } catch (NamingException ne) {
+                        logger.error("Failed to close Naming Context.", ne);
+                    }
+                }
+            }
+
+            return factory;
+        }
+
+        private Context getNamingContext() throws ConfigurationException {
+            Context context;
+
+            try {
+                context = new InitialContext(config);
+            } catch (NamingException e) {
+                throw new ConfigurationException("Failed to load InitialContext: " + config);
+            }
+            if(context == null) {
+                throw new ConfigurationException("Failed to Server JNDI context.  Check that '" + Context.PROVIDER_URL + "', '" + Context.INITIAL_CONTEXT_FACTORY + "', '" + Context.URL_PKG_PREFIXES + "' are correctly configured in " + SmooksConfiguration.SMOOKS_ESB_PROPERTIES + ".");
+            }
+            
+            return context;
+        }
+
+        /**
+		 * Connect to the configured topic.
+		 */
+    	private boolean connect() {
+            String notificationTopicName = config.getProperty(UPDATE_TOPIC_NAME, "topic/org.jboss.soa.esb.transformation.Update");
+    		TopicConnectionFactory connectionFactory = null;
+
+			logger.debug("Attempting to connect Transformation Configuration Update Listener to update notification topic '" + notificationTopicName + "'.");
+
+    		// Get the Topic ConnectionFactory...
+    		try {
+				connectionFactory = (TopicConnectionFactory) getJmsConnectionFactory();
+			} catch (ConfigurationException e) {
+				logger.error("Lookup of the JMS ConnectionFactory failed for the Transformation configuration Update Listener. Update listener not enabled!", e);
+				return false;
+			} catch (ClassCastException e) {
+				logger.error("Invalid JMS ConnectionFactory config for the Transformation configuration Update Listener.  ConnectionFactory doesn't implement " + TopicConnectionFactory.class.getName() + ". Update listener not enabled!", e);
+				return false;
+			}
+
+			// Create the topic connection...
+			try {
+				conn = connectionFactory.createTopicConnection();
+			} catch (JMSException e) {
+				logger.error("Failed to open JMS TopicConnection for the Transformation configuration Update Listener. Update listener not enabled!", e);
+				return false;
+			}
+
+			// Lookup the topic...
+			try {
+				Context context = getNamingContext();
+
+                topic = (Topic) context.lookup(notificationTopicName);
+                context.close();
+			} catch (ConfigurationException e) {
+				logger.error("Topic lookup failed for the Transformation configuration Update Listener.  Topic name '" + notificationTopicName + "'.  \n\t\tThis JMS Topic may not be deployed, or this ESB instance may not be looking at the correct JMS provider (check properties '" + UPDATE_TOPIC_NAME + "' and '" + Context.PROVIDER_URL + "' in '" + SmooksConfiguration.SMOOKS_ESB_PROPERTIES + "').  \n\t\tUpdate listener not enabled!", e);
+				close();
+				return false;
+			} catch (NamingException e) {
+				logger.warn("Topic lookup failed for the Transformation configuration Update Listener.  Topic name '" + notificationTopicName + "'.  \n\tThis JMS Topic may not be deployed, or this ESB instance may not be looking at the correct JMS provider (check properties '" + UPDATE_TOPIC_NAME + "' and '" + Context.PROVIDER_URL + "' in '" + SmooksConfiguration.SMOOKS_ESB_PROPERTIES + "').  \n\tUpdate listener not enabled!");
+				close();
+				return false;
+			}
+
+			// Create the TopicSession...
+			try {
+				session = conn.createTopicSession(false, TopicSession.AUTO_ACKNOWLEDGE);
+			} catch (JMSException e) {
+				logger.error("TopicSession creation failed for the Transformation configuration Update Listener.  Update listener not enabled!", e);
+				close();
+				return false;
+			}
+
+			// Start the connection...
+			try {
+				conn.start();
+			} catch (JMSException e) {
+				logger.error("Failed to start JMS TopicConnection for the Transformation configuration Update Listener.  Update listener not enabled!", e);
+				close();
+				return false;
+			}
+
+			// Bind "this" listener to the topic...
+			try {
+				TopicSubscriber topicSubscriber = session.createSubscriber(topic);
+				topicSubscriber.setMessageListener(this);
+			} catch (JMSException e) {
+				logger.error("Failed to start JMS TopicConnection for the Transformation configuration Update Listener.  Update listener not enabled!", e);
+				close();
+				return false;
+			}
+
+			// Listen for exceptions on the connection...
+			try {
+				conn.setExceptionListener(new ExceptionListener());
+			} catch (JMSException e) {
+				logger.error("Failed to attach an ExceptionListener for the Transformation configuration Update Listener.  Update listener not enabled!", e);
+				close();
+				return false;
+			}
+
+            logger.info("Successfully connected update notification listener to nofification topic '" + notificationTopicName + "' for Smooks configuration source '" + configurationSourceName + "' (" + configurationSourceURI + ").");
+
+			return true;
+    	}
+
+    	@Override
+		protected void finalize() throws Throwable {
+    		close();
+			super.finalize();
+		}
+
+		/**
+    	 * Close out the listener and all it's resources.
+    	 */
+		private void close() {
+			try {
+				if(conn != null) {
+					conn.stop();
+                    logger.debug("Closing JMS Connection for update notification listener for Smooks configuration source '" + configurationSourceName + "'.");
+				}
+			} catch (Throwable e) {
+				logger.error("Failed to stop Update Listener JMS connection.", e);
+				conn = null;
+			}
+			try {
+				if(session != null) {
+					session.close();
+                    logger.debug("Closing JMS Session for update notification listener for Smooks configuration source '" + configurationSourceName + "'.");
+				}
+			} catch (Throwable e) {
+				logger.error("Failed to close Update Listener JMS session.", e);
+			} finally {
+				session = null;
+			}
+			try {
+				if(conn != null) {
+					conn.close();
+                    logger.debug("Closing JMS Topic for update notification listener for Smooks configuration source '" + configurationSourceName + "'.");
+				}
+			} catch (Throwable e) {
+				logger.error("Failed to close Update Listener JMS connection.", e);
+			} finally {
+				conn = null;
+			}
+			topic = null;
+            logger.debug("Update notification listener for Smooks configuration source '" + configurationSourceName + "' is now stopped!");
+		}
+
+		/**
+		 * Exception Listener.
+		 * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+		 */
+		private class ExceptionListener implements javax.jms.ExceptionListener {
+
+			/**
+			 * We want this listener to handle only one exception.
+			 * It will close all existing resources and create a new instance
+			 * once it successfully reconnects.
+			 */
+			private boolean hasHandledOneException = false;
+
+			/* (non-Javadoc)
+			 * @see javax.jms.ExceptionListener#onException(javax.jms.JMSException)
+			 */
+			public void onException(JMSException e) {
+				synchronized (ExceptionListener.class) {
+					if(!hasHandledOneException) {
+						logger.error("JMS Exception on Transformation Configuration Update Listener.", e);
+						close();
+						while(!connect()) {
+							try {
+								Thread.sleep(5000);
+							} catch (InterruptedException e1) {
+								logger.error("Interrupted during reconnect attempt.  Aborting reconnect!  Will need restart to reconnect.", e);
+							}
+						}
+						hasHandledOneException = true;
+					}
+				}
+			}
+		}
+    }
+
+}

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksService.java
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksService.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksService.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,66 +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, JBoss Inc.
- */
-package org.jboss.soa.esb.actions.converters;
-
-import org.jboss.system.ServiceMBeanSupport;
-import org.apache.log4j.Logger;
-
-import java.util.Properties;
-
-/**
- * SmooksService implementation.
- * <p/>
- * Initialises the "global" Smooks instance.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class SmooksService extends ServiceMBeanSupport implements SmooksServiceMBean {
-
-    private static Logger logger = Logger.getLogger(SmooksService.class);
-    private static SmooksInstanceManager globalSmooksInstanceManager;
-    private static final String CONSOLE_URL = "console.url";
-
-    protected void startService() throws Exception {
-        super.startService();
-
-        Properties smooksEsbConfig = new SmooksConfiguration();
-        String resourceConfig = smooksEsbConfig.getProperty(CONSOLE_URL);
-
-        if(resourceConfig != null) {
-            globalSmooksInstanceManager = new SmooksInstanceManager("Console", resourceConfig);
-            logger.info("Centralized Smooks Instance (Console Based) started.");
-        } else {
-            logger.info("Centralized Smooks Instance (Console Based) instance not started.  See the '" + CONSOLE_URL + "' property in '" + SmooksConfiguration.SMOOKS_ESB_PROPERTIES + "'");
-        }
-    }
-
-    protected void stopService() throws Exception {
-        if(globalSmooksInstanceManager != null) {
-            globalSmooksInstanceManager.close();
-            logger.info("Centralized Smooks Instance (Console Based) stopped.");
-        }
-        
-        super.stopService();
-    }
-
-    public static SmooksInstanceManager getGlobalSmooksInstanceManager() {
-        return globalSmooksInstanceManager;
-    }
-}

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksService.java (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksService.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksService.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksService.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,66 @@
+/*
+ * 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, JBoss Inc.
+ */
+package org.jboss.soa.esb.actions.converters;
+
+import org.jboss.system.ServiceMBeanSupport;
+import org.apache.log4j.Logger;
+
+import java.util.Properties;
+
+/**
+ * SmooksService implementation.
+ * <p/>
+ * Initialises the "global" Smooks instance.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class SmooksService extends ServiceMBeanSupport implements SmooksServiceMBean {
+
+    private static Logger logger = Logger.getLogger(SmooksService.class);
+    private static SmooksInstanceManager globalSmooksInstanceManager;
+    private static final String CONSOLE_URL = "console.url";
+
+    protected void startService() throws Exception {
+        super.startService();
+
+        Properties smooksEsbConfig = new SmooksConfiguration();
+        String resourceConfig = smooksEsbConfig.getProperty(CONSOLE_URL);
+
+        if(resourceConfig != null) {
+            globalSmooksInstanceManager = new SmooksInstanceManager("Console", resourceConfig);
+            logger.info("Centralized Smooks Instance (Console Based) started.");
+        } else {
+            logger.info("Centralized Smooks Instance (Console Based) instance not started.  See the '" + CONSOLE_URL + "' property in '" + SmooksConfiguration.SMOOKS_ESB_PROPERTIES + "'");
+        }
+    }
+
+    protected void stopService() throws Exception {
+        if(globalSmooksInstanceManager != null) {
+            globalSmooksInstanceManager.close();
+            logger.info("Centralized Smooks Instance (Console Based) stopped.");
+        }
+        
+        super.stopService();
+    }
+
+    public static SmooksInstanceManager getGlobalSmooksInstanceManager() {
+        return globalSmooksInstanceManager;
+    }
+}

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksServiceMBean.java
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksServiceMBean.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksServiceMBean.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,32 +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, JBoss Inc.
- */
-package org.jboss.soa.esb.actions.converters;
-
-import org.jboss.system.ServiceMBean;
-
-/**
- * Smooks Service MBean.
- * <p/>
- * Initialization MBean.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public interface SmooksServiceMBean extends ServiceMBean {
-}

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksServiceMBean.java (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksServiceMBean.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksServiceMBean.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksServiceMBean.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,32 @@
+/*
+ * 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, JBoss Inc.
+ */
+package org.jboss.soa.esb.actions.converters;
+
+import org.jboss.system.ServiceMBean;
+
+/**
+ * Smooks Service MBean.
+ * <p/>
+ * Initialization MBean.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public interface SmooksServiceMBean extends ServiceMBean {
+}

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,426 +0,0 @@
-package org.jboss.soa.esb.actions.converters;
-
-
-
-import java.io.ByteArrayInputStream;
-import java.util.*;
-
-import org.apache.log4j.Logger;
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.util.ClassUtil;
-import org.jboss.soa.esb.actions.ActionLifecycleException;
-import org.jboss.soa.esb.actions.ActionPipelineProcessor;
-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.helpers.KeyValuePair;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.services.transform.TransformationException;
-import org.jboss.soa.esb.services.transform.TransformationService;
-import org.milyn.Smooks;
-import org.milyn.SmooksUtil;
-import org.milyn.container.standalone.StandaloneExecutionContext;
-import org.milyn.javabean.BeanAccessor;
-import org.milyn.profile.DefaultProfileSet;
-import org.milyn.profile.ProfileStore;
-import org.milyn.profile.UnknownProfileMemberException;
-import org.milyn.resource.URIResourceLocator;
-
-/**
- * Smooks Transformer.
- * <p/>
- * This processor hooks the <a href="http://milyn.codehaus.org/Smooks">Milyn Smooks</a>
- * XML Transformation/Processing Engine into a message processing pipeline to support
- * non binary message transformations.
- * 
- * <h3>Action Configuration</h3>
- * This action works in one of 2 ways:
- * <ol>
- *      <li>Out of a Smooks resource configuration whose URL is specified directly on the action via the
- *          "resource-config" property.  If no URI scheme ("http", "file" etc) is specified on the
- *          resource config, the resource is assumed to reside on the local classpath.
- *      </li>
- *      <li>Out of a centralised Smooks resource configuration datasource managed by the Transformation Admin Console.
- *          This datasource is configured in the smooks.esb deployment.  See the "console.url" property in the
- *          "smooks.esb.properties" file.
- *      </li>
- * </ol>
- *
- * If both of the above are specified, the action will use the locally specified config defined on the "resource-config"
- * property.  If neither are specified, an error will result.
- *
- * <p/>
- * This transformer also supports Smooks profiles as follows: 
- * <pre>
- * &lt;action name="transformAB" class="<b>org.jboss.soa.esb.actions.converters.SmooksTransformer</b>"&gt;
- * 	&lt;property name="<b>from</b>" value="A" /&gt;
- * 	&lt;property name="<b>from-type</b>" value="text/xml:messageAtA" /&gt;
- * 	&lt;property name="<b>to</b>" value="B" /&gt;
- * 	&lt;property name="<b>to-type</b>" value="text/xml:messageAtB" /&gt;
- * &lt;/action&gt;
- * </pre>
- * 
- * <h3>Configuartion Loading &amp; Administration Console Integration</h3>
- * This class picks up its list of transformation resource configurations from a list file
- * specified in the "configuration.list.file.uri" parameter of the "transformation" 
- * section of the ESB configuration file.  This configuration
- * should specify a URI to this list file and is loaded using the {@link URIResourceLocator}.
- * The default list file is "classpath:/smooks-cdr.lst" (note classpath based URIs are supported).
- * <p/>  
- * This file contains a list of URIs that reference
- * <a href="http://milyn.codehaus.org/Smooks">Smooks</a> resource configurations files.
- * Again, {@link URIResourceLocator} is used to load these configurations.  "classpath:/"
- * is the default if no scheme is specified.  This is also where the Administration Console
- * is integrated with this class.  The list file needs to specify the following a HTTP based 
- * URI for accessing the configurations under management by the Administration console:
- * <pre>
- * 	http://localhost:8080/jboss-esb-console/transform/smooks-config.jsp
- * </pre>
- * ... where the host and port values need to be modified appropriately.
- * 
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- * @since Version 4.0
- */
-
-public class SmooksTransformer implements TransformationService, ActionPipelineProcessor {
-
-    /**
-     * Action config.
-     */
-    private ConfigTree actionConfig;
-	/**
-	 * Key for storing/accessing any potential message Body bean HashMaps as populated
-	 * by the Smooks Javabean Cartridge.
-	 */
-	public static final String EXTRACTED_BEANS_HASH = "EXTRACTED_BEANS_HASH";
-	/**
-	 * Config property key for setting a true/false flag to indicate whether or not
-	 * a bean hashs should be set as the message payload before exiting the process method.
-	 */
-	public static final String SET_BEANHASH_TO_PAYLOAD = "set-beanhash-to-payload";
-    /**
-     * Action config Smooks configuration key.
-     */
-    public static final String RESOURCE_CONFIG = "resource-config";
-    /**
-     * Config key for the message body location on which the input message is attached.
-     */
-    public static final String INPUT_LOCATION = "input-location";
-    /**
-     * Config key for the message body location on which the output message is attached.
-     */
-    public static final String OUTPUT_LOCATION = "output-location";
-
-	public static final String FROM = "from";
-	public static final String FROM_TYPE = "from-type";
-	public static final String TO = "to";
-	public static final String TO_TYPE = "to-type";
-    public static final String SMOOKS_CDRL_FILE="smooks-cdrl-file";
-    public static final String UPDATE_TOPIC="update-topic";
-	
-    private static Logger logger = Logger.getLogger(SmooksTransformer.class);
-    private SmooksInstanceManager smooksInstanceManager;
-    private String inputLocation;
-    private String outputLocation;
-    private String defaultMessageFromType;
-    private String defaultMessageFrom;
-    private String defaultMessageToType;
-    private String defaultMessageTo;
-    private boolean setPayloadToBeanHash = false;
-
-    /**
-     * Public constructor.
-     * @param propertiesTree Action Properties.
-     * @throws ConfigurationException 
-     * @throws ConfigurationException Action not properly configured.
-     */
-	public SmooksTransformer(ConfigTree propertiesTree) throws ConfigurationException {
-        List<KeyValuePair> properties = propertiesTree.attributesAsList();
-
-        inputLocation = KeyValuePair.getValue(INPUT_LOCATION, properties);
-        outputLocation = KeyValuePair.getValue(OUTPUT_LOCATION, properties);
-
-        // Get the default message flow properties (can be overriden by the message properties)...
-		defaultMessageFromType = KeyValuePair.getValue(FROM_TYPE, properties);
-		if(defaultMessageFromType != null && defaultMessageFromType.trim().equals("")) {
-			throw new ConfigurationException("Empty '" + FROM_TYPE + "' config attribute supplied.");
-		}
-		defaultMessageToType = KeyValuePair.getValue(TO_TYPE, properties);
-		if(defaultMessageToType != null && defaultMessageToType.trim().equals("")) {
-			throw new ConfigurationException("Empty '" + TO_TYPE + "' config attribute supplied.");
-		}
-		defaultMessageFrom = KeyValuePair.getValue(FROM, properties);
-		if(defaultMessageFrom != null && defaultMessageFrom.trim().equals("")) {
-			throw new ConfigurationException("Empty '" + FROM + "' config attribute supplied.");
-		}
-		defaultMessageTo = KeyValuePair.getValue(TO, properties);
-		if(defaultMessageTo != null && defaultMessageTo.trim().equals("")) {
-			throw new ConfigurationException("Empty '" + TO + "' config attribute supplied.");
-		}
-
-        // Get the set-beanhash-to-payload property...
-		setPayloadToBeanHash = KeyValuePair.getBooleanValue(SET_BEANHASH_TO_PAYLOAD, properties, false);
-
-        actionConfig = propertiesTree;
-    }
-
-    /**
-     * Initialise the Smooks instance.
-     * @throws ActionLifecycleException Failed to load Smooks configurations.
-     */
-    public void initialise() throws ActionLifecycleException {
-        String resourceConfig = actionConfig.getAttribute(RESOURCE_CONFIG);
-
-        // If there's a Smooks resource config specified on the action config, this instance
-        // of the SmooksTransformer will use that configuration.  Otherwise there needs to be a
-        // centralised (console based) config specified in the smooks.esb.properties. If not,
-        // we have an error!
-        if(resourceConfig != null) {
-            initialiseLocalSmooksInstanceManager(resourceConfig);
-        } else {
-            smooksInstanceManager = SmooksService.getGlobalSmooksInstanceManager();
-        }
-
-        if(smooksInstanceManager == null) {
-            throw new ActionLifecycleException("Invalid " + getClass().getSimpleName() + " action configuration.  No 'resource-config' specified on the action and no centralised console config available (see smooks.esb.properties).");
-        }
-
-        logger.info("Smooks configurations are now loaded.");
-    }
-
-    private void initialiseLocalSmooksInstanceManager(String resourceConfig) {
-        String actionName = actionConfig.getAttribute("action");
-        SmooksConfiguration smooksEsbConfig = new SmooksConfiguration();
-        String baseConfigs = smooksEsbConfig.getProperty("smooks.base.configs", "creators.xml");
-        Smooks smooks;                                                                          
-
-        smooksInstanceManager = new SmooksInstanceManager(actionName, resourceConfig);
-        smooks = smooksInstanceManager.getSmooksInstance();
-
-        String[] resources = baseConfigs.split(",");
-        if(logger.isDebugEnabled()) {
-            logger.debug("smooks-base-configs: " + Arrays.asList(resources));
-        }
-        for(String resource : resources) {
-            try {
-                SmooksUtil.registerResources(resource, ClassUtil.getResourceAsStream("/smooks-base-configs/" + resource.trim(), getClass()), smooks);
-            } catch(Throwable t) {
-                // ignore
-            }
-        }
-    }
-
-    public void destroy() throws ActionLifecycleException {
-    }
-
-	/* (non-Javadoc)
-	 * @see org.jboss.soa.esb.services.transform.TransformationService#transform(org.jboss.soa.esb.message.Message)
-	 */
-	public Message transform(Message message) throws TransformationException {
-		try {
-			return process(message);
-		} catch (ActionProcessingException e) {
-			throw new TransformationException(e);
-		}
-	}
-
-    /* (non-Javadoc)
-     * @see org.jboss.soa.esb.actions.ActionProcessor#process(java.lang.Object)
-     */
-    public Message process(Message message) throws ActionProcessingException {
-        if(smooksInstanceManager == null) {
-            logger.warn("SmooksTransformer instance is decommisioned.  Probably due to a bad action configuration. Not performing transformation on this message.");
-            return message;
-        }
-
-        Object payload = message.getBody().get(inputLocation);
-
-        if(payload == null) {
-            payload = ActionUtils.getTaskObject(message);
-        }
-    	
-        try {
-        	if(payload instanceof byte[]) {
-        		payload = new String((byte[])payload, "UTF-8");
-        	}
-
-            if(payload == null) {
-                logger.warn("Null message payload.  Returning message unmodified.");
-            } else if(payload instanceof String) {
-	            byte[] messageBytes = null;
-	            String transformedMessage;
-
-                messageBytes = ((String)payload).getBytes("UTF-8");
-	
-	            long start = System.currentTimeMillis();
-                Smooks smooks = smooksInstanceManager.getSmooksInstance();
-                StandaloneExecutionContext executionContext;
-                String messageProfile;
-
-                // Register the message profile with Smooks (if there is one and it's not already registered)...
-                messageProfile = registerMessageProfile(message, smooks);
-
-	            // Filter and Serialise...
-                if(messageProfile == null) {
-                    // Not using profiles on this transformation.
-                    executionContext = smooks.createExecutionContext();
-                } else {
-                    executionContext = smooks.createExecutionContext(messageProfile);
-                }
-                transformedMessage = SmooksUtil.filterAndSerialize(executionContext, new ByteArrayInputStream( messageBytes), smooks);
-	            
-	            // Javabean cartridge resources may have extract data from the message and populated some beans.
-	            // Get them and stick them on the message - so they can be accessed by downstream actions...
-	            HashMap beanHash = BeanAccessor.getBeans(executionContext);
-	            if(beanHash != null) {
-	            	message.getBody().add(EXTRACTED_BEANS_HASH, beanHash);
-	            }
-	            
-	            if(logger.isDebugEnabled()) {
-	            	long timeTaken = System.currentTimeMillis() - start;
-	            	logger.debug("Transformed message for profile [" + messageProfile + "]. Time taken: "
-	            			+ timeTaken + ".  Message in:\n[" + payload.toString()+ "].  \nMessage out:\n[" + transformedMessage + "].");
-	            }
-
-                Object outputPayload;
-                if(beanHash != null && setPayloadToBeanHash) {
-	            	outputPayload = beanHash;
-	            } else {
-	            	ActionUtils.setTaskObject(message, transformedMessage);
-	            	outputPayload = transformedMessage;
-	            }
-
-                message.getBody().add(outputLocation, outputPayload);
-            } else {
-	            logger.warn("Only java.lang.String payload types supported.  Input message was of type [" + payload.getClass().getName() + "].  Returning message untransformed.");
-	        }
-    	} catch(Throwable thrown) {
-    		thrown.printStackTrace();
-    		throw new ActionProcessingException("Message transformation failed.", thrown);
-    	}
-        
-        // TODO: Cater for more message input types e.g. InputStream, DOM Document...
-        // TODO: Cater for more message output types e.g. InputStream, DOM Document...
-    	
-    	return message;
-    }
-
-    /**
-	 * Register the Message Exchange as a profile within Smooks.
-	 * @param message The message.
-	 * @param smooks The Smooks instance.
-     * @return The Smooks "profile" string that uniquely identifies the message flow associated
-	 * with the message.
-	 * @throws ActionProcessingException Failed to register the message flow for the message.
-	 */
-	private String registerMessageProfile(Message message, Smooks smooks) throws ActionProcessingException {
-		String messageProfile;
-    	String messageFromType;
-        String messageFrom;
-        String messageToType;
-        String messageTo;
-
-        // Get the routing info from the message...
-        messageFrom = (String)message.getProperties().getProperty(FROM, defaultMessageFrom);
-        messageTo = (String)message.getProperties().getProperty(TO, defaultMessageTo);
-        
-        // Get the message typing info from the message...
-		messageFromType = (String)message.getProperties().getProperty(FROM_TYPE, defaultMessageFromType);
-		messageToType = (String)message.getProperties().getProperty(TO_TYPE, defaultMessageToType);
-		
-		// Construct the message profile string for use with Smooks.  This is basically the 
-		// name of the Message Exchange on which transformations are to be performed...
-        messageProfile = getMessageProfileString(messageFromType, messageFrom, messageToType, messageTo);
-
-        // If this transformation instance requires profiling, make sure the profile is registered on the
-        // Smooks instance.
-        if(messageProfile != null) {
-            // Register this message flow if it isn't already registered...
-            try {
-                ProfileStore profileStore = smooks.getApplicationContext().getProfileStore();
-                profileStore.getProfileSet(messageProfile);
-            } catch(UnknownProfileMemberException e) {
-                String[] profiles = getMessageProfiles(messageFromType, messageFrom, messageToType, messageTo);
-
-                synchronized (SmooksTransformer.class) {
-                    // Register the message flow within the Smooks context....
-                    logger.info("Registering JBoss ESB Message-Exchange as Smooks Profile: [" + messageProfile + "].  Profiles: [" + Arrays.asList(profiles) + "]");
-                    SmooksUtil.registerProfileSet(DefaultProfileSet.create( messageProfile, profiles ), smooks);
-                }
-            }
-        }
-        
-        return messageProfile;
-	}
-
-    /**
-     * Get the profile list based on the supplied message flow properties.
-	 * @param messageFromType The type string for the message source.
-	 * @param messageFrom The Message Exchange Participant name for the message source.
-	 * @param messageToType The type string for the message target.
-	 * @param messageTo The Message Exchange Participant name for the message target.
-	 * @return The list of profiles.
-	 */
-	protected static String[] getMessageProfiles(String messageFromType, String messageFrom, String messageToType, String messageTo) {
-		List<String> profiles = new ArrayList<String>();
-		String[] profileArray;
-		
-		if(messageFromType != null) {
-			profiles.add(FROM_TYPE + ":" + messageFromType);
-		}
-		if(messageFrom != null) {
-			profiles.add(FROM + ":" + messageFrom);
-		}
-		if(messageToType != null) {
-			profiles.add(TO_TYPE + ":" + messageToType);
-		}
-		if(messageTo != null) {
-			profiles.add(TO + ":" + messageTo);
-		}
-		
-		profileArray = new String[profiles.size()];
-		profiles.toArray(profileArray);
-
-		return profileArray;
-	}
-
-	/**
-	 * Construct the Smooks profile string based on the supplied message flow properties.
-	 * @param messageFromType The type string for the message source.
-	 * @param messageFrom The EPR string for the message source.
-	 * @param messageToType The type string for the message target.
-	 * @param messageTo The EPR srting for the message target.
-	 * @return Smooks profile string for the message flow.
-	 */
-	protected static String getMessageProfileString(String messageFromType, String messageFrom, String messageToType, String messageTo) {
-		StringBuffer string = new StringBuffer();
-		
-		if(messageFromType != null) {
-			string.append(FROM_TYPE + ":" + messageFromType);
-			string.append((messageFrom!=null || messageToType!=null || messageTo!=null?":":""));
-		}
-		if(messageFrom != null) {
-			string.append(FROM + ":" + messageFrom);
-			string.append((messageToType!=null || messageTo!=null?":":""));
-		}
-		if(messageToType != null) {
-			string.append(TO_TYPE + ":" + messageToType);
-			string.append((messageTo!=null?":":""));
-		}
-		if(messageTo != null) {
-			string.append(TO + ":" + messageTo);
-		}
-
-        if(string.length() == 0) {
-            return null;
-        }
-
-        return string.toString();
-	}
-
-    public void processException(final Message message, final Throwable th) {
-    }
-
-    public void processSuccess(final Message message) {
-    }
-}

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,426 @@
+package org.jboss.soa.esb.actions.converters;
+
+
+
+import java.io.ByteArrayInputStream;
+import java.util.*;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.util.ClassUtil;
+import org.jboss.soa.esb.actions.ActionLifecycleException;
+import org.jboss.soa.esb.actions.ActionPipelineProcessor;
+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.helpers.KeyValuePair;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.services.transform.TransformationException;
+import org.jboss.soa.esb.services.transform.TransformationService;
+import org.milyn.Smooks;
+import org.milyn.SmooksUtil;
+import org.milyn.container.standalone.StandaloneExecutionContext;
+import org.milyn.javabean.BeanAccessor;
+import org.milyn.profile.DefaultProfileSet;
+import org.milyn.profile.ProfileStore;
+import org.milyn.profile.UnknownProfileMemberException;
+import org.milyn.resource.URIResourceLocator;
+
+/**
+ * Smooks Transformer.
+ * <p/>
+ * This processor hooks the <a href="http://milyn.codehaus.org/Smooks">Milyn Smooks</a>
+ * XML Transformation/Processing Engine into a message processing pipeline to support
+ * non binary message transformations.
+ * 
+ * <h3>Action Configuration</h3>
+ * This action works in one of 2 ways:
+ * <ol>
+ *      <li>Out of a Smooks resource configuration whose URL is specified directly on the action via the
+ *          "resource-config" property.  If no URI scheme ("http", "file" etc) is specified on the
+ *          resource config, the resource is assumed to reside on the local classpath.
+ *      </li>
+ *      <li>Out of a centralised Smooks resource configuration datasource managed by the Transformation Admin Console.
+ *          This datasource is configured in the smooks.esb deployment.  See the "console.url" property in the
+ *          "smooks.esb.properties" file.
+ *      </li>
+ * </ol>
+ *
+ * If both of the above are specified, the action will use the locally specified config defined on the "resource-config"
+ * property.  If neither are specified, an error will result.
+ *
+ * <p/>
+ * This transformer also supports Smooks profiles as follows: 
+ * <pre>
+ * &lt;action name="transformAB" class="<b>org.jboss.soa.esb.actions.converters.SmooksTransformer</b>"&gt;
+ * 	&lt;property name="<b>from</b>" value="A" /&gt;
+ * 	&lt;property name="<b>from-type</b>" value="text/xml:messageAtA" /&gt;
+ * 	&lt;property name="<b>to</b>" value="B" /&gt;
+ * 	&lt;property name="<b>to-type</b>" value="text/xml:messageAtB" /&gt;
+ * &lt;/action&gt;
+ * </pre>
+ * 
+ * <h3>Configuartion Loading &amp; Administration Console Integration</h3>
+ * This class picks up its list of transformation resource configurations from a list file
+ * specified in the "configuration.list.file.uri" parameter of the "transformation" 
+ * section of the ESB configuration file.  This configuration
+ * should specify a URI to this list file and is loaded using the {@link URIResourceLocator}.
+ * The default list file is "classpath:/smooks-cdr.lst" (note classpath based URIs are supported).
+ * <p/>  
+ * This file contains a list of URIs that reference
+ * <a href="http://milyn.codehaus.org/Smooks">Smooks</a> resource configurations files.
+ * Again, {@link URIResourceLocator} is used to load these configurations.  "classpath:/"
+ * is the default if no scheme is specified.  This is also where the Administration Console
+ * is integrated with this class.  The list file needs to specify the following a HTTP based 
+ * URI for accessing the configurations under management by the Administration console:
+ * <pre>
+ * 	http://localhost:8080/jboss-esb-console/transform/smooks-config.jsp
+ * </pre>
+ * ... where the host and port values need to be modified appropriately.
+ * 
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ * @since Version 4.0
+ */
+
+public class SmooksTransformer implements TransformationService, ActionPipelineProcessor {
+
+    /**
+     * Action config.
+     */
+    private ConfigTree actionConfig;
+	/**
+	 * Key for storing/accessing any potential message Body bean HashMaps as populated
+	 * by the Smooks Javabean Cartridge.
+	 */
+	public static final String EXTRACTED_BEANS_HASH = "EXTRACTED_BEANS_HASH";
+	/**
+	 * Config property key for setting a true/false flag to indicate whether or not
+	 * a bean hashs should be set as the message payload before exiting the process method.
+	 */
+	public static final String SET_BEANHASH_TO_PAYLOAD = "set-beanhash-to-payload";
+    /**
+     * Action config Smooks configuration key.
+     */
+    public static final String RESOURCE_CONFIG = "resource-config";
+    /**
+     * Config key for the message body location on which the input message is attached.
+     */
+    public static final String INPUT_LOCATION = "input-location";
+    /**
+     * Config key for the message body location on which the output message is attached.
+     */
+    public static final String OUTPUT_LOCATION = "output-location";
+
+	public static final String FROM = "from";
+	public static final String FROM_TYPE = "from-type";
+	public static final String TO = "to";
+	public static final String TO_TYPE = "to-type";
+    public static final String SMOOKS_CDRL_FILE="smooks-cdrl-file";
+    public static final String UPDATE_TOPIC="update-topic";
+	
+    private static Logger logger = Logger.getLogger(SmooksTransformer.class);
+    private SmooksInstanceManager smooksInstanceManager;
+    private String inputLocation;
+    private String outputLocation;
+    private String defaultMessageFromType;
+    private String defaultMessageFrom;
+    private String defaultMessageToType;
+    private String defaultMessageTo;
+    private boolean setPayloadToBeanHash = false;
+
+    /**
+     * Public constructor.
+     * @param propertiesTree Action Properties.
+     * @throws ConfigurationException 
+     * @throws ConfigurationException Action not properly configured.
+     */
+	public SmooksTransformer(ConfigTree propertiesTree) throws ConfigurationException {
+        List<KeyValuePair> properties = propertiesTree.attributesAsList();
+
+        inputLocation = KeyValuePair.getValue(INPUT_LOCATION, properties);
+        outputLocation = KeyValuePair.getValue(OUTPUT_LOCATION, properties);
+
+        // Get the default message flow properties (can be overriden by the message properties)...
+		defaultMessageFromType = KeyValuePair.getValue(FROM_TYPE, properties);
+		if(defaultMessageFromType != null && defaultMessageFromType.trim().equals("")) {
+			throw new ConfigurationException("Empty '" + FROM_TYPE + "' config attribute supplied.");
+		}
+		defaultMessageToType = KeyValuePair.getValue(TO_TYPE, properties);
+		if(defaultMessageToType != null && defaultMessageToType.trim().equals("")) {
+			throw new ConfigurationException("Empty '" + TO_TYPE + "' config attribute supplied.");
+		}
+		defaultMessageFrom = KeyValuePair.getValue(FROM, properties);
+		if(defaultMessageFrom != null && defaultMessageFrom.trim().equals("")) {
+			throw new ConfigurationException("Empty '" + FROM + "' config attribute supplied.");
+		}
+		defaultMessageTo = KeyValuePair.getValue(TO, properties);
+		if(defaultMessageTo != null && defaultMessageTo.trim().equals("")) {
+			throw new ConfigurationException("Empty '" + TO + "' config attribute supplied.");
+		}
+
+        // Get the set-beanhash-to-payload property...
+		setPayloadToBeanHash = KeyValuePair.getBooleanValue(SET_BEANHASH_TO_PAYLOAD, properties, false);
+
+        actionConfig = propertiesTree;
+    }
+
+    /**
+     * Initialise the Smooks instance.
+     * @throws ActionLifecycleException Failed to load Smooks configurations.
+     */
+    public void initialise() throws ActionLifecycleException {
+        String resourceConfig = actionConfig.getAttribute(RESOURCE_CONFIG);
+
+        // If there's a Smooks resource config specified on the action config, this instance
+        // of the SmooksTransformer will use that configuration.  Otherwise there needs to be a
+        // centralised (console based) config specified in the smooks.esb.properties. If not,
+        // we have an error!
+        if(resourceConfig != null) {
+            initialiseLocalSmooksInstanceManager(resourceConfig);
+        } else {
+            smooksInstanceManager = SmooksService.getGlobalSmooksInstanceManager();
+        }
+
+        if(smooksInstanceManager == null) {
+            throw new ActionLifecycleException("Invalid " + getClass().getSimpleName() + " action configuration.  No 'resource-config' specified on the action and no centralised console config available (see smooks.esb.properties).");
+        }
+
+        logger.info("Smooks configurations are now loaded.");
+    }
+
+    private void initialiseLocalSmooksInstanceManager(String resourceConfig) {
+        String actionName = actionConfig.getAttribute("action");
+        SmooksConfiguration smooksEsbConfig = new SmooksConfiguration();
+        String baseConfigs = smooksEsbConfig.getProperty("smooks.base.configs", "creators.xml");
+        Smooks smooks;                                                                          
+
+        smooksInstanceManager = new SmooksInstanceManager(actionName, resourceConfig);
+        smooks = smooksInstanceManager.getSmooksInstance();
+
+        String[] resources = baseConfigs.split(",");
+        if(logger.isDebugEnabled()) {
+            logger.debug("smooks-base-configs: " + Arrays.asList(resources));
+        }
+        for(String resource : resources) {
+            try {
+                SmooksUtil.registerResources(resource, ClassUtil.getResourceAsStream("/smooks-base-configs/" + resource.trim(), getClass()), smooks);
+            } catch(Throwable t) {
+                // ignore
+            }
+        }
+    }
+
+    public void destroy() throws ActionLifecycleException {
+    }
+
+	/* (non-Javadoc)
+	 * @see org.jboss.soa.esb.services.transform.TransformationService#transform(org.jboss.soa.esb.message.Message)
+	 */
+	public Message transform(Message message) throws TransformationException {
+		try {
+			return process(message);
+		} catch (ActionProcessingException e) {
+			throw new TransformationException(e);
+		}
+	}
+
+    /* (non-Javadoc)
+     * @see org.jboss.soa.esb.actions.ActionProcessor#process(java.lang.Object)
+     */
+    public Message process(Message message) throws ActionProcessingException {
+        if(smooksInstanceManager == null) {
+            logger.warn("SmooksTransformer instance is decommisioned.  Probably due to a bad action configuration. Not performing transformation on this message.");
+            return message;
+        }
+
+        Object payload = message.getBody().get(inputLocation);
+
+        if(payload == null) {
+            payload = ActionUtils.getTaskObject(message);
+        }
+    	
+        try {
+        	if(payload instanceof byte[]) {
+        		payload = new String((byte[])payload, "UTF-8");
+        	}
+
+            if(payload == null) {
+                logger.warn("Null message payload.  Returning message unmodified.");
+            } else if(payload instanceof String) {
+	            byte[] messageBytes = null;
+	            String transformedMessage;
+
+                messageBytes = ((String)payload).getBytes("UTF-8");
+	
+	            long start = System.currentTimeMillis();
+                Smooks smooks = smooksInstanceManager.getSmooksInstance();
+                StandaloneExecutionContext executionContext;
+                String messageProfile;
+
+                // Register the message profile with Smooks (if there is one and it's not already registered)...
+                messageProfile = registerMessageProfile(message, smooks);
+
+	            // Filter and Serialise...
+                if(messageProfile == null) {
+                    // Not using profiles on this transformation.
+                    executionContext = smooks.createExecutionContext();
+                } else {
+                    executionContext = smooks.createExecutionContext(messageProfile);
+                }
+                transformedMessage = SmooksUtil.filterAndSerialize(executionContext, new ByteArrayInputStream( messageBytes), smooks);
+	            
+	            // Javabean cartridge resources may have extract data from the message and populated some beans.
+	            // Get them and stick them on the message - so they can be accessed by downstream actions...
+	            HashMap beanHash = BeanAccessor.getBeans(executionContext);
+	            if(beanHash != null) {
+	            	message.getBody().add(EXTRACTED_BEANS_HASH, beanHash);
+	            }
+	            
+	            if(logger.isDebugEnabled()) {
+	            	long timeTaken = System.currentTimeMillis() - start;
+	            	logger.debug("Transformed message for profile [" + messageProfile + "]. Time taken: "
+	            			+ timeTaken + ".  Message in:\n[" + payload.toString()+ "].  \nMessage out:\n[" + transformedMessage + "].");
+	            }
+
+                Object outputPayload;
+                if(beanHash != null && setPayloadToBeanHash) {
+	            	outputPayload = beanHash;
+	            } else {
+	            	ActionUtils.setTaskObject(message, transformedMessage);
+	            	outputPayload = transformedMessage;
+	            }
+
+                message.getBody().add(outputLocation, outputPayload);
+            } else {
+	            logger.warn("Only java.lang.String payload types supported.  Input message was of type [" + payload.getClass().getName() + "].  Returning message untransformed.");
+	        }
+    	} catch(Throwable thrown) {
+    		thrown.printStackTrace();
+    		throw new ActionProcessingException("Message transformation failed.", thrown);
+    	}
+        
+        // TODO: Cater for more message input types e.g. InputStream, DOM Document...
+        // TODO: Cater for more message output types e.g. InputStream, DOM Document...
+    	
+    	return message;
+    }
+
+    /**
+	 * Register the Message Exchange as a profile within Smooks.
+	 * @param message The message.
+	 * @param smooks The Smooks instance.
+     * @return The Smooks "profile" string that uniquely identifies the message flow associated
+	 * with the message.
+	 * @throws ActionProcessingException Failed to register the message flow for the message.
+	 */
+	private String registerMessageProfile(Message message, Smooks smooks) throws ActionProcessingException {
+		String messageProfile;
+    	String messageFromType;
+        String messageFrom;
+        String messageToType;
+        String messageTo;
+
+        // Get the routing info from the message...
+        messageFrom = (String)message.getProperties().getProperty(FROM, defaultMessageFrom);
+        messageTo = (String)message.getProperties().getProperty(TO, defaultMessageTo);
+        
+        // Get the message typing info from the message...
+		messageFromType = (String)message.getProperties().getProperty(FROM_TYPE, defaultMessageFromType);
+		messageToType = (String)message.getProperties().getProperty(TO_TYPE, defaultMessageToType);
+		
+		// Construct the message profile string for use with Smooks.  This is basically the 
+		// name of the Message Exchange on which transformations are to be performed...
+        messageProfile = getMessageProfileString(messageFromType, messageFrom, messageToType, messageTo);
+
+        // If this transformation instance requires profiling, make sure the profile is registered on the
+        // Smooks instance.
+        if(messageProfile != null) {
+            // Register this message flow if it isn't already registered...
+            try {
+                ProfileStore profileStore = smooks.getApplicationContext().getProfileStore();
+                profileStore.getProfileSet(messageProfile);
+            } catch(UnknownProfileMemberException e) {
+                String[] profiles = getMessageProfiles(messageFromType, messageFrom, messageToType, messageTo);
+
+                synchronized (SmooksTransformer.class) {
+                    // Register the message flow within the Smooks context....
+                    logger.info("Registering JBoss ESB Message-Exchange as Smooks Profile: [" + messageProfile + "].  Profiles: [" + Arrays.asList(profiles) + "]");
+                    SmooksUtil.registerProfileSet(DefaultProfileSet.create( messageProfile, profiles ), smooks);
+                }
+            }
+        }
+        
+        return messageProfile;
+	}
+
+    /**
+     * Get the profile list based on the supplied message flow properties.
+	 * @param messageFromType The type string for the message source.
+	 * @param messageFrom The Message Exchange Participant name for the message source.
+	 * @param messageToType The type string for the message target.
+	 * @param messageTo The Message Exchange Participant name for the message target.
+	 * @return The list of profiles.
+	 */
+	protected static String[] getMessageProfiles(String messageFromType, String messageFrom, String messageToType, String messageTo) {
+		List<String> profiles = new ArrayList<String>();
+		String[] profileArray;
+		
+		if(messageFromType != null) {
+			profiles.add(FROM_TYPE + ":" + messageFromType);
+		}
+		if(messageFrom != null) {
+			profiles.add(FROM + ":" + messageFrom);
+		}
+		if(messageToType != null) {
+			profiles.add(TO_TYPE + ":" + messageToType);
+		}
+		if(messageTo != null) {
+			profiles.add(TO + ":" + messageTo);
+		}
+		
+		profileArray = new String[profiles.size()];
+		profiles.toArray(profileArray);
+
+		return profileArray;
+	}
+
+	/**
+	 * Construct the Smooks profile string based on the supplied message flow properties.
+	 * @param messageFromType The type string for the message source.
+	 * @param messageFrom The EPR string for the message source.
+	 * @param messageToType The type string for the message target.
+	 * @param messageTo The EPR srting for the message target.
+	 * @return Smooks profile string for the message flow.
+	 */
+	protected static String getMessageProfileString(String messageFromType, String messageFrom, String messageToType, String messageTo) {
+		StringBuffer string = new StringBuffer();
+		
+		if(messageFromType != null) {
+			string.append(FROM_TYPE + ":" + messageFromType);
+			string.append((messageFrom!=null || messageToType!=null || messageTo!=null?":":""));
+		}
+		if(messageFrom != null) {
+			string.append(FROM + ":" + messageFrom);
+			string.append((messageToType!=null || messageTo!=null?":":""));
+		}
+		if(messageToType != null) {
+			string.append(TO_TYPE + ":" + messageToType);
+			string.append((messageTo!=null?":":""));
+		}
+		if(messageTo != null) {
+			string.append(TO + ":" + messageTo);
+		}
+
+        if(string.length() == 0) {
+            return null;
+        }
+
+        return string.toString();
+	}
+
+    public void processException(final Message message, final Throwable th) {
+    }
+
+    public void processSuccess(final Message message) {
+    }
+}

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main/resources)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/META-INF (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main/resources/META-INF)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/META-INF/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/resources/META-INF/deployment.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/META-INF/deployment.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbossesb-deployment>
-  <depends>jboss.esb.destination:service=Topic,name=org.jboss.soa.esb.transformation.Update</depends>
-</jbossesb-deployment>

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/META-INF/deployment.xml (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main/resources/META-INF/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/META-INF/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/META-INF/deployment.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbossesb-deployment>
+  <depends>jboss.esb.destination:service=Topic,name=org.jboss.soa.esb.transformation.Update</depends>
+</jbossesb-deployment>

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/resources/META-INF/jboss-esb.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/META-INF/jboss-esb.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,6 +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">
-     <!--
-     		jbossesb internal services 
-     -->
-</jbossesb>

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/META-INF/jboss-esb.xml (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main/resources/META-INF/jboss-esb.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/META-INF/jboss-esb.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/META-INF/jboss-esb.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,6 @@
+<?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">
+     <!--
+     		jbossesb internal services 
+     -->
+</jbossesb>

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/resources/jbm-queue-service.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-    <mbean code="org.jboss.jms.server.destination.TopicService"
-           name="jboss.esb.destination:service=Topic,name=org.jboss.soa.esb.transformation.Update"
-           xmbean-dd="xmdesc/Queue-xmbean.xml">
-        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-    </mbean>
-</server>

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/jbm-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main/resources/jbm-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/jbm-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/jbm-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.jms.server.destination.TopicService"
+           name="jboss.esb.destination:service=Topic,name=org.jboss.soa.esb.transformation.Update"
+           xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+    </mbean>
+</server>

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/resources/jbmq-queue-service.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/jbmq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-    <mbean code="org.jboss.mq.server.jmx.Topic"
-           name="jboss.esb.destination:service=Topic,name=org.jboss.soa.esb.transformation.Update">
-        <depends optional-attribute-name="DestinationManager">
-            jboss.mq:service=DestinationManager
-        </depends>
-    </mbean>
-</server>

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/jbmq-queue-service.xml (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main/resources/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/jbmq-queue-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.mq.server.jmx.Topic"
+           name="jboss.esb.destination:service=Topic,name=org.jboss.soa.esb.transformation.Update">
+        <depends optional-attribute-name="DestinationManager">
+            jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+</server>

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks-base-configs (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks-base-configs)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks-base-configs/creators.xml
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks-base-configs/creators.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks-base-configs/creators.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd" default-selector="cdu-creator">
-
-    <!--
-         All .st (*.st) resources will be treated as StringTemplate templates and
-         will be handled by the StringTemplateContentDeliveryUnitCreator.
-     -->
-    <resource-config>
-        <resource type="class">org.milyn.templating.stringtemplate.StringTemplateContentDeliveryUnitCreator</resource>
-        <param name="restype">st</param>
-    </resource-config>
-
-    <!--
-         All .xsl (*.xsl) resources will be treated as XSL templates and
-         will be handled by the XslContentDeliveryUnitCreator.
-     -->
-    <resource-config>
-        <resource type="class">org.milyn.templating.xslt.XslContentDeliveryUnitCreator</resource>
-        <param name="restype">xsl</param>
-    </resource-config>
-
-    <!--
-        Groovy Scripting Support.
-    -->
-    <resource-config>
-        <resource type="class">org.milyn.smooks.scripting.GroovyContentDeliveryUnitCreator</resource>
-        <param name="restype">groovy</param>
-    </resource-config>
-
-</smooks-resource-list>
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks-base-configs/creators.xml (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks-base-configs/creators.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks-base-configs/creators.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks-base-configs/creators.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd" default-selector="cdu-creator">
+
+    <!--
+         All .st (*.st) resources will be treated as StringTemplate templates and
+         will be handled by the StringTemplateContentDeliveryUnitCreator.
+     -->
+    <resource-config>
+        <resource type="class">org.milyn.templating.stringtemplate.StringTemplateContentDeliveryUnitCreator</resource>
+        <param name="restype">st</param>
+    </resource-config>
+
+    <!--
+         All .xsl (*.xsl) resources will be treated as XSL templates and
+         will be handled by the XslContentDeliveryUnitCreator.
+     -->
+    <resource-config>
+        <resource type="class">org.milyn.templating.xslt.XslContentDeliveryUnitCreator</resource>
+        <param name="restype">xsl</param>
+    </resource-config>
+
+    <!--
+        Groovy Scripting Support.
+    -->
+    <resource-config>
+        <resource type="class">org.milyn.smooks.scripting.GroovyContentDeliveryUnitCreator</resource>
+        <param name="restype">groovy</param>
+    </resource-config>
+
+</smooks-resource-list>
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks-service.xml
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks-service.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<service>
-    <mbean code="org.jboss.soa.esb.actions.converters.SmooksService"
-           name="jboss.esb:service=SmooksService">
-        <depends>jboss.esb.destination:service=Topic,name=org.jboss.soa.esb.transformation.Update</depends>
-    </mbean>
-</service>

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks-service.xml (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks-service.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service>
+    <mbean code="org.jboss.soa.esb.actions.converters.SmooksService"
+           name="jboss.esb:service=SmooksService">
+        <depends>jboss.esb.destination:service=Topic,name=org.jboss.soa.esb.transformation.Update</depends>
+    </mbean>
+</service>

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks.esb.properties
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks.esb.properties	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks.esb.properties	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,35 +0,0 @@
-####################################################################################
-# Configure in the following property to enable config loading
-# from the Transformation Admin Console.
-####################################################################################
-#console.url=http://localhost:8080/jboss-esb-console/transform/smooks-config.jsp
-
-####################################################################################
-#
-# Base configurations.  Added for all non-console based Smooks instances.
-# Value is comma-separated-list.  All resources must be in the "smooks-base-configs"
-# folder of this .esb.
-# 
-####################################################################################
-smooks.base.configs=creators.xml
-
-####################################################################################
-#
-# Context properties.
-#
-# Defaults to JBoss AS on localhost.
-# 
-####################################################################################
-java.naming.provider.url=localhost
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=
-
-####################################################################################
-#
-# JMS properties.
-#
-# Provider defaults to JBoss MQ.
-# 
-####################################################################################
-javax.jms.ConnectionFactory=ConnectionFactory
-update.notification.topic=topic/org.jboss.soa.esb.transformation.Update
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks.esb.properties (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks.esb.properties)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks.esb.properties	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/resources/smooks.esb.properties	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,35 @@
+####################################################################################
+# Configure in the following property to enable config loading
+# from the Transformation Admin Console.
+####################################################################################
+#console.url=http://localhost:8080/jboss-esb-console/transform/smooks-config.jsp
+
+####################################################################################
+#
+# Base configurations.  Added for all non-console based Smooks instances.
+# Value is comma-separated-list.  All resources must be in the "smooks-base-configs"
+# folder of this .esb.
+# 
+####################################################################################
+smooks.base.configs=creators.xml
+
+####################################################################################
+#
+# Context properties.
+#
+# Defaults to JBoss AS on localhost.
+# 
+####################################################################################
+java.naming.provider.url=localhost
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=
+
+####################################################################################
+#
+# JMS properties.
+#
+# Provider defaults to JBoss MQ.
+# 
+####################################################################################
+javax.jms.ConnectionFactory=ConnectionFactory
+update.notification.topic=topic/org.jboss.soa.esb.transformation.Update
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/test)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/test/java)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/test/java/org)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/jboss (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/test/java/org/jboss)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/jboss/soa (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/test/java/org/jboss/soa)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/jboss/soa/esb (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/test/java/org/jboss/soa/esb)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/jboss/soa/esb/actions (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/test/java/org/jboss/soa/esb/actions)

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/converters (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/converters)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,151 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.soa.esb.actions.converters;
-
-
-import java.net.URISyntaxException;
-
-import junit.framework.TestCase;
-
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.actions.ActionLifecycleException;
-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.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-
-/**
- * SmooksTransformer unit tests.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- * @since Version 4.0
- */
-public class SmooksTransformerUnitTest extends TestCase {
-
-    public void test_bad_config() {
-        ConfigTree properties = new ConfigTree("name");
-
-        properties.setAttribute(SmooksTransformer.RESOURCE_CONFIG, "classpath:/smooks-conf-01.xml");
-        // Should get exceptions where message type configs are specified but empty...
-        properties.setAttribute(SmooksTransformer.FROM_TYPE, " ");
-        assertConfigException(properties, "Empty '" + SmooksTransformer.FROM_TYPE + "' config attribute supplied.");
-        properties.setAttribute(SmooksTransformer.FROM_TYPE, "x");
-        properties.setAttribute(SmooksTransformer.TO_TYPE, " ");
-        assertConfigException(properties, "Empty '" + SmooksTransformer.TO_TYPE + "' config attribute supplied.");
-    }
-
-    public void test_trans() throws ActionProcessingException, ConfigurationException, URISyntaxException, ActionLifecycleException {
-        String stringMessage;
-        String transRes;
-
-        // Very basic test!  Just illustrates profile based resource selection.
-        // Read the smooks-test.cdrl config file in this package!! 
-
-        // Initialise the acme order message...
-        stringMessage = "<a><ddd>value</ddd></a>";
-
-        // Transform the order message going to "AcmePartner1"...
-        transRes = transform(stringMessage, "Acme-Order-XML", "Acme", "AcmePartner1", "Partner1-Order-XML");
-        assertEquals("<x><b>value</b></x>", transRes);
-
-        // Transform the order message going to "AcmePartner2"...
-        transRes = transform(stringMessage, "Acme-Order-XML", "Acme", "AcmePartner2", "Partner2-Order-XML");
-        assertEquals("<x><c>value</c></x>", transRes);
-    }
-
-    private String transform(String stringMessage, String fromType, String from, String to, String toType) throws ActionProcessingException, ConfigurationException, URISyntaxException, ActionLifecycleException {
-        ConfigTree properties = createConfig01(from, fromType, to, toType);
-        SmooksTransformer transformer = new SmooksTransformer(properties);
-        Message message;
-
-        transformer.initialise();
-
-        // Perform the transformation by setting the payload on the task object...
-        message = MessageFactory.getInstance().getMessage();
-        message = MessageFactory.getInstance().getMessage();
-        ActionUtils.setTaskObject(message, stringMessage);
-        message = transformer.process(message);
-        String resultThroughTaskObj = (String) ActionUtils.getTaskObject(message);
-        assertEquals(resultThroughTaskObj, message.getBody().get());
-
-        // Perform the transformation by setting the payload on the body as bytes...
-        message = createNewMessage(fromType, from, to, toType);
-        message.getBody().setByteArray(stringMessage.getBytes());
-        message = transformer.process(message);
-        assertEquals(resultThroughTaskObj, message.getBody().get());
-
-        // Perform the transformation by setting/getting the payload on the default body location...
-        message = MessageFactory.getInstance().getMessage();
-        message.getBody().add(stringMessage);
-        message = transformer.process(message);
-        assertEquals(resultThroughTaskObj, message.getBody().get());
-
-        // Perform the transformation by setting the payload input and output body locations...
-        properties.setAttribute(SmooksTransformer.INPUT_LOCATION, "input-loc1");
-        properties.setAttribute(SmooksTransformer.OUTPUT_LOCATION, "output-loc1");
-        transformer = new SmooksTransformer(properties);
-        transformer.initialise();
-        message = MessageFactory.getInstance().getMessage();
-        message.getBody().add("input-loc1", stringMessage);
-        message = transformer.process(message);
-        assertEquals(resultThroughTaskObj, message.getBody().get("output-loc1"));
-
-        return resultThroughTaskObj;
-    }
-
-    private ConfigTree createConfig01(String from, String fromType, String to, String toType) {
-        ConfigTree properties = new ConfigTree("name");
-
-        properties.setAttribute(SmooksTransformer.RESOURCE_CONFIG, "classpath:/smooks-conf-01.xml");
-        // Set the message properties in order to trigger the appropriate transformations
-        // on the message...
-        properties.setAttribute(SmooksTransformer.FROM, from);
-        properties.setAttribute(SmooksTransformer.FROM_TYPE, fromType);
-        properties.setAttribute(SmooksTransformer.TO, to);
-        properties.setAttribute(SmooksTransformer.TO_TYPE, toType);
-        
-        return properties;
-    }
-
-    private Message createNewMessage(String fromType, String from, String to, String toType) {
-        Message message;
-        message = MessageFactory.getInstance().getMessage();
-
-        message.getProperties().setProperty(SmooksTransformer.FROM_TYPE, fromType);
-        message.getProperties().setProperty(SmooksTransformer.FROM, from);
-        message.getProperties().setProperty(SmooksTransformer.TO_TYPE, toType);
-        message.getProperties().setProperty(SmooksTransformer.TO, to);
-
-        return message;
-    }
-
-    private void assertConfigException(ConfigTree properties, String expectedException) {
-        try {
-            new SmooksTransformer(properties);
-            fail("Expected ConfigurationException: [" + expectedException + "...]");
-        } catch (ConfigurationException e) {
-            assertTrue("Expected exception message to start with [" + expectedException + "]. Was [" + e.getMessage() + "]", e.getMessage().startsWith(expectedException));
-        }
-    }
-}

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,151 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.actions.converters;
+
+
+import java.net.URISyntaxException;
+
+import junit.framework.TestCase;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.actions.ActionLifecycleException;
+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.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+
+/**
+ * SmooksTransformer unit tests.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ * @since Version 4.0
+ */
+public class SmooksTransformerUnitTest extends TestCase {
+
+    public void test_bad_config() {
+        ConfigTree properties = new ConfigTree("name");
+
+        properties.setAttribute(SmooksTransformer.RESOURCE_CONFIG, "classpath:/smooks-conf-01.xml");
+        // Should get exceptions where message type configs are specified but empty...
+        properties.setAttribute(SmooksTransformer.FROM_TYPE, " ");
+        assertConfigException(properties, "Empty '" + SmooksTransformer.FROM_TYPE + "' config attribute supplied.");
+        properties.setAttribute(SmooksTransformer.FROM_TYPE, "x");
+        properties.setAttribute(SmooksTransformer.TO_TYPE, " ");
+        assertConfigException(properties, "Empty '" + SmooksTransformer.TO_TYPE + "' config attribute supplied.");
+    }
+
+    public void test_trans() throws ActionProcessingException, ConfigurationException, URISyntaxException, ActionLifecycleException {
+        String stringMessage;
+        String transRes;
+
+        // Very basic test!  Just illustrates profile based resource selection.
+        // Read the smooks-test.cdrl config file in this package!! 
+
+        // Initialise the acme order message...
+        stringMessage = "<a><ddd>value</ddd></a>";
+
+        // Transform the order message going to "AcmePartner1"...
+        transRes = transform(stringMessage, "Acme-Order-XML", "Acme", "AcmePartner1", "Partner1-Order-XML");
+        assertEquals("<x><b>value</b></x>", transRes);
+
+        // Transform the order message going to "AcmePartner2"...
+        transRes = transform(stringMessage, "Acme-Order-XML", "Acme", "AcmePartner2", "Partner2-Order-XML");
+        assertEquals("<x><c>value</c></x>", transRes);
+    }
+
+    private String transform(String stringMessage, String fromType, String from, String to, String toType) throws ActionProcessingException, ConfigurationException, URISyntaxException, ActionLifecycleException {
+        ConfigTree properties = createConfig01(from, fromType, to, toType);
+        SmooksTransformer transformer = new SmooksTransformer(properties);
+        Message message;
+
+        transformer.initialise();
+
+        // Perform the transformation by setting the payload on the task object...
+        message = MessageFactory.getInstance().getMessage();
+        message = MessageFactory.getInstance().getMessage();
+        ActionUtils.setTaskObject(message, stringMessage);
+        message = transformer.process(message);
+        String resultThroughTaskObj = (String) ActionUtils.getTaskObject(message);
+        assertEquals(resultThroughTaskObj, message.getBody().get());
+
+        // Perform the transformation by setting the payload on the body as bytes...
+        message = createNewMessage(fromType, from, to, toType);
+        message.getBody().setByteArray(stringMessage.getBytes());
+        message = transformer.process(message);
+        assertEquals(resultThroughTaskObj, message.getBody().get());
+
+        // Perform the transformation by setting/getting the payload on the default body location...
+        message = MessageFactory.getInstance().getMessage();
+        message.getBody().add(stringMessage);
+        message = transformer.process(message);
+        assertEquals(resultThroughTaskObj, message.getBody().get());
+
+        // Perform the transformation by setting the payload input and output body locations...
+        properties.setAttribute(SmooksTransformer.INPUT_LOCATION, "input-loc1");
+        properties.setAttribute(SmooksTransformer.OUTPUT_LOCATION, "output-loc1");
+        transformer = new SmooksTransformer(properties);
+        transformer.initialise();
+        message = MessageFactory.getInstance().getMessage();
+        message.getBody().add("input-loc1", stringMessage);
+        message = transformer.process(message);
+        assertEquals(resultThroughTaskObj, message.getBody().get("output-loc1"));
+
+        return resultThroughTaskObj;
+    }
+
+    private ConfigTree createConfig01(String from, String fromType, String to, String toType) {
+        ConfigTree properties = new ConfigTree("name");
+
+        properties.setAttribute(SmooksTransformer.RESOURCE_CONFIG, "classpath:/smooks-conf-01.xml");
+        // Set the message properties in order to trigger the appropriate transformations
+        // on the message...
+        properties.setAttribute(SmooksTransformer.FROM, from);
+        properties.setAttribute(SmooksTransformer.FROM_TYPE, fromType);
+        properties.setAttribute(SmooksTransformer.TO, to);
+        properties.setAttribute(SmooksTransformer.TO_TYPE, toType);
+        
+        return properties;
+    }
+
+    private Message createNewMessage(String fromType, String from, String to, String toType) {
+        Message message;
+        message = MessageFactory.getInstance().getMessage();
+
+        message.getProperties().setProperty(SmooksTransformer.FROM_TYPE, fromType);
+        message.getProperties().setProperty(SmooksTransformer.FROM, from);
+        message.getProperties().setProperty(SmooksTransformer.TO_TYPE, toType);
+        message.getProperties().setProperty(SmooksTransformer.TO, to);
+
+        return message;
+    }
+
+    private void assertConfigException(ConfigTree properties, String expectedException) {
+        try {
+            new SmooksTransformer(properties);
+            fail("Expected ConfigurationException: [" + expectedException + "...]");
+        } catch (ConfigurationException e) {
+            assertTrue("Expected exception message to start with [" + expectedException + "]. Was [" + e.getMessage() + "]", e.getMessage().startsWith(expectedException));
+        }
+    }
+}

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/test/resources)

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/log4j.xml
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/test/resources/log4j.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/log4j.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id: log4j.xml,v 1.26.2.5 2005/09/15 09:31:02 dimitris Exp $ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
-   <!-- ============================== -->
-   <!-- Append messages to the console -->
-   <!-- ============================== -->
-
-   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Message\n -->
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%t][%c{1}] %m%n"/>
-      </layout>
-   </appender>
-
-   <!-- ================ -->
-   <!-- Limit categories -->
-   <!-- ================ -->
-
-   <category name="org.jbpm">
-      <priority value="INFO"/>
-   </category>
-   <category name="org.hibernate">
-      <priority value="ERROR"/>
-   </category>
-   <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="org.jboss.soa.esb.services.jbpm">
-      <priority value="DEBUG"/>
-   </category>
-   <!-- ======================= -->
-   <!-- Setup the Root category -->
-   <!-- ======================= -->
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-   </root>
-
-</log4j:configuration>

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/log4j.xml (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/test/resources/log4j.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/log4j.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/log4j.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml,v 1.26.2.5 2005/09/15 09:31:02 dimitris Exp $ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+   <!-- ============================== -->
+   <!-- Append messages to the console -->
+   <!-- ============================== -->
+
+   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Message\n -->
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%t][%c{1}] %m%n"/>
+      </layout>
+   </appender>
+
+   <!-- ================ -->
+   <!-- Limit categories -->
+   <!-- ================ -->
+
+   <category name="org.jbpm">
+      <priority value="INFO"/>
+   </category>
+   <category name="org.hibernate">
+      <priority value="ERROR"/>
+   </category>
+   <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="org.jboss.soa.esb.services.jbpm">
+      <priority value="DEBUG"/>
+   </category>
+   <!-- ======================= -->
+   <!-- Setup the Root category -->
+   <!-- ======================= -->
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/smooks-conf-01.xml
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/test/resources/smooks-conf-01.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/smooks-conf-01.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
-
-	<!-- 
-		"Acme-Order-XML" messages going from "Acme" to "AcmePartner1" 
-	-->
-	<resource-config target-profile="from-type:Acme-Order-XML AND from:Acme AND to-type:Partner1-Order-XML AND to:AcmePartner1" selector="ddd">
-		<resource>org.milyn.cdres.trans.RenameElementTU</resource>
-		<param name="replacementElement">b</param>
-	</resource-config>
-
-	<!-- 
-		"Acme-Order-XML" messages going from "Acme" to "AcmePartner2" 
-	-->
-	<resource-config target-profile="from-type:Acme-Order-XML AND from:Acme AND to-type:Partner2-Order-XML AND to:AcmePartner2" selector="ddd">
-		<resource>org.milyn.cdres.trans.RenameElementTU</resource>
-		<param name="replacementElement">c</param>
-	</resource-config>
-
-	<!-- 
-		"Acme-Order-XML" messages going from "Acme" to anywhere
-	-->
-	<resource-config target-profile="from-type:Acme-Order-XML AND from:Acme" selector="a" >
-		<resource>org.milyn.cdres.trans.RenameElementTU</resource>
-		<param name="replacementElement">x</param>
-	</resource-config>
-
-</smooks-resource-list>
-

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/smooks-conf-01.xml (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/test/resources/smooks-conf-01.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/smooks-conf-01.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/smooks-conf-01.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
+
+	<!-- 
+		"Acme-Order-XML" messages going from "Acme" to "AcmePartner1" 
+	-->
+	<resource-config target-profile="from-type:Acme-Order-XML AND from:Acme AND to-type:Partner1-Order-XML AND to:AcmePartner1" selector="ddd">
+		<resource>org.milyn.cdres.trans.RenameElementTU</resource>
+		<param name="replacementElement">b</param>
+	</resource-config>
+
+	<!-- 
+		"Acme-Order-XML" messages going from "Acme" to "AcmePartner2" 
+	-->
+	<resource-config target-profile="from-type:Acme-Order-XML AND from:Acme AND to-type:Partner2-Order-XML AND to:AcmePartner2" selector="ddd">
+		<resource>org.milyn.cdres.trans.RenameElementTU</resource>
+		<param name="replacementElement">c</param>
+	</resource-config>
+
+	<!-- 
+		"Acme-Order-XML" messages going from "Acme" to anywhere
+	-->
+	<resource-config target-profile="from-type:Acme-Order-XML AND from:Acme" selector="a" >
+		<resource>org.milyn.cdres.trans.RenameElementTU</resource>
+		<param name="replacementElement">x</param>
+	</resource-config>
+
+</smooks-resource-list>
+

Deleted: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/smooks-conf-02.xml
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/test/resources/smooks-conf-02.xml	2007-06-06 00:09:38 UTC (rev 12348)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/smooks-conf-02.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
-
-	<!-- 
-		"Acme-Order-XML" messages going from "Acme" to "AcmePartner1" 
-	-->
-	<resource-config target-profile="from-type:Acme-Order-XML AND from:Acme AND to-type:Partner1-Order-XML AND to:AcmePartner1" selector="ddd">
-		<resource>org.milyn.cdres.trans.RenameElementTU</resource>
-		<param name="replacementElement">b</param>
-	</resource-config>
-
-	<!-- 
-		"Acme-Order-XML" messages going from "Acme" to "AcmePartner2" 
-	-->
-	<resource-config target-profile="from-type:Acme-Order-XML AND from:Acme AND to-type:Partner2-Order-XML AND to:AcmePartner2" selector="ddd">
-		<resource>org.milyn.cdres.trans.RenameElementTU</resource>
-		<param name="replacementElement">c</param>
-	</resource-config>
-
-	<!-- 
-		"Acme-Order-XML" messages going from "Acme" to anywhere
-	-->
-	<resource-config target-profile="from-type:Acme-Order-XML AND from:Acme" selector="a" >
-		<resource>org.milyn.cdres.trans.RenameElementTU</resource>
-		<param name="replacementElement">x</param>
-	</resource-config>
-
-</smooks-resource-list>
-

Copied: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/smooks-conf-02.xml (from rev 12348, labs/jbossesb/trunk/product/services/smooks/src/test/resources/smooks-conf-02.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/smooks-conf-02.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/test/resources/smooks-conf-02.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
+
+	<!-- 
+		"Acme-Order-XML" messages going from "Acme" to "AcmePartner1" 
+	-->
+	<resource-config target-profile="from-type:Acme-Order-XML AND from:Acme AND to-type:Partner1-Order-XML AND to:AcmePartner1" selector="ddd">
+		<resource>org.milyn.cdres.trans.RenameElementTU</resource>
+		<param name="replacementElement">b</param>
+	</resource-config>
+
+	<!-- 
+		"Acme-Order-XML" messages going from "Acme" to "AcmePartner2" 
+	-->
+	<resource-config target-profile="from-type:Acme-Order-XML AND from:Acme AND to-type:Partner2-Order-XML AND to:AcmePartner2" selector="ddd">
+		<resource>org.milyn.cdres.trans.RenameElementTU</resource>
+		<param name="replacementElement">c</param>
+	</resource-config>
+
+	<!-- 
+		"Acme-Order-XML" messages going from "Acme" to anywhere
+	-->
+	<resource-config target-profile="from-type:Acme-Order-XML AND from:Acme" selector="a" >
+		<resource>org.milyn.cdres.trans.RenameElementTU</resource>
+		<param name="replacementElement">x</param>
+	</resource-config>
+
+</smooks-resource-list>
+

Copied: labs/jbossesb/workspace/dbevenius/product/services/soapui-client/lib (from rev 12348, labs/jbossesb/trunk/product/services/soapui-client/lib)

Copied: labs/jbossesb/workspace/dbevenius/product/services/soapui-client/lib/ext (from rev 12348, labs/jbossesb/trunk/product/services/soapui-client/lib/ext)

Copied: labs/jbossesb/workspace/dbevenius/product/services/soapui-client/lib/ext/build-time (from rev 12348, labs/jbossesb/trunk/product/services/soapui-client/lib/ext/build-time)

Modified: labs/jbossesb/workspace/dbevenius/product/tools/console/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/tools/console/build.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/tools/console/build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -24,17 +24,22 @@
 	<property name="testng.jar" value="${basedir}/lib/testng-4.5.1-jdk15.jar" />
 	<property name="javac.debug" value="true" />
 	<property name="javac.deprecation" value="false" />
-	<property name="product.lib.ext.dir" location="../../lib/ext" />
+	<property name="product.lib.ext.dir" location="../../lib/ext" />
+	<property name="product.services.smooks.lib.ext.dir" location="../../services/smooks/lib/ext" />
 
 	<fileset id="lib" dir="${lib.dir}">
 		<include name="*.jar" />
 	</fileset>
-
+
+	<fileset id="milyn" dir="${product.services.smooks.lib.ext.dir}" 
+		includes="milyn*.jar" />
+	
 	<fileset id="milyn-dependencies" dir="${product.lib.ext.dir}" 
-		includes="milyn*.jar,opencsv*.jar,ognl-*.jar,xbean.jar,xmlpublic.jar,groovy*.jar" />
+		includes="opencsv*.jar,ognl-*.jar,xbean.jar,xmlpublic.jar,groovy*.jar" />
 	
 	<path id="build.classpath">
-		<fileset refid="lib" />
+		<fileset refid="lib" />
+		<fileset refid="milyn" />
 		<fileset refid="milyn-dependencies" />
 	</path>
 
@@ -143,7 +148,8 @@
 				<include name="antlr-*.jar"/>
 				<include name="commons-jci-*.jar"/>
 				<include name="stringtemplate-*.jar"/>
-			</fileset>
+			</fileset>
+			<fileset refid="milyn" />
 			<fileset refid="milyn-dependencies" />
 		</copy>
 		<copy todir="${ear.dir}/META-INF">

Modified: labs/jbossesb/workspace/dbevenius/product/tools/console/distro/application.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/tools/console/distro/application.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/tools/console/distro/application.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -65,40 +65,37 @@
 
    <!-- Smooks and dependencies -->
    <module>
-      <java>milyn-smooks-core-0.8.jar</java>
+      <java>milyn-smooks-core-0.9-SNAPSHOT.jar</java>
    </module>
    <module>
-      <java>milyn-commons-0.8.jar</java>
+      <java>milyn-commons-0.9-SNAPSHOT.jar</java>
    </module>
    <module>
-      <java>milyn-tinak-0.7.1.jar</java>
+      <java>milyn-edisax-0.2-SNAPSHOT.jar</java>
    </module>
    <module>
-      <java>milyn-edisax-0.1-SNAPSHOT.jar</java>
+      <java>milyn-smooks-csv-0.1.1.jar</java>
    </module>
    <module>
-      <java>milyn-smooks-csv-0.1.jar</java>
-   </module>
-   <module>
       <java>opencsv-1.6.jar</java>
    </module>
    <module>
-      <java>milyn-smooks-edi-0.1-SNAPSHOT.jar</java>
+      <java>milyn-smooks-edi-0.2-SNAPSHOT.jar</java>
    </module>
    <module>
-      <java>milyn-smooks-javabean-0.2.jar</java>
+      <java>milyn-smooks-javabean-0.3-SNAPSHOT.jar</java>
    </module>
    <module>
-      <java>milyn-smooks-misc-0.2.jar</java>
+      <java>milyn-smooks-misc-0.2.1.jar</java>
    </module>
    <module>
-      <java>milyn-smooks-scripting-0.1-SNAPSHOT.jar</java>
+      <java>milyn-smooks-scripting-0.1.jar</java>
    </module>
    <module>
       <java>groovy-all-1.0.jar</java>
    </module>
    <module>
-      <java>milyn-smooks-templating-0.2.jar</java>
+      <java>milyn-smooks-templating-0.2.1.jar</java>
    </module>
    <module>
       <java>ognl-2.6.9.jar</java>
@@ -112,4 +109,4 @@
    
    @db.application.modules@
 
-</application>
\ No newline at end of file
+</application>

Modified: labs/jbossesb/workspace/dbevenius/product/tools/console/distro/distro-build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/tools/console/distro/distro-build.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/tools/console/distro/distro-build.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -33,7 +33,10 @@
 		<echo message="" />
 		<input addproperty="db.target" message='Enter the target database type:' validargs="hsqldb,postgres" />
 		<echo message="" />
-    	    	
+		<echo message="JBoss 4.0.5.GA and JBoss 4.2.0.GA use differing implementations of JSF.  If you are deploying to JBoss 4.0.5.GA, please select myfaces as JSF provider.    If you are using JBoss 4.2.0.GA or higher, select jbossfaces."/>
+		<input addproperty="jsf.provider" message='Enter the JSF provider:' validargs="myfaces,jbossfaces" />
+    		<echo message="" />	    
+	
     	<delete file="console/distro/${db.target}/${dist-props}" />
 		
     	<ant dir="console/distro/${db.target}" antfile="build.xml" target="capture-config"/>
@@ -43,7 +46,12 @@
 		
     </target>
 
-	<target name="filter-files">
+	<target name="jsf-copy" unless="jbossfaces.used">
+		<copy overwrite="true" file="console/distro/${jsf.provider}-web.xml"
+			tofile="console/jboss-esb-console.war/WEB-INF/web.xml"/>
+	</target>
+
+	<target name="filter-files" depends="jsf-copy">
 		<property file="console/distro/${db.target}/${dist-props}" />
 		<filterset id="filters" filtersfile="console/distro/${db.target}/${dist-props}"/>
 		<loadfile property="db.application.modules" srcfile="console/distro/${db.target}/db.application.modules.xml" />

Copied: labs/jbossesb/workspace/dbevenius/product/tools/console/distro/jbossfaces-web.xml (from rev 12348, labs/jbossesb/trunk/product/tools/console/distro/jbossfaces-web.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/tools/console/distro/jbossfaces-web.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/tools/console/distro/jbossfaces-web.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,92 @@
+<?xml version="1.0" ?>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+         version="2.4">
+
+   <context-param>
+      <param-name>javax.faces.CONFIG_FILES</param-name>
+      <param-value>/WEB-INF/navigation.xml</param-value>
+   </context-param>
+
+   <context-param>
+      <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+      <param-value>client</param-value>
+   </context-param>
+    
+   <context-param>
+      <param-name>facelets.DEVELOPMENT</param-name>
+      <param-value>true</param-value>
+   </context-param>
+    
+   <context-param>
+      <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+      <param-value>.xhtml</param-value>
+   </context-param>
+
+
+   <filter>
+      <filter-name>Seam Exception Filter</filter-name>
+      <filter-class>org.jboss.seam.servlet.SeamExceptionFilter</filter-class>
+   </filter>
+
+   <filter>
+      <filter-name>Seam Redirect Filter</filter-name>
+      <filter-class>org.jboss.seam.servlet.SeamRedirectFilter</filter-class>
+   </filter>
+
+   <filter-mapping>
+      <filter-name>Seam Exception Filter</filter-name>
+      <url-pattern>/*</url-pattern>
+   </filter-mapping>
+    
+   <filter-mapping>
+      <filter-name>Seam Redirect Filter</filter-name>
+      <url-pattern>*.seam</url-pattern>
+   </filter-mapping>
+
+   <servlet>
+      <servlet-name>javax.faces.FacesServlet</servlet-name>
+      <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+      <load-on-startup>1</load-on-startup>
+   </servlet>
+    
+   <servlet-mapping>
+      <servlet-name>javax.faces.FacesServlet</servlet-name>
+      <url-pattern>*.seam</url-pattern>
+   </servlet-mapping>
+
+   <servlet-mapping>
+	<servlet-name>javax.faces.FacesServlet</servlet-name>
+	<url-pattern>*.faces</url-pattern>
+   </servlet-mapping>
+
+	<servlet>
+	    <servlet-name>Seam Remoting</servlet-name>
+	    <servlet-class>org.jboss.seam.remoting.SeamRemotingServlet</servlet-class>
+	</servlet>	
+	<servlet-mapping>
+	    <servlet-name>Seam Remoting</servlet-name>
+	    <url-pattern>/seam/remoting/*</url-pattern>
+	</servlet-mapping>
+
+    <filter>
+        <filter-name>Seam Multipart Filter</filter-name>
+        <filter-class>org.jboss.seam.servlet.SeamMultipartFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>Seam Multipart Filter</filter-name>
+        <url-pattern>*.seam</url-pattern>
+    </filter-mapping>
+
+   <security-constraint> 
+       <display-name>Restrict raw XHTML Documents</display-name>
+       <web-resource-collection>
+           <web-resource-name>XHTML</web-resource-name>
+           <url-pattern>*.xhtml</url-pattern>
+       </web-resource-collection>
+       <auth-constraint>
+           <role-name>NONE</role-name>
+       </auth-constraint>
+   </security-constraint>
+</web-app>

Copied: labs/jbossesb/workspace/dbevenius/product/tools/console/distro/myfaces-web.xml (from rev 12348, labs/jbossesb/trunk/product/tools/console/distro/myfaces-web.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/tools/console/distro/myfaces-web.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/tools/console/distro/myfaces-web.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -0,0 +1,96 @@
+<?xml version="1.0" ?>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+         version="2.4">
+
+   <context-param>
+      <param-name>javax.faces.CONFIG_FILES</param-name>
+      <param-value>/WEB-INF/navigation.xml</param-value>
+   </context-param>
+
+   <listener>
+      <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
+   </listener>
+    
+   <context-param>
+      <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+      <param-value>client</param-value>
+   </context-param>
+    
+   <context-param>
+      <param-name>facelets.DEVELOPMENT</param-name>
+      <param-value>true</param-value>
+   </context-param>
+    
+   <context-param>
+      <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+      <param-value>.xhtml</param-value>
+   </context-param>
+
+
+   <filter>
+      <filter-name>Seam Exception Filter</filter-name>
+      <filter-class>org.jboss.seam.servlet.SeamExceptionFilter</filter-class>
+   </filter>
+
+   <filter>
+      <filter-name>Seam Redirect Filter</filter-name>
+      <filter-class>org.jboss.seam.servlet.SeamRedirectFilter</filter-class>
+   </filter>
+
+   <filter-mapping>
+      <filter-name>Seam Exception Filter</filter-name>
+      <url-pattern>/*</url-pattern>
+   </filter-mapping>
+    
+   <filter-mapping>
+      <filter-name>Seam Redirect Filter</filter-name>
+      <url-pattern>*.seam</url-pattern>
+   </filter-mapping>
+
+   <servlet>
+      <servlet-name>javax.faces.FacesServlet</servlet-name>
+      <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+      <load-on-startup>1</load-on-startup>
+   </servlet>
+    
+   <servlet-mapping>
+      <servlet-name>javax.faces.FacesServlet</servlet-name>
+      <url-pattern>*.seam</url-pattern>
+   </servlet-mapping>
+
+   <servlet-mapping>
+	<servlet-name>javax.faces.FacesServlet</servlet-name>
+	<url-pattern>*.faces</url-pattern>
+   </servlet-mapping>
+
+	<servlet>
+	    <servlet-name>Seam Remoting</servlet-name>
+	    <servlet-class>org.jboss.seam.remoting.SeamRemotingServlet</servlet-class>
+	</servlet>	
+	<servlet-mapping>
+	    <servlet-name>Seam Remoting</servlet-name>
+	    <url-pattern>/seam/remoting/*</url-pattern>
+	</servlet-mapping>
+
+    <filter>
+        <filter-name>Seam Multipart Filter</filter-name>
+        <filter-class>org.jboss.seam.servlet.SeamMultipartFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>Seam Multipart Filter</filter-name>
+        <url-pattern>*.seam</url-pattern>
+    </filter-mapping>
+
+   <security-constraint> 
+       <display-name>Restrict raw XHTML Documents</display-name>
+       <web-resource-collection>
+           <web-resource-name>XHTML</web-resource-name>
+           <url-pattern>*.xhtml</url-pattern>
+       </web-resource-collection>
+       <auth-constraint>
+           <role-name>NONE</role-name>
+       </auth-constraint>
+   </security-constraint>
+</web-app>

Modified: labs/jbossesb/workspace/dbevenius/product/tools/console/src/org/jboss/soa/esb/admin/console/UpdateNotifier.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/tools/console/src/org/jboss/soa/esb/admin/console/UpdateNotifier.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/product/tools/console/src/org/jboss/soa/esb/admin/console/UpdateNotifier.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -89,7 +89,7 @@
 		
 		try {
 			TopicPublisher send = session.createPublisher(topic);
-			TextMessage tm = session.createTextMessage("update"); // The contents of the message is irrelevant!
+			TextMessage tm = session.createTextMessage("Console");
 			send.publish(tm);
 			
 			logger.info("Configuration Update notification sent successfully.");

Deleted: labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,299 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.soa.esb.actions;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
-
-
-import java.io.File;
-import java.io.InputStream;
-import java.net.URI;
-import java.sql.DriverManager;
-import java.sql.Statement;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
-import junit.framework.JUnit4TestAdapter;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.xml.DOMConfigurator;
-import org.jboss.soa.esb.addressing.EPR;
-import org.jboss.soa.esb.addressing.MalformedEPRException;
-import org.jboss.soa.esb.common.Configuration;
-import org.jboss.soa.esb.couriers.Courier;
-import org.jboss.soa.esb.couriers.CourierException;
-import org.jboss.soa.esb.couriers.CourierFactory;
-import org.jboss.soa.esb.listeners.StandAloneBootStrapper;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.services.persistence.MessageStore;
-import org.jboss.soa.esb.services.persistence.MessageStoreFactory;
-import org.jboss.soa.esb.services.persistence.MessageStoreType;
-import org.jboss.soa.esb.services.registry.Registry;
-import org.jboss.soa.esb.services.registry.RegistryException;
-import org.jboss.soa.esb.services.registry.RegistryFactory;
-import org.jboss.soa.esb.testutils.FileUtil;
-import org.jboss.soa.esb.testutils.HsqldbUtil;
-import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Testing the MessagePersister.
- * 
- * @author <a href="mailto:kurt.stam at redhat.com">Kurt Stam</a>
- * 
- */
-public class MessagePersisterTest
-{
-	private static Logger logger = Logger.getLogger(MessagePersisterTest.class);
-
-	private static StandAloneBootStrapper _boot = null;
-
-	private static String mDbDriver;
-
-	private static String mDbUrl;
-
-	private static String mDbUsername;
-
-	private static String mDbPassword;
-
-	private static final String SERVICE_CATEGORY_NAME = "Persistance";
-
-	private static final String SERVICE_NAME = "persister";
-
-	/**
-	 * Testing the MessagePersister.
-	 */
-	@Test
-	public void sendMessage()
-	{
-		try
-		{
-            Date now = new Date();
-            String body = "<message>First Message " + now + " </message>";
-			sendMessage(body);
-             //now we can check the messageStore to see if our message made it in there.
-            System.out.println("Reading the messages in the messageStore");
-            Thread.sleep(1000);
-            MessageStore store = MessageStoreFactory.getInstance().getMessageStore(MessageStoreType.DATABASE);
-            Map<URI, Message> messages = store.getAllMessages("TEST");
-            messages = store.getAllMessages("TEST");
-            Iterator<Message> iter=messages.values().iterator();
-            while (iter.hasNext()) {
-                Message message=iter.next();
-                String bodyFromStore = new String(message.getBody().getByteArray());
-                System.out.println("Body=" + bodyFromStore);
-            }
-            System.out.println("Getting message for classification TEST:" + messages);
-            assertEquals(1, messages.size());
-            
-            //Now check if it is the same message
-            Message message=messages.values().iterator().next();
-            String bodyFromStore = new String(message.getBody().getByteArray());
-            assertEquals(body, bodyFromStore);
-		}
-		catch (Exception re)
-		{
-			re.printStackTrace();
-			assertTrue(false);
-		}
-	}
-
-	/**
-	 * Sends a message to the CbrJmsQueueListener.
-	 * 
-	 * @param body -
-	 *            a String containing the body of the message.
-	 * @throws RegistryException
-	 * @throws CourierException
-	 * @throws MalformedEPRException
-	 */
-	
-	private static void sendMessage(String body) throws RegistryException, CourierException, MalformedEPRException
-	{
-		Message msg = MessageFactory.getInstance().getMessage();
-		msg.getBody().setByteArray(body.getBytes());
-		
-		Registry registry = RegistryFactory.getRegistry();
-		EPR epr = registry.findEPR(SERVICE_CATEGORY_NAME,
-				SERVICE_NAME);
-		Courier courier = CourierFactory.getCourier(epr);
-		courier.deliver(msg);
-	}
-
-	public static junit.framework.Test suite()
-	{
-		return new JUnit4TestAdapter(MessagePersisterTest.class);
-	}
-
-	@BeforeClass
-	public static void runBeforeAllTests()
-	{
-        System.setProperty("com.arjuna.common.util.propertyservice.verbosePropertyManager", "on");
-		try
-		{
-			DOMConfigurator.configure(TestEnvironmentUtil.getUserDir("product",
-					"../product")
-					+ "etc/test/resources/log4j.xml");
-			TestEnvironmentUtil.setESBPropertiesFileToUse("product",
-					"../product");
-            
-            logger.info(Configuration.dump());
-            
-            logger.info(Configuration.getRegistryImplementationClass());
-			// Set the juddi properties file in System so juddi will pick it up
-			// later and use the test values.
-			String juddiPropertiesFile = "/org/jboss/soa/esb/services/registry/juddi-qatest.properties";
-			System.setProperty("juddi.propertiesFile", juddiPropertiesFile);
-			// Read this properties file to get the db connection string
-			Properties props = new Properties();
-			InputStream inStream = Class.class
-					.getResourceAsStream(juddiPropertiesFile);
-			props.load(inStream);
-			mDbDriver = props.getProperty("juddi.jdbcDriver");
-			mDbUrl = props.getProperty("juddi.jdbcUrl");
-			mDbUsername = props.getProperty("juddi.jdbcUsername");
-			mDbPassword = props.getProperty("juddi.jdbcPassword");
-
-			String database = "not tested yet";
-			if ("org.hsqldb.jdbcDriver".equals(mDbDriver))
-			{
-				database = "hsqldb";
-				// Bring up hsql on default port 9001
-				HsqldbUtil.startHsqldb(TestEnvironmentUtil.getUserDir(
-						"product", "../product")
-						+ "build/hsqltestdb", "juddi");
-			}
-			else if ("com.mysql.jdbc.Driver".equals(mDbDriver))
-			{
-				database = "mysql";
-			} // add and test your own database..
-
-			// Get the registry-schema create scripts
-			String sqlDir = TestEnvironmentUtil.getUserDir("product",
-					"../product")
-					+ "install/jUDDI-registry/sql/" + database + "/";
-			// Drop what is there now, if exists. We want to start fresh.
-			String sqlDropCmd = FileUtil.readTextFile(new File(sqlDir
-					+ "drop_database.sql"));
-			String sqlCreateCmd = FileUtil.readTextFile(new File(sqlDir
-					+ "create_database.sql"));
-			String sqlInsertPubCmd = FileUtil.readTextFile(new File(sqlDir
-					+ "insert_publishers.sql"));
-            //Add the messageStore table
-            sqlDir = TestEnvironmentUtil.getUserDir("product","../product") + "install/message-store/sql/" + database + "/";
-            String sqlCreateCmd2 = FileUtil.readTextFile(new File(sqlDir 
-                    + "create_database.sql"));
-            String sqlDropCmd2   = FileUtil.readTextFile(new File(sqlDir + "drop_database.sql"));
-            
-			try
-			{
-				Class.forName(mDbDriver);
-			}
-			catch (Exception e)
-			{
-				System.out.println("ERROR: failed to load " + database
-						+ " JDBC driver.");
-				e.printStackTrace();
-				return;
-			}
-			java.sql.Connection con = DriverManager.getConnection(mDbUrl,
-					mDbUsername, mDbPassword);
-			Statement stmnt = con.createStatement();
-			System.out.println("Dropping the schema if exist");
-			stmnt.execute(sqlDropCmd);
-            stmnt.execute(sqlDropCmd2);
-			System.out.println("Creating the juddi-schema");
-			stmnt.execute(sqlCreateCmd);
-			System.out.println("Adding the jbossesb publisher");
-			stmnt.execute(sqlInsertPubCmd);
-            System.out.println("Adding the messageStore table");
-            stmnt.execute(sqlCreateCmd2);
-			
-			// Now we can bring up the MessageStore Service
-			String deploymentConfigFile = TestEnvironmentUtil.getUserDir("qa")
-					+ "junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.xml";
-			String validationFileName = TestEnvironmentUtil.getUserDir(
-					"product", "../product")
-					+ "etc/schemas/xml/jbossesb-1.0.1.xsd";
-			// Make sure this file exists
-			File validationFile = new File(validationFileName);
-			if (!validationFile.exists())
-			{
-				System.err.println("Validation file "
-						+ validationFile.getAbsolutePath() + " does not exist");
-				assertTrue(false);
-			}
-			_boot = new StandAloneBootStrapper(deploymentConfigFile,
-					validationFileName);
-
-			logger
-					.info("Testing to see if we can instantiate and start ListenerManager");
-		}
-		catch (Throwable e)
-		{
-			e.printStackTrace();
-			System.out
-					.println("We should stop testing, since we don't have a db.");
-			assertTrue(false);
-		}
-
-	}
-
-	/**
-	 * Shutdown the database
-	 * 
-	 * @throws Exception
-	 */
-	@AfterClass
-	public static void runAfterAllTests() throws Exception
-	{
-        Thread.sleep(2000);
-		// Increase Sleep for debugging
-		_boot.requestEnd();
-		// Give the esb time to finish
-		Thread.sleep(2000);
-		// Cleaning up the generated files
-		String listenerConfigFile = TestEnvironmentUtil.getUserDir("qa")
-				+ "junit/src/org/jboss/soa/esb/actions/jbossesb-listener.xml";
-		File listenerFile = new File(listenerConfigFile);
-		if (listenerFile.exists())
-			listenerFile.delete();
-		String gatewayConfigFile = TestEnvironmentUtil.getUserDir("qa")
-				+ "junit/src/org/jboss/soa/esb/actions/jbossesb-gateway.xml";
-		File gatewayFile = new File(gatewayConfigFile);
-		if (gatewayFile.exists())
-			gatewayFile.delete();
-
-		if ("org.hsqldb.jdbcDriver".equals(mDbDriver))
-		{
-			HsqldbUtil.stopHsqldb(mDbUrl, mDbUsername, mDbPassword);
-		}
-	}
-
-}

Deleted: labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,41 +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="10">
-    
-	<providers>
-          <jms-provider name="localhost" 
-                      connection-factory="ConnectionFactory"
-                      jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-                      jndi-URL="localhost" >
-                      
-              <jms-bus busid="QueueA">
-                  <jms-message-filter
-                      dest-type="QUEUE"
-                      dest-name="queue/A"
-                   />
-              </jms-bus>
-          </jms-provider>
-      </providers>
-      <services>
-          <service 
-              category="Persistance" 
-              name="persister" 
-              description="Stores messages to persist store">
-              <listeners>
-                  <jms-listener name="MessagePersisterListenQueue" busidref="QueueA"
-                      maxThreads="1">
-                  </jms-listener>
-              </listeners>
-              <actions>
-                  <action name="PersistAction" 
-               		class="org.jboss.soa.esb.actions.MessagePersister" >
-               		<property name="classfication" value="TEST"/>
-               		<property name="message-store-type" value="urn:jboss/esb/persistence/type/DATABASE"/>
-               </action>
-               <action name="print-after" class="org.jboss.soa.esb.actions.SystemPrintln">
-                    <property name="message" value="message was presisted" />
-               </action>
-              </actions> 
-          </service>
-   </services>
-</jbossesb>

Deleted: labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/SmooksTransformerConfig.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/SmooksTransformerConfig.xml	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/SmooksTransformerConfig.xml	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,32 +0,0 @@
-<!-- 
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */ 
- -->
-
-<SmooksTransformerTest>
-	<action class="org.jboss.soa.esb.actions.converters.SmooksTransformer" 
-		from-type="Acme-Order-XML"
-		from="Acme"
-		to-type="Partner2-Order-XML"
-		to="AcmePartner2"
-		/>
-</SmooksTransformerTest>	

Deleted: labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/SmooksTransformerTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/SmooksTransformerTest.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/SmooksTransformerTest.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,88 +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.actions;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-
-import junit.framework.TestCase;
-
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.actions.converters.SmooksTransformer;
-import org.jboss.soa.esb.common.ModulePropertyManager;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.listeners.message.ActionProcessingPipeline;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.xml.sax.SAXException;
-
-/**
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class SmooksTransformerTest extends TestCase {
-	
-	@Override
-	protected void setUp() throws Exception {
-		ModulePropertyManager.getPropertyManager(SmooksTransformer.CONFIGURATION_SECTION).setProperty("configuration.list.file.uri", "classpath:/org/jboss/soa/esb/actions/smooks-cdr.lst");
-	}
-
-	public void test_SmooksTransformer() throws SAXException, IOException, ConfigurationException, URISyntaxException {
-		Message message = createEmptyMessage();
-
-		// Set the message payload for processing - don't set the message typing
-		// or routing info on the message...
-        ActionUtils.setTaskObject(message, "<a><ddd>value</ddd></a>");
-        // Process the message...
-		process(message);
-		// Check make sure it did it OK ("ddd" converted to "c")...
-		assertEquals("<x><c>value</c></x>", (String)ActionUtils.getTaskObject(message));
-		
-		// Set the message type and routing info on the message - should override the 
-		// configured typing and routing parameters...
-		message.getProperties().setProperty(SmooksTransformer.FROM, "Acme");
-		message.getProperties().setProperty(SmooksTransformer.FROM_TYPE, "Acme-Order-XML");
-		message.getProperties().setProperty(SmooksTransformer.TO, "AcmePartner1");
-		message.getProperties().setProperty(SmooksTransformer.TO_TYPE, "Partner1-Order-XML");
-		// Set the message payload for processing...
-        ActionUtils.setTaskObject(message, "<a><ddd>value</ddd></a>");
-        // Process the message...
-		process(message);
-		// Check make sure it did it OK ("ddd" converted to "b")...
-		assertEquals("<x><b>value</b></x>", (String)ActionUtils.getTaskObject(message));
-	}
-	
-    private void process(Message message) throws SAXException, IOException, ConfigurationException {
-		ConfigTree config = ConfigTree.fromInputStream(getClass().getResourceAsStream("SmooksTransformerConfig.xml"));
-
-                ActionProcessingPipeline chain = new ActionProcessingPipeline(config);
-                chain.initialise() ;
-        
-                chain.process(message) ;
-    }
-
-	private Message createEmptyMessage() {
-		Message message = MessageFactory.getInstance().getMessage();
-
-		
-		return message;
-	}
-}

Deleted: labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/smooks-cdr.lst
===================================================================
--- labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/smooks-cdr.lst	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/smooks-cdr.lst	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1 +0,0 @@
-classpath:/org/jboss/soa/esb/actions/smooks-test.cdrl

Deleted: labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/smooks-test.cdrl
===================================================================
--- labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/smooks-test.cdrl	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/actions/smooks-test.cdrl	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
-
-	<!-- 
-		"Acme-Order-XML" messages going from "Acme" to "AcmePartner1" 
-	-->
-	<resource-config target-profile="from-type:Acme-Order-XML AND from:Acme AND to-type:Partner1-Order-XML AND to:AcmePartner1" selector="ddd">
-		<resource>org.milyn.cdres.trans.RenameElementTU</resource>
-		<param name="replacementElement">b</param>
-	</resource-config>
-
-	<!-- 
-		"Acme-Order-XML" messages going from "Acme" to "AcmePartner2" 
-	-->
-	<resource-config target-profile="from-type:Acme-Order-XML AND from:Acme AND to-type:Partner2-Order-XML AND to:AcmePartner2" selector="ddd">
-		<resource>org.milyn.cdres.trans.RenameElementTU</resource>
-		<param name="replacementElement">c</param>
-	</resource-config>
-
-	<!-- 
-		"Acme-Order-XML" messages going from "Acme" to anywhere
-	-->
-	<resource-config target-profile="from-type:Acme-Order-XML AND from:Acme" selector="a">
-		<resource>org.milyn.cdres.trans.RenameElementTU</resource>
-		<param name="replacementElement">x</param>
-	</resource-config>
-
-</smooks-resource-list>
-

Modified: labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/server/jca/unit/JcaUnitTestCase.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/server/jca/unit/JcaUnitTestCase.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/server/jca/unit/JcaUnitTestCase.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -21,23 +21,22 @@
 */
 package org.jboss.soa.esb.server.jca.unit;
 
-import org.jboss.test.JBossTestCase;
-import org.jboss.soa.esb.server.StatsMBean;
-import org.jboss.soa.esb.server.unit.SimpleDeployUnitTestCase;
-
-import javax.naming.InitialContext;
-import javax.jms.ConnectionFactory;
 import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
 import javax.jms.Destination;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.QueueSession;
 import javax.jms.MessageProducer;
 import javax.jms.ObjectMessage;
+import javax.jms.Queue;
+import javax.jms.QueueSession;
+import javax.jms.Session;
 import javax.management.ObjectName;
+import javax.naming.InitialContext;
 
 import junit.framework.Test;
 
+import org.jboss.soa.esb.server.StatsMBean;
+import org.jboss.test.JBossTestCase;
+
 /**
  * Sample client for the jboss container.
  *

Deleted: labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/util/DbUtils.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/util/DbUtils.java	2007-06-06 14:14:30 UTC (rev 12350)
+++ labs/jbossesb/workspace/dbevenius/qa/junit/src/org/jboss/soa/esb/util/DbUtils.java	2007-06-06 14:23:48 UTC (rev 12351)
@@ -1,330 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.util;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Properties;
-
-import org.apache.log4j.Logger;
-import org.jboss.soa.esb.common.Configuration;
-
-/**
- * Database Utilitise.
- * 
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public abstract class DbUtils
-{
-
-	private static Logger logger = Logger.getLogger(DbUtils.class);
-
-	public static String dbDriver = Configuration.getDbDriver();
-
-	public static String dbUrl = Configuration.getDbUrl();
-
-	public static String dbUser = Configuration.getDbUser();
-
-	public static String dbPassword = Configuration.getDbPassword();
-
-	private static Properties properties = new Properties();
-
-//	static
-//	{
-//		properties.put(ConnectionProperties.DRIVER_CLASSNAME, dbDriver);
-//		properties.put(ConnectionProperties.CONNECTION_URL, dbUrl);
-//		properties.put(ConnectionProperties.USERNAME, dbUser);
-//		properties.put(ConnectionProperties.PASSWORD, dbPassword);
-//	}
-
-	/**
-	 * Execute an SQL statement. <p/> Calls
-	 * {@link Statement#execute(java.lang.String)}. Manages getting and
-	 * cleaning up of all DB resources needed to execute the SQL.
-	 * 
-	 * @param sql
-	 *            SQL to Execute.
-	 * @return The return value from {@link Statement#execute(java.lang.String)}.
-	 */
-	public static boolean execute(String sql)
-	{
-		DbResources dbResources = null;
-
-		try
-		{
-			dbResources = new DbResources();
-			return dbResources.stat.execute(sql);
-		} catch (SQLException e)
-		{
-			TestCaseUtils.logAndFail("SQL execution failed: " + sql, logger, e);
-		} finally
-		{
-			dbResources.close();
-		}
-
-		return false;
-	}
-
-	/**
-	 * Execute an SQL statement. <p/> Calls
-	 * {@link Statement#executeQuery(java.lang.String)}. Manages getting and
-	 * cleaning up of all DB resources needed to execute the SQL.
-	 * 
-	 * @param query
-	 *            SQL to Execute.
-	 * @return Returns a Proxied {@link ResultSet} object which manages closing
-	 *         of all associated DB resources on the call to
-	 *         {@link ResultSet#close()} to the returned {@link ResultSet}
-	 *         object.
-	 */
-	public static ResultSet executeQuery(String query)
-	{
-		DbResources dbResources = null;
-		ResultSet resultSet = null;
-
-		try
-		{
-			dbResources = new DbResources();
-			resultSet = dbResources.stat.executeQuery(query);
-
-			// Proxy the calls to the ResultSet object so we can close the
-			// DbResources
-			// when the call to close the resultset is made.
-			return (ResultSet) Proxy.newProxyInstance(ResultSet.class
-					.getClassLoader(), new Class[]
-			{ ResultSet.class }, new ResultSetInvocationHandler(resultSet,
-					dbResources));
-		} catch (SQLException e)
-		{
-			// Close the ResultSet and DbResources objects...
-			closeResultSet(resultSet);
-			dbResources.close();
-			TestCaseUtils.logAndFail("SQL execution failed: " + query, logger,
-					e);
-		}
-
-		return null;
-	}
-
-	/**
-	 * Execute an SQL statement. <p/> Calls
-	 * {@link Statement#executeUpdate(java.lang.String)}. Manages getting and
-	 * cleaning up of all DB resources needed to execute the SQL.
-	 * 
-	 * @param sql
-	 *            SQL to Execute.
-	 * @return The return value from
-	 *         {@link Statement#executeUpdate(java.lang.String)}.
-	 */
-	public static int executeUpdate(String sql)
-	{
-		DbResources dbResources = null;
-
-		try
-		{
-			dbResources = new DbResources();
-			return dbResources.stat.executeUpdate(sql);
-		} catch (SQLException e)
-		{
-			// Close the DbResources objects...
-			dbResources.close();
-			TestCaseUtils.logAndFail("SQL execution failed: " + sql, logger, e);
-		}
-
-		return 0;
-	}
-
-	/**
-	 * Convienience method for closing a DB ResultSet. <p/> Handles Exceptions
-	 * etc.
-	 * 
-	 * @param resultSet
-	 *            The ResultSet to close.
-	 */
-	public static void closeResultSet(ResultSet resultSet)
-	{
-		if (resultSet != null)
-		{
-			try
-			{
-				resultSet.close();
-			} catch (SQLException e)
-			{
-				TestCaseUtils.logAndFail("Failed to close resultset.", logger,
-						e);
-			}
-		}
-	}
-
-	/**
-	 * Assert that the specified query does not return an empty resultset.
-	 * 
-	 * @param query
-	 *            The query to execute.
-	 * @param maxWait
-	 *            The maximum length of time (ms) to wait for the query to
-	 *            return a non-empty resultset.
-	 */
-	public static void assertNonEmptyResultSet(String query, int maxWait)
-	{
-		long endTime = System.currentTimeMillis() + maxWait;
-
-		while (System.currentTimeMillis() < endTime)
-		{
-			ResultSet resSet = executeQuery(query);
-
-			try
-			{
-				if (resSet.next())
-				{
-					// There were rows in the resultset...
-					return;
-				}
-				Thread.sleep(500);
-			} catch (Exception e)
-			{
-				TestCaseUtils.logAndFail("Error while executing SQL query ["
-						+ query + "].", logger, e);
-			} finally
-			{
-				closeResultSet(resSet);
-			}
-		}
-		TestCaseUtils.logAndFail("SQL query [" + query
-				+ "] failed to return a non-empty resultset.  Waited for "
-				+ maxWait + "ms.", logger, null);
-	}
-
-	/**
-	 * ResultSet Proxying InvocationHandler. <p/> This class is used simply to
-	 * "catch" the close method call on the ResultSet so we can also close the
-	 * underlying DbResources.
-	 * 
-	 * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
-	 */
-	private static class ResultSetInvocationHandler implements
-			InvocationHandler
-	{
-		private ResultSet resultSet;
-
-		private DbResources dbResources;
-
-		private ResultSetInvocationHandler(ResultSet resultSet,
-				DbResources dbResources)
-		{
-			this.resultSet = resultSet;
-			this.dbResources = dbResources;
-		}
-
-		public Object invoke(Object proxy, Method method, Object[] args)
-				throws Throwable
-		{
-			if (method.getName().equals("close"))
-			{
-				try
-				{
-					// Caught the call to close the resultset - close the
-					// associated DbResources too!
-					return method.invoke(resultSet, args);
-				} catch (Exception e)
-				{
-					TestCaseUtils.logAndFail(
-							"Failed to close database Resultset.  Connection Properties: "
-									+ properties, logger, e);
-				} finally
-				{
-					dbResources.close();
-				}
-			}
-
-			// Call to something other than the "close" method.
-			return method.invoke(resultSet, args);
-		}
-	}
-
-	/**
-	 * Container Object for a "standard" set of DB resources. <p/> Provides
-	 * convienience methods closing the resources etc.
-	 * 
-	 * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
-	 */
-	private static class DbResources
-	{
-		private Connection con = null;
-
-		private Statement stat = null;
-
-		private DbResources()
-		{
-			try
-			{
-				// Register the driver..
-                                ClassUtil.forName(dbDriver, getClass());
-				// Create the connection...
-				con = DriverManager.getConnection(dbUrl, dbUser, dbPassword);
-				// Create a regular statement for execution...
-				stat = con.createStatement();
-			} catch (Exception e)
-			{
-				TestCaseUtils.logAndFail(
-						"Failed to connect to database.  Connection Properties: "
-								+ properties, logger, e);
-			}
-		}
-
-		private void close()
-		{
-			try
-			{
-				if (stat != null)
-				{
-					stat.close();
-				}
-			} catch (SQLException e)
-			{
-				TestCaseUtils.logAndFail(
-						"Failed to close database Statement.  Connection Properties: "
-								+ properties, logger, e);
-			} finally
-			{
-				if (con != null)
-				{
-					try
-					{
-						con.close();
-					} catch (SQLException e)
-					{
-						TestCaseUtils.logAndFail(
-								"Failed to close database Connection.  Connection Properties: "
-										+ properties, logger, e);
-					}
-				}
-			}
-		}
-	}
-}