[jboss-svn-commits] JBL Code SVN: r12406 - in labs/jbossesb/workspace/dbevenius/product: core/listeners and 63 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Jun 8 02:12:45 EDT 2007


Author: beve
Date: 2007-06-08 02:12:44 -0400 (Fri, 08 Jun 2007)
New Revision: 12406

Added:
   labs/jbossesb/workspace/dbevenius/product/lib/ext/jboss-jaxws.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/jbossws-spi.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/MyInterceptor.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/MySpringEnabledAction.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/SaySomething.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/test/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/test/SendJMSMessage.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/MySpringEnabledAction.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/SaySomething.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/test/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/test/SendJMSMessage.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/ext/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/lib/ext/hsqldb.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/InsertOrderAction.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/test/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/test/SendJMSMessage.java
   labs/jbossesb/workspace/dbevenius/product/services/spring/
   labs/jbossesb/workspace/dbevenius/product/services/spring/base-project-build.xml
   labs/jbossesb/workspace/dbevenius/product/services/spring/build.properties
   labs/jbossesb/workspace/dbevenius/product/services/spring/build.xml
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/aspectjrt.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/aspectjweaver.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/build-time/
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/build-time/asm.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/build-time/cglib-2.1_3.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/build-time/commons-logging-1.0.4.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/build-time/junit-4.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/build-time/log4j.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/commons-dbcp-1.2.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/commons-pool.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/ibatis-2.3.0.677.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/spring-aspects.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/spring-mock.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/spring.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/java/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/java/org/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/java/org/jboss/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/java/org/jboss/soa/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/java/org/jboss/soa/esb/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/java/org/jboss/soa/esb/actions/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/java/org/jboss/soa/esb/actions/AbstractSpringAction.java
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/resources/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/resources/META-INF/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/resources/META-INF/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/AbstractSpringActionUnitTest.java
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/MockSpringAction.java
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/MyInterceptor.java
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/SaySomething.java
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/resources/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/resources/spring-context-1.xml
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/resources/spring-context-2.xml
Removed:
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractSpringAction.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/src/org/jboss/soa/esb/actions/spring/
   labs/jbossesb/workspace/dbevenius/product/jbossws21/
   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/commons-dbcp-1.2.1.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/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/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_aop/MyInterceptor.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/MySpringEnabledAction.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/SaySomething.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/test/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/test/SendJMSMessage.java
   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/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_helloworld/MySpringEnabledAction.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/SaySomething.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/test/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/test/SendJMSMessage.java
   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/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/ext/hsqldb.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/xstream-1.2.2.jar
   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_jpetstore/InsertOrderAction.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/test/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/test/SendJMSMessage.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/smooks-res-csv2xml.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/smooks-cdr.lst
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/smooks-cdr.lst
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/smooks-cdr.lst
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/smooks-cdr.lst
   labs/jbossesb/workspace/dbevenius/product/services/spring/base-project-build.xml
   labs/jbossesb/workspace/dbevenius/product/services/spring/build.properties
   labs/jbossesb/workspace/dbevenius/product/services/spring/build.xml
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/aspectjrt.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/aspectjweaver.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/build-time/
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/build-time/asm.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/build-time/cglib-2.1_3.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/build-time/commons-logging-1.0.4.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/build-time/junit-4.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/build-time/log4j.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/commons-dbcp-1.2.1.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/commons-pool.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/ibatis-2.3.0.677.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/spring-aspects.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/spring-mock.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/spring.jar
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/java/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/java/org/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/java/org/jboss/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/java/org/jboss/soa/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/java/org/jboss/soa/esb/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/java/org/jboss/soa/esb/actions/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/java/org/jboss/soa/esb/actions/AbstractSpringAction.java
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/resources/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/resources/META-INF/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/resources/META-INF/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/AbstractSpringActionUnitTest.java
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/MockSpringAction.java
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/MyInterceptor.java
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/SaySomething.java
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/resources/
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/resources/spring-context-1.xml
   labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/resources/spring-context-2.xml
Modified:
   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/soa/esb/actions/soap/JBossWSAdapter.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/build.xml
   labs/jbossesb/workspace/dbevenius/product/docs/AdministrationGuide.odt
   labs/jbossesb/workspace/dbevenius/product/docs/ProgrammersGuide.odt
   labs/jbossesb/workspace/dbevenius/product/docs/ReleaseNotes.odt
   labs/jbossesb/workspace/dbevenius/product/install/build.xml
   labs/jbossesb/workspace/dbevenius/product/install/deployment.properties-example
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/bpm_orchestration1/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/bpm_orchestration1/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf/base-build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/jbpm_simple1/
   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/readme.txt
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/spring-context.xml
   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/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_jpetstore/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/build.xml
   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.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/readme.txt
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/jboss-esb.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_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_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_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/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/readme.txt
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/src/org/jboss/soa/esb/samples/quickstart/webservicejbosswsadapter01/test/soap_message_01.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/src/org/jboss/soa/esb/samples/quickstart/webservicejbosswsadapter01/test/soap_message_02.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/src/org/jboss/soa/esb/samples/quickstart/webservicejbosswsadapter01/webservice/GoodbyeWorldWS.java
   labs/jbossesb/workspace/dbevenius/product/services/build.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/base-project-build.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/lib/ext/milyn-smooks-javabean-0.3-SNAPSHOT.jar
   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/SmooksTransformer.java
   labs/jbossesb/workspace/dbevenius/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java
Log:
Merge from main 12348:12392

Modified: labs/jbossesb/workspace/dbevenius/product/.classpath
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/.classpath	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/.classpath	2007-06-08 06:12:44 UTC (rev 12406)
@@ -13,7 +13,6 @@
 	<classpathentry kind="lib" path="lib/ext/antlr-3.0ea8.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/emma_ant.jar"/>
 	<classpathentry kind="lib" path="lib/ext/emma.jar"/>
@@ -65,12 +64,7 @@
 	<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="lib" path="lib/ext/jboss-jaxws.jar"/>
+	<classpathentry kind="lib" path="lib/ext/jbossws-spi.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-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/build-distr.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -99,7 +99,6 @@
             <fileset dir="${installation.files.dir}/conf">
                 <include name="jbossesb-properties.xml"/>
                 <include name="esb.juddi.properties"/>
-                <include name="smooks-cdr.lst"/>
                 <include name="repository.xml"/>
             </fileset>
             <fileset dir="${installation.files.dir}/jUDDI-registry">
@@ -127,17 +126,11 @@
             <fileset dir="${lib.ext.dir}" includes="xbean.jar,stax-api-1.0.1.jar,xmlpublic.jar"/>
             <!-- jUDDI Registry -->
             <fileset dir="${lib.ext.dir}" includes="juddi-1.0-SNAPSHOT.jar,juddi-client-1.0-SNAPSHOT.jar"/>
-            <!-- jboss rules for CBR -->
-            <fileset dir="${lib.ext.dir}" includes="antlr-3.0ea8.jar,antlr-2.7.6.jar,
-            drools-compiler-3.0.4.jar,drools-core-3.0.4.jar,stringtemplate-2.3b6.jar,
-            commons-jci-core-1.0-406301.jar, commons-jci-janino-2.4.3.jar, janino-2.4.3.jar"/>
             <!-- smooks for transformation -->
             <fileset dir="${lib.ext.dir}"
-                     includes="milyn-*.jar,opencsv-*.jar,ognl-*.jar,groovy-*.jar,commons-lang-2.1.jar"/>
+                     includes="opencsv-*.jar,ognl-*.jar,groovy-*.jar,commons-lang-2.1.jar"/>
             <!-- ftp -->
             <fileset dir="${lib.ext.dir}" includes="edtftpj-*.jar"/>
-            <!-- connection pooling -->
-            <fileset dir="${lib.ext.dir}" includes="c3p0-*.jar"/>
             <!-- JCR repository -->
             <fileset dir="${lib.ext.dir}" includes="jcr-*.jar,jackrabbit-*.jar,commons-io-*.jar,lucene-*.jar"/>
             <!-- XStream jars - including woodstox for the StaxDriver -->
@@ -149,10 +142,11 @@
     <target name="services">
         <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/**/*" excludes="jbossesb.esb/jbmq-queue-service.xml jbossesb.esb/jbm-queue-service-scoped.xml"/>
+        	<fileset dir="${services.dir}/jbpm/build" includes="jbpm.esb/**/*"/>
         	<fileset dir="${services.dir}/jbrules/build" includes="jbrules.esb/**/*"/>
         	<fileset dir="${services.dir}/smooks/build" includes="smooks.esb/**/*" excludes="smooks.esb/jbmq-queue-service.xml smooks.esb/jbm-queue-service-scoped.xml"/>
+        	<fileset dir="${services.dir}/spring/build" includes="spring.esb/**/*"/>
         </copy>
     </target>
 

Modified: labs/jbossesb/workspace/dbevenius/product/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/build.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/build.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -203,8 +203,7 @@
 			<classpath>
 				<path path="${org.jboss.esb.internal.src}"/>
 				<fileset dir="lib/ext" includes="*.jar" />
-				<fileset dir="lib/ext/standalone" includes="*.jar" />
-				<fileset dir="jbossws21" includes="**/*.jar" />
+                <fileset dir="lib/ext/standalone" includes="*.jar" />
 			</classpath>
 		</javadoc>
 	</target>

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/build.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/build.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -18,7 +18,6 @@
 	<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/soa/esb/actions/AbstractSpringAction.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractSpringAction.java	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractSpringAction.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -1,194 +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 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/soap/JBossWSAdapter.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/soap/JBossWSAdapter.java	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/soap/JBossWSAdapter.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -36,6 +36,7 @@
 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.invocation.BasicInvocationContext;
 import org.jboss.wsf.spi.management.EndpointRegistry;
 import org.jboss.wsf.spi.management.EndpointRegistryFactory;
 
@@ -80,7 +81,7 @@
         try {
             messageTL.set(message);
             RequestHandler requestHandler = endpoint.getRequestHandler();
-            InvocationContext invocationContext = endpoint.getInvocationHandler().createInvocation().getInvocationContext();
+            InvocationContext invocationContext = new BasicInvocationContext();
             ByteArrayOutputStream os = new ByteArrayOutputStream();
 
             requestHandler.handleRequest(endpoint, new ByteArrayInputStream(soapMessage), os, invocationContext);

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/build.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/tests/build.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -32,7 +32,6 @@
     	<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"/>

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

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

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

Modified: labs/jbossesb/workspace/dbevenius/product/install/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/install/build.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/install/build.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -1,4 +1,4 @@
-<project name="JBESB_Installer" default="install" basedir=".">
+<project name="JBESB_Installer" default="deploy" basedir=".">
 
 	<!-- Set deployment properties filename -->
 	<property name="org.jboss.esb.deployment.properties" location="deployment.properties"/>

Modified: labs/jbossesb/workspace/dbevenius/product/install/deployment.properties-example
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/install/deployment.properties-example	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/install/deployment.properties-example	2007-06-08 06:12:44 UTC (rev 12406)
@@ -12,13 +12,20 @@
 ######################################################################
 # JBossAS
 ######################################################################
-# Server home directory
+# The Directory in Which JBoss AS is Installed 
+# The absolute path to a directory in which a version of JBoss AS with 
+# EJB3 has been installed. 
+# This path should not include spaces. 
+# Use of relative paths or paths with spaces will cause runtime errors 
+# when deploying and executing the quickstart and the trailblazers. 
+# (e.g. /home/pbennett/jboss-4.0.5.GA-ejb3) 
 # (By default the 'ant install' task will create this directory.)
 org.jboss.esb.server.home=/jbossesb-server-4.2
-# the instance of jboss you are running (default)
+# The Configuration of JBoss AS to Use 
+# (e.g. default) 
 org.jboss.esb.server.config=default
 ######################################################################
 # Tomcat
 ######################################################################
 # jbossesb tomcat home directory
-org.jboss.esb.tomcat.home=/apache-tomcat-5.5.20
+org.jboss.esb.tomcat.home=/apache-tomcat-5.5.20
\ No newline at end of file

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

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

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

Copied: labs/jbossesb/workspace/dbevenius/product/lib/ext/jboss-jaxws.jar (from rev 12392, labs/jbossesb/trunk/product/lib/ext/jboss-jaxws.jar)
===================================================================
(Binary files differ)

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

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

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

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


Property changes on: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/bpm_orchestration1
___________________________________________________________________
Name: svn:ignore
   - build

   + build
jboss-esb.xml


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-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/bpm_orchestration1/build.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -5,6 +5,8 @@
 		${line.separator}
 	</description>
 
+  <property name="deploy.exploded" value="true"/>
+
   <!-- Import the base Ant build script... -->
   <import file="../conf/base-build.xml"/>
 
@@ -33,16 +35,6 @@
 		<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" 

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-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf/base-build.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -2,14 +2,21 @@
 	<!-- 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="quickstarts.dir" location="${pwd}/.."/>
+	<property name="product.dir" location="${quickstarts.dir}/../.."/>
 
+    <!-- load quickstart specific properties -->
 	<property file="${pwd}/quickstarts.properties" prefix="quickstart" />
 
     <property name="build.dir" value="${basedir}/build" />
     <property name="classes" value="${build.dir}/classes" />
 	
+<!-- ==================================================================== -->
+<!-- This section handles the discovery of the distribution hierarchy.    -->
+<!-- There should be no need to change this section unless the hierarchy  -->
+<!-- structure changes.                                                   -->
+<!-- ==================================================================== -->
+
 	<!-- Are we embedded in a source hierarchy? -->
 	<condition property="hierarchy.source">
 		<available file="${product.dir}/build-distr.xml"/>
@@ -38,6 +45,7 @@
 		</or>
 	</condition>
 
+	<!-- Do we have a recognised hierarchy? -->
 	<condition property="build.recognised">
 		<or>
 			<isset property="build.jbossesb"/>
@@ -47,12 +55,85 @@
 
 	<fail unless="build.recognised" message="Cannot determine build hierarchy"/>
 
+	<!-- Check for jbossesb if we are running in source hierarchy -->
 	<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>
 
+<!-- ==================================================================== -->
+<!-- This section handles the discovery of the messaging platform.        -->
+<!-- ==================================================================== -->
+
+    <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"/>
+
+        <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>
+
+        <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>
+
+    <!-- dependencies specific to JBoss Messaging -->
+    <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>
+
+    <!-- dependencies specific to JBoss Messaging in a scoped environment -->
+    <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>
+
+    <!-- dependencies specific to JBoss MQ -->
+    <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>
+
+<!-- ==================================================================== -->
+<!-- This section discovers quickstart specific libraries.                -->
+<!-- ==================================================================== -->
+
+    <available property="quickstart.lib.exists" file="${basedir}/lib"/>
+
+    <target name="qslib-dependencies" if="quickstart.lib.exists">
+        <path id="quickstart-lib-classpath">
+            <fileset dir="${basedir}/lib" includes="*.jar" /> <!-- Quickstart Specific Jars. -->
+        </path>
+    </target>
+
+    <target name="non-qslib-dependencies" unless="quickstart.lib.exists">
+        <path id="quickstart-lib-classpath"/>
+    </target>
+
+<!-- ==================================================================== -->
+<!-- This section handles dependencies specific to each distribution.     -->
+<!-- It configures the following properties                               -->
+<!-- org.jboss.esb.server.config, org.jboss.esb.server.home and           -->
+<!-- deployment-classpath                                                 -->
+<!-- ==================================================================== -->
+
+	<!-- Configure dependencies for jbossesb and source distributions -->
 	<target name="jbossesb-dependencies" if="build.jbossesb">
 		<condition property="base.jbossesb"
 			value="${product.dir}/build/jbossesb"
@@ -67,6 +148,7 @@
 			<isset property="quickstart.org.jboss.esb.server.config"/>
 		</condition>
 
+		<!-- check for installation deployment.properties -->
 		<property name="install.dir" value="${product.dir}/install"/>
 		<property file="${install.dir}/deployment.properties" prefix="install" />
 		<condition
@@ -78,7 +160,10 @@
 
 		<path id="deployment-classpath">
 			<fileset dir="${base.jbossesb}/lib" includes="*.jar"/>
-			<fileset dir="${base.jbossesb}/lib/ext" includes="*.jar"/>
+			<fileset dir="${base.jbossesb}/lib/ext" includes="*.jar"/>
+			<!-- jbossesb config -->
+			<fileset dir="${base.jbossesb}/lib/jbossesb.esb" includes="*.jar"/>
+			<pathelement location="${base.jbossesb}/lib/jbossesb.esb"/>
 			<!-- jbpm config -->
 			<fileset dir="${base.jbossesb}/lib/jbpm.esb" includes="*.jar"/>
 			<pathelement location="${base.jbossesb}/lib/jbpm.esb"/>
@@ -87,16 +172,23 @@
 			<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"/>
+			<pathelement location="${base.jbossesb}/lib/jbrules.esb"/>
+			<!-- spring config -->
+			<fileset dir="${base.jbossesb}/lib/spring.esb" includes="*.jar"/>
+			<pathelement location="${base.jbossesb}/lib/spring.esb"/>
 		</path>
 	</target>
 
+	<!-- Configure dependencies for jbossesb-server distribution -->
 	<target name="jbossesb-server-dependencies" if="hierarchy.jbossesb-server">
 		<property name="org.jboss.esb.server.home" value="${product.dir}"/> 
 		<property name="org.jboss.esb.server.config" value="default"/>
 
 		<path id="deployment-classpath">
-			<fileset dir="${product.dir}/server/default/deploy/jbossesb.sar/lib" includes="*.jar"/>
+			<fileset dir="${product.dir}/server/default/deploy/jbossesb.sar/lib" includes="*.jar"/>
+			<!-- jbossesb config -->
+			<fileset dir="${product.dir}/server/default/deploy/jbossesb.esb" includes="*.jar"/>
+			<pathelement location="${product.dir}/server/default/deploy/jbossesb.esb"/>
 			<!-- jbpm config -->
 			<fileset dir="${product.dir}/server/default/deploy/jbpm.esb" includes="*.jar"/>
 			<pathelement location="${product.dir}/server/default/deploy/jbpm.esb"/>
@@ -106,70 +198,19 @@
 			<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"/>
+			<pathelement location="${product.dir}/server/default/deploy/jbrules.esb"/>
+			<!-- spring config -->
+			<fileset dir="${product.dir}/server/default/deploy/spring.esb" includes="*.jar"/>
+			<pathelement location="${product.dir}/server/default/deploy/spring.esb"/>
 		</path>
 	</target>
 	
-	<property name="additional.deploys" value="none" />
+<!-- ==================================================================== -->
+<!-- This section handles common dependencies.                            -->
+<!-- It configures the following properties                               -->
+<!-- compile-classpath, exec-classpath                                    -->
+<!-- ==================================================================== -->
 
-    <available property="quickstart.lib.exists" file="${basedir}/lib"/>
-
-    <property name="deploy-after" value="true" />
-	
-    <path id="quickstart-dependencies-classpath"/>
-
-    <target name="qslib-dependencies" if="quickstart.lib.exists">
-        <path id="quickstart-lib-classpath">
-            <fileset dir="${basedir}/lib" includes="*.jar" /> <!-- Quickstart Specific Jars. -->
-        </path>
-    </target>
-
-    <target name="non-qslib-dependencies" unless="quickstart.lib.exists">
-        <path id="quickstart-lib-classpath"/>
-    </target>
-
-    <target name="messaging-config">
-        <property name="org.jboss.esb.server.deploy.dir" 
-            value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
-
-        <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>
-
-        <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">
@@ -191,6 +232,13 @@
 		</path>
 	</target>
 
+<!-- ==================================================================== -->
+<!-- This section defines the following public targets.                   -->
+<!-- compile, run, deploy jar, package-deployment, undeploy,              -->
+<!-- deploy-jms-dests, undeploy-jms-dests, echoCP, echoPaths, clean,      -->
+<!-- help-quickstarts, help                                               -->
+<!-- ==================================================================== -->
+
     <target name="compile" depends="dependencies">
 		<mkdir dir="${classes}" />
 		<javac srcdir="${basedir}/src" destdir="${classes}" debug="true">
@@ -198,8 +246,6 @@
 		</javac>
 	</target>
 	
-	<target name="config"/>
-
 	<target name="run" depends="compile,config">
 		<description>	run				will run the quickstart in standalone mode
 		</description>
@@ -215,22 +261,6 @@
 		</java>
 	</target>
 
-    <target name="deployToSAR">
-        <echo message='******************' />
-        <echo message='DEPRECATED!!  Sorry, this target has been deprecated for Quickstart Deployment.' />
-        <echo message='Run "ant deploy" to deploy this Quickstart to your target JBoss ESB Server.${line.separator}${line.separator}' />
-        <echo message='******************' />
-        <fail />
-    </target>
-
-	<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>
@@ -246,22 +276,31 @@
 
         <antcall target="package-deployment" />
 
-        <antcall target="deploy-esb-archive-before" />
+        <condition property="deploy.exploded.requested">
+            <equals arg1="${deploy.exploded}" arg2="true" casesensitive="false"/>
+        </condition>
+
+        <antcall target="deploy-esb"/>
+        <antcall target="deploy-exploded-esb"/>
+
         <antcall target="quickstart-specific-deploys" />
-        <antcall target="deploy-esb-archive-after" />
 
         <antcall target="display-instructions" />
     </target>
 
-    <target name="display-instructions">
-        <echo message='${line.separator}******************' />
-        <echo>Quickstart deployed to target JBoss ESB/App Server at '${org.jboss.esb.server.deploy.dir}'.</echo>
-        <echo>1.  Check your ESB Server console to make sure the deployment was executed without errors.</echo>
-        <echo>2.  Run 'ant runtest' to run the Quickstart.</echo>
-        <echo>3.  Check your ESB Server console again.  The Quickstart should have produced some output.</echo>
-        <echo message='******************' />
+    <target name="deploy-esb" unless="deploy.exploded.requested">
+    	<copy todir="${org.jboss.esb.server.deploy.dir}"
+            file="${build.dir}/${ant.project.name}.esb"/>	
     </target>
 
+    <target name="deploy-exploded-esb" if="deploy.exploded.requested">
+        <property name="dest" location="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb"/>
+        <delete quiet="true" file="${dest}"/>
+        <delete quiet="true" dir="${dest}"/>
+        <mkdir dir="${dest}"/>
+        <unjar src="${build.dir}/${ant.project.name}.esb" dest="${dest}"/>
+    </target>
+
     <target name="jar" depends="compile">
         <jar destfile="${build.dir}/${ant.project.name}.jar">
             <fileset dir="${build.dir}/classes"/>
@@ -296,54 +335,6 @@
         <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." />
-    </target>
-
-    <target name="quickstart-specific-deploys">
-        <!-- Override this target in the Quickstart in order to make Quickstart specific deployments. -->
-        <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.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}">
-    		<fileset dir="${build.dir}">
-    			<include name="${ant.project.name}.esb"/>	
-    		</fileset>
-		</copy>
-    </target>
-	
-    <target name="deploy-esb-archive-after" if="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}">
-    		<fileset dir="${build.dir}">
-    			<include name="${ant.project.name}.esb"/>	
-    		</fileset>
-		</copy>
-    </target>
-
 	<target name="deploy-jms-dests" depends="dependencies, deploy-messaging">
 		<description>deploy-jms-dests		will deploy the jms destinations for application server
 		</description>
@@ -387,11 +378,6 @@
 		</delete>
 	</target>
 
-    <target name="quickstart-specific-clean">
-        <!-- Override this target in the Quickstart in order to make Quickstart specific cleans. -->
-        <echo message="No Quickstart specific 'clean' being made." />
-    </target>
-
     <target name="help-quickstarts">
 			<description>help-quickstarts		display information about configuration for all quickstarts </description>
 			<loadfile
@@ -413,4 +399,72 @@
 		<echo>${readme}</echo>
 	</target>
 	
+<!-- ==================================================================== -->
+<!-- This section defines standalone message deployment                   -->
+<!-- ==================================================================== -->
+
+    <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>
+
+<!-- ==================================================================== -->
+<!-- This section defines assertions for determining if the target        -->
+<!-- supports JBossWS or EJB.                                             -->
+<!-- ==================================================================== -->
+
+    <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.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>
+
+<!-- ==================================================================== -->
+<!-- This section defines properties/targets to be overridden by the      -->
+<!-- quickstart specific build.xml file.                                  -->
+<!-- ==================================================================== -->
+
+    <property name="additional.deploys" value="" />
+    <property name="deploy.exploded" value="false" />
+	
+    <target name="quickstart-specific-dependencies">
+    	<path id="quickstart-dependencies-classpath"/>
+    </target>
+
+    <target name="quickstart-specific-assemblies">
+        <echo message="No Quickstart specific assembly tasks." />
+    </target>
+
+    <target name="quickstart-specific-deploys">
+        <echo message="No Quickstart specific deployments being made." />
+    </target>
+
+    <target name="quickstart-specific-undeploys">
+        <echo message="No Quickstart specific undeployments being made." />
+    </target>
+
+    <target name="config"/>
+
+    <target name="quickstart-specific-clean">
+        <echo message="No Quickstart specific 'clean' being made." />
+    </target>
+
+    <target name="display-instructions">
+        <echo message='${line.separator}******************' />
+        <echo>Quickstart deployed to target JBoss ESB/App Server at '${org.jboss.esb.server.deploy.dir}'.</echo>
+        <echo>1.  Check your ESB Server console to make sure the deployment was executed without errors.</echo>
+        <echo>2.  Run 'ant runtest' to run the Quickstart.</echo>
+        <echo>3.  Check your ESB Server console again.  The Quickstart should have produced some output.</echo>
+        <echo message='******************' />
+    </target>
+
 </project>


Property changes on: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/jbpm_simple1
___________________________________________________________________
Name: svn:ignore
   - build
product
gpd.xml

   + build
product
gpd.xml
jboss-esb.xml



Property changes on: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop
___________________________________________________________________
Name: svn:ignore
   + jbossesb-gateway.xml
jbossesb-listener.xml


Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/build.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/build.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -1,16 +1,18 @@
-<project name="Quickstart_helloworld_action" default="runtest" basedir=".">
+<project name="Quickstart_spring_aop" default="runtest" basedir=".">
 
 	<description> 
 		${ant.project.name}
 		${line.separator}
 	</description>
 
+	<property name="additional.deploys" value="spring-context.xml"/>
+
 	<!-- 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">
+		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.spring_aop.test.SendJMSMessage" failonerror="true">
 			<arg value="Hello World From JMS" />
 			<classpath refid="exec-classpath" />
 		</java>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/deployment.xml (from rev 12392, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/deployment.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -0,0 +1,5 @@
+<jbossesb-deployment>
+  <depends>jboss.esb:deployment=spring.esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_spring_aop_Request</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_spring_aop_Response</depends>
+</jbossesb-deployment>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbm-queue-service.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbm-queue-service.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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_spring_aop_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_spring_aop_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/spring_aop/jbmq-queue-service.xml (from rev 12392, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbmq-queue-service.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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_spring_aop_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_spring_aop_Response">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jboss-esb.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jboss-esb.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -7,7 +7,7 @@
               <jms-bus busid="quickstartGwChannel">
                   <jms-message-filter
                       dest-type="QUEUE"
-                      dest-name="queue/quickstart_helloworld_action_Request"
+                      dest-name="queue/quickstart_spring_aop_Request"
                   />
               </jms-bus>
               <jms-bus busid="quickstartEsbChannel">
@@ -38,7 +38,7 @@
             </listeners>
             <actions>
                <action name="sayHelloAopStyle" 
-               		class="org.jboss.soa.esb.samples.quickstart.spring.MySpringEnabledAction" 
+               		class="org.jboss.soa.esb.samples.quickstart.spring_aop.MySpringEnabledAction" 
                		process="sayHelloAopStyle">
                		<property name="exceptionMethod" value="exceptionHandler"/>
                		<property name="springContextXml" value="spring-context.xml"/>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbossesb-gateway.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbossesb-gateway.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbossesb-gateway.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbossesb-listener.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbossesb-listener.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/jbossesb-listener.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/readme.txt
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/readme.txt	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/readme.txt	2007-06-08 06:12:44 UTC (rev 12406)
@@ -49,7 +49,7 @@
 	
 	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
+	see the modified message in the outbound queue: quickstart_spring_aop_Response
 
 Project file descriptions:
 ==========================

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/spring-context.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/spring-context.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/spring-context.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -7,12 +7,12 @@
            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"/>
+	<bean id="helloObject" class="org.jboss.soa.esb.samples.quickstart.spring_aop.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"/>
+		class="org.jboss.soa.esb.samples.quickstart.spring_aop.MyInterceptor"/>
 </beans>

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

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/MyInterceptor.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/MyInterceptor.java	2007-06-07 20:55:18 UTC (rev 12392)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/MyInterceptor.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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_aop;
-
-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_aop/MyInterceptor.java (from rev 12392, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/MyInterceptor.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/MyInterceptor.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/MyInterceptor.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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_aop;
+
+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_aop/MySpringEnabledAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/MySpringEnabledAction.java	2007-06-07 20:55:18 UTC (rev 12392)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/MySpringEnabledAction.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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,
- * @author JBoss Inc.
- */
-package org.jboss.soa.esb.samples.quickstart.spring_aop;
-
-import org.jboss.soa.esb.actions.AbstractSpringAction;
-import org.jboss.soa.esb.helpers.ConfigTree;
-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_aop/MySpringEnabledAction.java (from rev 12392, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/MySpringEnabledAction.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/MySpringEnabledAction.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/MySpringEnabledAction.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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,
+ * @author JBoss Inc.
+ */
+package org.jboss.soa.esb.samples.quickstart.spring_aop;
+
+import org.jboss.soa.esb.actions.AbstractSpringAction;
+import org.jboss.soa.esb.helpers.ConfigTree;
+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_aop/SaySomething.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/SaySomething.java	2007-06-07 20:55:18 UTC (rev 12392)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/SaySomething.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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_aop;
-
-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_aop/SaySomething.java (from rev 12392, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/SaySomething.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/SaySomething.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/SaySomething.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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_aop;
+
+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_aop/test (from rev 12392, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/test)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/test/SendJMSMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/test/SendJMSMessage.java	2007-06-07 20:55:18 UTC (rev 12392)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/test/SendJMSMessage.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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.spring_aop.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_spring_aop_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();
-   }
-}

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/test/SendJMSMessage.java (from rev 12392, labs/jbossesb/trunk/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/test/SendJMSMessage.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/test/SendJMSMessage.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/test/SendJMSMessage.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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.spring_aop.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_spring_aop_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();
+   }
+}


Property changes on: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld
___________________________________________________________________
Name: svn:ignore
   + jbossesb-gateway.xml
jbossesb-listener.xml
build


Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/build.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/build.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -4,14 +4,16 @@
 		${ant.project.name}
 		${line.separator}
 	</description>
-	
+
+	<property name="additional.deploys" value="spring-context-goodbye.xml spring-context-hello.xml"/>
+
 	<!-- 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">
+		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.spring_helloworld.test.SendJMSMessage" failonerror="true">
 			<arg value="Hello World From JMS"/>
 			<classpath refid="exec-classpath"/>
 		</java>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/deployment.xml (from rev 12392, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/deployment.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -0,0 +1,5 @@
+<jbossesb-deployment>
+  <depends>jboss.esb:deployment=spring.esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_spring_helloworld_Request</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_spring_helloworld_Response</depends>
+</jbossesb-deployment>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbm-queue-service.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbm-queue-service.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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_spring_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_action_Response"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_spring_helloworld_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/spring_helloworld/jbmq-queue-service.xml (from rev 12392, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbmq-queue-service.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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_spring_helloworld_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_spring_helloworld_Response">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jboss-esb.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jboss-esb.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -7,7 +7,7 @@
               <jms-bus busid="quickstartGwChannel">
                   <jms-message-filter
                       dest-type="QUEUE"
-                      dest-name="queue/quickstart_helloworld_action_Request"
+                      dest-name="queue/quickstart_spring_helloworld_Request"
                   />
               </jms-bus>
               <jms-bus busid="quickstartEsbChannel">
@@ -38,19 +38,19 @@
             </listeners>
             <actions>
                <action name="sayHello" 
-               		class="org.jboss.soa.esb.samples.quickstart.spring.MySpringEnabledAction" 
+               		class="org.jboss.soa.esb.samples.quickstart.spring_helloworld.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" 
+               		class="org.jboss.soa.esb.samples.quickstart.spring_helloworld.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" 
+               		class="org.jboss.soa.esb.samples.quickstart.spring_helloworld.MySpringEnabledAction" 
                		process="sayHelloSpring,sayGoodbyeSpring,displayMessage">
                		<property name="exceptionMethod" value="exceptionHandler"/>
                		<property name="springContextXml" value="spring-context-goodbye.xml,spring-context-hello.xml"/>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbossesb-gateway.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbossesb-gateway.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbossesb-gateway.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbossesb-listener.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbossesb-listener.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/jbossesb-listener.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/readme.txt
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/readme.txt	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/readme.txt	2007-06-08 06:12:44 UTC (rev 12406)
@@ -52,7 +52,7 @@
 	
 	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
+	see the modified message in the outbound queue: quickstart_spring_helloworld_Response
 
 Project file descriptions:
 ==========================

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/spring-context-goodbye.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/spring-context-goodbye.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/spring-context-goodbye.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -6,7 +6,7 @@
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 
-	<bean id="goodbyeObject" class="org.jboss.soa.esb.samples.quickstart.spring.SaySomething">
+	<bean id="goodbyeObject" class="org.jboss.soa.esb.samples.quickstart.spring_helloworld.SaySomething">
 		<property name="greeting" value="goodbye from Spring"/>
 	</bean>
 	

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/spring-context-hello.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/spring-context-hello.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/spring-context-hello.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -6,7 +6,7 @@
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 
-	<bean id="helloObject" class="org.jboss.soa.esb.samples.quickstart.spring.SaySomething">
+	<bean id="helloObject" class="org.jboss.soa.esb.samples.quickstart.spring_helloworld.SaySomething">
 		<property name="greeting" value="hello from Spring"/>
 	</bean>
 	

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

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/MySpringEnabledAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/MySpringEnabledAction.java	2007-06-07 20:55:18 UTC (rev 12392)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/MySpringEnabledAction.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -1,90 +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_helloworld;
-
-import org.jboss.soa.esb.actions.AbstractSpringAction;
-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_helloworld/MySpringEnabledAction.java (from rev 12392, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/MySpringEnabledAction.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/MySpringEnabledAction.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/MySpringEnabledAction.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -0,0 +1,90 @@
+/*
+ * 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_helloworld;
+
+import org.jboss.soa.esb.actions.AbstractSpringAction;
+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_helloworld/SaySomething.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/SaySomething.java	2007-06-07 20:55:18 UTC (rev 12392)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/SaySomething.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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_helloworld;
-
-/**
- * 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_helloworld/SaySomething.java (from rev 12392, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/SaySomething.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/SaySomething.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/SaySomething.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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_helloworld;
+
+/**
+ * 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_helloworld/test (from rev 12392, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/test)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/test/SendJMSMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/test/SendJMSMessage.java	2007-06-07 20:55:18 UTC (rev 12392)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/test/SendJMSMessage.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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_helloworld.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_spring_helloworld_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();
-   }
-}

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/test/SendJMSMessage.java (from rev 12392, labs/jbossesb/trunk/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/test/SendJMSMessage.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/test/SendJMSMessage.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_helloworld/src/org/jboss/soa/esb/samples/quickstart/spring_helloworld/test/SendJMSMessage.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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_helloworld.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_spring_helloworld_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();
+   }
+}


Property changes on: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore
___________________________________________________________________
Name: svn:ignore
   + jbossesb-gateway.xml
jbossesb-listener.xml


Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/build.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/build.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -4,21 +4,23 @@
 		${line.separator}
 	</description>
 
+        <property name="additional.deploys" value="applicationContext.xml dataAccessContext-local.xml jdbc.properties sql-map-config.xml"/>
+
 	<!-- 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="quickstart-specific-dependencies">
+		<path id="quickstart-dependencies-classpath">
+			<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib" includes="hsqldb.jar"/>
+		</path>
+	</target>
+
 	<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">
+		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.spring_jpetstore.test.SendJMSMessage" failonerror="true">
 			<arg value="./sample-order.xml" />
 			<classpath refid="exec-classpath" />
 		</java>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/deployment.xml (from rev 12392, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/deployment.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -0,0 +1,5 @@
+<jbossesb-deployment>
+  <depends>jboss.esb:deployment=spring.esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_spring_jpetstore_Request</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_spring_jpetstore_Response</depends>
+</jbossesb-deployment>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.bat
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.bat	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.bat	2007-06-08 06:12:44 UTC (rev 12406)
@@ -1,2 +1,2 @@
-"%JAVA_HOME%/bin/java" -classpath ..\lib\hsqldb.jar org.hsqldb.util.DatabaseManager
+"%JAVA_HOME%/bin/java" -classpath ..\lib\ext\hsqldb.jar org.hsqldb.util.DatabaseManager
 

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.sh
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.sh	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.sh	2007-06-08 06:12:44 UTC (rev 12406)
@@ -1 +1 @@
-java -cp ../lib/hsqldb.jar org.hsqldb.util.DatabaseManager
+java -cp ../lib/ext/hsqldb.jar org.hsqldb.util.DatabaseManager

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.bat
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.bat	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.bat	2007-06-08 06:12:44 UTC (rev 12406)
@@ -1 +1 @@
-"%JAVA_HOME%/bin/java" -classpath ..\lib\hsqldb.jar org.hsqldb.Server -database jpetstore
\ No newline at end of file
+"%JAVA_HOME%/bin/java" -classpath ..\lib\ext\hsqldb.jar org.hsqldb.Server -database jpetstore

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.sh
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.sh	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/hsqldb/server.sh	2007-06-08 06:12:44 UTC (rev 12406)
@@ -1 +1 @@
-java -classpath ../lib/hsqldb.jar org.hsqldb.Server -database jpetstore
\ No newline at end of file
+java -classpath ../lib/ext/hsqldb.jar org.hsqldb.Server -database jpetstore

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbm-queue-service.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbm-queue-service.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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_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>
   <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_spring_jpetstore_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/spring_jpetstore/jbmq-queue-service.xml (from rev 12392, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbmq-queue-service.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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_spring_jpetstore_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_spring_jpetstore_Response">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jboss-esb.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jboss-esb.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -38,7 +38,7 @@
             </listeners>
             <actions>
                <action name="insertOrderAction" 
-               		class="org.jboss.soa.esb.samples.quickstart.spring.InsertOrderAction" 
+               		class="org.jboss.soa.esb.samples.quickstart.spring_jpetstore.InsertOrderAction" 
                		process="insertOrder">
                		<property name="exceptionMethod" value="exceptionHandler"/>
                		<property name="springContextXml" value="applicationContext.xml,dataAccessContext-local.xml"/>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbossesb-gateway.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbossesb-gateway.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbossesb-gateway.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbossesb-listener.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbossesb-listener.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/jbossesb-listener.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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>

Deleted: labs/jbossesb/workspace/dbevenius/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)

Deleted: labs/jbossesb/workspace/dbevenius/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)

Deleted: labs/jbossesb/workspace/dbevenius/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)

Deleted: labs/jbossesb/workspace/dbevenius/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/ext (from rev 12392, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/lib/ext)

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

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

Deleted: labs/jbossesb/workspace/dbevenius/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)

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

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/readme.txt
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/readme.txt	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/readme.txt	2007-06-08 06:12:44 UTC (rev 12406)
@@ -66,7 +66,8 @@
 	
 	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
+	see the modified message in the outbound queue:
+quickstart_spring_jpetstore_Response
 
 Project file descriptions:
 ==========================

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

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/InsertOrderAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/InsertOrderAction.java	2007-06-07 20:55:18 UTC (rev 12392)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/InsertOrderAction.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -1,152 +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_jpetstore;
-
-import org.jboss.soa.esb.actions.AbstractSpringAction;
-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.Order;
-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_jpetstore/InsertOrderAction.java (from rev 12392, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/InsertOrderAction.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/InsertOrderAction.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/InsertOrderAction.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -0,0 +1,152 @@
+/*
+ * 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_jpetstore;
+
+import org.jboss.soa.esb.actions.AbstractSpringAction;
+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.Order;
+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_jpetstore/test (from rev 12392, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/test)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/test/SendJMSMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/test/SendJMSMessage.java	2007-06-07 20:55:18 UTC (rev 12392)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/test/SendJMSMessage.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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_jpetstore.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_jpetstore/test/SendJMSMessage.java (from rev 12392, labs/jbossesb/trunk/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/test/SendJMSMessage.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/test/SendJMSMessage.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/test/SendJMSMessage.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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_jpetstore.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-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/build.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -5,7 +5,7 @@
 		${line.separator}
 	</description>
 	
-	<property name="additional.deploys" value="smooks-res-csv2xml.xml" />
+	<property name="additional.deploys" value="smooks-res.xml" />
 			
 	<!-- Import the base Ant build script... -->
 	<import file="../conf/base-build.xml"/>

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-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/jboss-esb.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -28,23 +28,34 @@
 			</listeners>
 			
 				<actions>
-					
-					<action name="print-before" class="org.jboss.soa.esb.actions.SystemPrintln">
-						<property name="message" value="[transform_CSV2Smooks_Intermediate_format] Message before transformation" />
+                    <!--
+                    Note that with this quickstart, the transformation is broken into 2 transforms; CSV to XML
+                    and XML to XML.  These 2 transformations could easly be merged into a single transform, saving
+                    on XML processing.
+                    -->
+
+                    <action name="print-before" class="org.jboss.soa.esb.actions.SystemPrintln">
+						<property name="message" value="[transform_CSV2Smooks_Intermediate_format] Message before CVS to XML transformation" />
 		            </action>	 
 					
+                    <!--
+                    Transform 1: CSV to XML...
+                    -->
 					<action name="transform-from-csv" class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
-                        <property name="resource-config" value="/smooks-res-csv2xml.xml" />
+                        <property name="resource-config" value="/smooks-res.xml" />
 			            <property name="from-type" value="text/csv:order-list" />
 			            <property name="to-type" value="text/xml:smooks-order-xml" />
 	                </action>
 					
 					<action name="print-after-csv-tranform" class="org.jboss.soa.esb.actions.SystemPrintln">
-						<property name="message" value="[transform_CSV2Smooks_Intermediate_format] Message after transformation" />
+						<property name="message" value="[transform_CSV2Smooks_Intermediate_format] Message after CVS to XML transformation" />
 		            </action>	 
 					
+                    <!--
+                    Transform 2: XML to XML...
+                    -->
 	                <action name="transform-smooksXml-to-canonicalXml" class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
-                        <property name="resource-config" value="/smooks-res-csv2xml.xml" />
+                        <property name="resource-config" value="/smooks-res.xml" />
 			            <property name="from-type" value="text/xml:smooks-order-xml" />
 			            <property name="to-type" value="text/xml:canonical-order-xml" />
 	                </action>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/smooks-res-csv2xml.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/smooks-res-csv2xml.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_CSV2XML/smooks-res-csv2xml.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -1,56 +0,0 @@
-<?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>

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-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jboss-esb.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -31,11 +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" />
-					<property name="to-type" value="text/xml:shipOrder" />
+                    <property name="resource-config" value="/smooks-res.xml" />
 				</action>
 				<action name="print-after" class="org.jboss.soa.esb.actions.SystemPrintln">
 					<property name="message" value="[transform_EDI2XML_Groovy_XSLT] Message after transformation" />

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/smooks-cdr.lst
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/smooks-cdr.lst	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/smooks-cdr.lst	2007-06-08 06:12:44 UTC (rev 12406)
@@ -1,17 +0,0 @@
-########################################################################################################
-# Uncomment out to load config from local XML file
-########################################################################################################
-/smooks-res.xml
-/org/milyn/templating/templating-cdu-creators-0.1.cdrl
-/org/milyn/smooks/scripting/scripting-cdu-creators.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

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-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/smooks-res.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -1,30 +1,24 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
 
-	<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-config selector="org.xml.sax.driver">
         <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>
+		<param name="mapping-model">/org/jboss/xtrans/edi-to-xml-order-mapping.xml</param>
 	</resource-config>
 
-	<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-config selector="date">
         <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>
+		<param name="input-format">EEE MMM dd HH:mm:ss z yyyy</param>
 	</resource-config>
 
-	<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-config selector="state">
         <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>
+		<param name="enrichments-uri">/org/jboss/xtrans/us-state-codes.properties</param>
 	</resource-config>
 
-	<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-config selector="order">
         <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="is-xslt-templatelet"><![CDATA[false]]></param>
-		<param name="action"><![CDATA[replace]]></param>
+		<param name="is-xslt-templatelet">false</param>
 	</resource-config>
 
-</smooks-resource-list>
\ No newline at end of file
+</smooks-resource-list>

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-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/jboss-esb.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -43,14 +43,12 @@
                   	class="org.jboss.soa.esb.samples.quickstart.transformxml2pojo.MyJMSListenerAction" 
                    	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" />
-					<property name="to-type" value="text/xml:shipOrder" />
+                    <property name="resource-config" value="/smooks-res.xml" />
                 </action>
-                <action name="convertPOJO2Message" class="org.jboss.soa.esb.dvdstore.DVDStoreAction"	/>	
+
+                <action name="convertPOJO2Message" class="org.jboss.soa.esb.dvdstore.DVDStoreAction"	/>
                 <action name="displayAfterTransformer" class="org.jboss.soa.esb.samples.quickstart.transformxml2pojo.MyJMSListenerAction" process="displayMessage" />  
                 <action name="returnToSender"
                 	class="org.jboss.soa.esb.samples.quickstart.transformxml2pojo.MyJMSListenerAction" process="sendResponse" />           	   

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/smooks-cdr.lst
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/smooks-cdr.lst	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/smooks-cdr.lst	2007-06-08 06:12:44 UTC (rev 12406)
@@ -1,10 +0,0 @@
-####################################################
-# Uncomment out to load config from database
-####################################################
-# http://localhost:8080/jboss-esb-console/transform/smooks-config.jsf
-
-####################################################
-# Uncomment out to load config from local XML file
-####################################################
-/smooks-res.xml
-/org/milyn/templating/templating-cdu-creators-0.1.cdrl

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-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/smooks-res.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -1,17 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
 
-	<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>
-
     <!-- Populate the OrderHeader -->
-	<resource-config selector="order" target-profile="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice">
+	<resource-config selector="order">
         <resource>org.milyn.javabean.ProcessingPhaseBeanPopulator</resource>
         <param name="beanId">orderHeader</param>
 		<param name="beanClass">org.jboss.soa.esb.dvdstore.OrderHeader</param>
@@ -26,7 +17,7 @@
     </resource-config>
 
     <!-- Populate the Customer -->
-    <resource-config selector="order customer" target-profile="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice">
+    <resource-config selector="order customer">
         <resource>org.milyn.javabean.ProcessingPhaseBeanPopulator</resource>
 		<param name="beanId">customer</param>
 		<param name="beanClass">org.jboss.soa.esb.dvdstore.Customer</param>
@@ -39,7 +30,7 @@
 	</resource-config>
 
     <!-- Populate the OrderItem list -->
-	<resource-config selector="order orderlines orderline" target-profile="from-type:text/xml:fullfillorder and from:dvdstore:orderdispatchservice">
+	<resource-config selector="order orderlines orderline">
         <resource>org.milyn.javabean.ProcessingPhaseBeanPopulator</resource>
 		<param name="beanId">orderItem</param>
 		<param name="beanClass">org.jboss.soa.esb.dvdstore.OrderItem</param>
@@ -53,12 +44,12 @@
         </param>
 	</resource-config>
 
-	<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-config selector="order orderlines orderline">
         <resource>/org/jboss/soa/esb/dvdstore/orderitem.st</resource>
 	</resource-config>
 
     <resource-config selector="decoder:LongDate">
-        <resource>org.milyn.javabean.decoders.DateDecoder</resource>
+        <resource>org.milyn.javabean.decoders.CalendarDecoder</resource>
         <param name="format">EEE MMM dd HH:mm:ss z yyyy</param>
     </resource-config>
     

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-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/dvdstore/OrderHeader.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -21,7 +21,7 @@
 
 package org.jboss.soa.esb.dvdstore;
 
-import java.util.Date;
+import java.util.Calendar;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
@@ -30,7 +30,7 @@
 	
 	// <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 Date orderDate;
+	private Calendar orderDate;
 	private int statusCode;
 	private double netAmount;
 	private double totalAmount;
@@ -51,13 +51,13 @@
 	/**
 	 * @return Returns the orderDate.
 	 */
-	public Date getOrderDate() {
+	public Calendar getOrderDate() {
 		return orderDate;
 	}
 	/**
 	 * @param orderDate The orderDate to set.
 	 */
-	public void setOrderDate(Date orderDate) {
+	public void setOrderDate(Calendar orderDate) {
 		this.orderDate = orderDate;
 	}
 	/**

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-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/jboss-esb.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -1,46 +1,45 @@
 <?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">
+        xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd"
+        parameterReloadSecs="5">
 
-	<providers>
-		<jms-provider name="JBossMQ"
-			connection-factory="ConnectionFactory"
-			jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-			jndi-URL="localhost">
+    <providers>
+        <jms-provider name="JBossMQ"
+                      connection-factory="ConnectionFactory"
+                      jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
+                      jndi-URL="localhost">
 
-			<jms-bus busid="quickstartGwChannel">
-				<jms-message-filter dest-type="QUEUE" dest-name="queue/quickstart_date_manipulation_gw" />
-			</jms-bus>
-			<jms-bus busid="quickstartEsbChannel">
-				<jms-message-filter dest-type="QUEUE" dest-name="queue/quickstart_date_manipulation_esb" />
-			</jms-bus>
+            <jms-bus busid="quickstartGwChannel">
+                <jms-message-filter dest-type="QUEUE" dest-name="queue/quickstart_date_manipulation_gw"/>
+            </jms-bus>
+            <jms-bus busid="quickstartEsbChannel">
+                <jms-message-filter dest-type="QUEUE" dest-name="queue/quickstart_date_manipulation_esb"/>
+            </jms-bus>
 
-		</jms-provider>
-	</providers>
+        </jms-provider>
+    </providers>
 
-	<services>
-		<service category="FirstServiceESB" name="SimpleListener"
-			description="Hello World">
-			<listeners>
-				<jms-listener name="JMS-Gateway" busidref="quickstartGwChannel" maxThreads="1" is-gateway="true"/>
-				<jms-listener name="quickstart" busidref="quickstartEsbChannel" maxThreads="1" />
-			</listeners>
-			<actions>
-				<action name="print-before" class="org.jboss.soa.esb.actions.SystemPrintln">
-					<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" />
-					<property name="to-type" value="text/xml:messageAtB" />
-				</action>
-				<action name="print-after" class="org.jboss.soa.esb.actions.SystemPrintln">
-					<property name="message" value="[transform_XML2XML_date_manipulation] Message after transformation" />
-				</action>
-			</actions>
-		</service>
-	</services>
+    <services>
+        <service category="FirstServiceESB" name="SimpleListener"
+                 description="Hello World">
+            <listeners>
+                <jms-listener name="JMS-Gateway" busidref="quickstartGwChannel" maxThreads="1" is-gateway="true"/>
+                <jms-listener name="quickstart" busidref="quickstartEsbChannel" maxThreads="1"/>
+            </listeners>
+            <actions>
+                <action name="print-before" class="org.jboss.soa.esb.actions.SystemPrintln">
+                    <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"/>
+                </action>
+                <action name="print-after" class="org.jboss.soa.esb.actions.SystemPrintln">
+                    <property name="message"
+                              value="[transform_XML2XML_date_manipulation] Message after transformation"/>
+                </action>
+            </actions>
+        </service>
+    </services>
 
 </jbossesb>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/smooks-cdr.lst
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/smooks-cdr.lst	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/smooks-cdr.lst	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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

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-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_date_manipulation/smooks-res.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -5,9 +5,8 @@
 		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.
 	-->
-	<resource-config selector="Order" target-profile="from-type:text/xml:messageAtA AND from:A AND to-type:text/xml:messageAtB AND to:B">
+	<resource-config selector="Order">
         <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">
@@ -24,24 +23,23 @@
 		Generate the new "OrderDate" element from the date data in the orderDate bean and insert the result before
 		the OrderLines element.
 	-->
-	<resource-config selector="OrderLines" target-profile="from-type:text/xml:messageAtA AND from:A AND to-type:text/xml:messageAtB AND to:B">
+	<resource-config selector="OrderLines">
         <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>]]></resource>
-		<param name="RESERVED:RESOURCE_NAME_PARAM"><![CDATA[XSLT (Templatelet)]]></param>
-		<param name="action"><![CDATA[insertbefore]]></param>
+               <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>]]></resource>
+		<param name="action">insertbefore</param>
 	</resource-config>
 	
 	<!-- 
 		Remove the orderDate attribute from the Order element - it's now in the message as an OrderDate element.
 	-->
-	<resource-config selector="Order" target-profile="from-type:text/xml:messageAtA AND from:A AND to-type:text/xml:messageAtB AND to:B">
+	<resource-config selector="Order">
         <resource>org.milyn.cdres.trans.RemoveAttributeTU</resource>
-		<param name="attributeName"><![CDATA[orderDate]]></param>
+		<param name="attributeName">orderDate</param>
 	</resource-config>
 	
 </smooks-resource-list>

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-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/jboss-esb.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -31,11 +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" />
-					<property name="to-type" value="text/xml:messageAtB" />
+                    <property name="resource-config" value="/smooks-res.xml" />
 				</action>
 				<action name="print-after" class="org.jboss.soa.esb.actions.SystemPrintln">
 					<property name="message" value="[transform_XML2XML_simple] Message after transformation" />

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/smooks-cdr.lst
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/smooks-cdr.lst	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/smooks-cdr.lst	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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

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-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/transform_XML2XML_simple/smooks-res.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
 
-	<resource-config selector="OrderLine" target-profile="from-type:text/xml:messageAtA AND from:A AND to-type:text/xml:messageAtB AND to:B">
+	<resource-config selector="OrderLine">
         <resource type="xsl">
             <![CDATA[<line-item>
                 <product><xsl:value-of select="./Product/@productId" /></product>
@@ -9,6 +9,6 @@
                 <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-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/build.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -2,6 +2,8 @@
 
     <property environment="env" />
 
+    <property name="additional.deploys" value="smooks-res.xml" />
+    
     <!-- Import the base Ant build script... -->
     <import file="../conf/base-build.xml"/>
 
@@ -96,7 +98,7 @@
         <fail unless="ae-available">**** DEPLOYMENT FAILED... Sorry, this Quickstart requires version 3.1 of the ActiveEndpoints 'ActiveBPEL' engine to be installed on your local Tomcat server at ${env.CATALINA_HOME}.  Download the engine from http://www.active-endpoints.com/</fail>
     </target>
 
-    <target name="build-ejb-service">
+    <target name="build-ejb-service" depends="dependencies">
         <delete dir="${build.dir}/${servicename}" />
         <mkdir dir="${build.dir}/${servicename}" />
 		<javac srcdir="services/${servicename}/src" destdir="${build.dir}/${servicename}">

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-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_bpel/jboss-esb.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -114,15 +114,13 @@
                 <!-- 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"/>
-                    <property name="to-type" value="text/xml:SendSalesOrderNotification"/>
+                    <property name="resource-config" value="/smooks-res-csv2xml.xml" />
                 </action>
+
                 <action name="print-after-transform" class="org.jboss.soa.esb.actions.SystemPrintln">
                     <property name="message" value="[Quickstart_webservice_bpel] Message after transform and before SOAPClient"/>
                 </action>
+
                 <!-- Inject the com.activebpel.ordermanagement.SalesOrderNotification instance
                      into the SOAPClient. SOAPClient will use SOAPUI to construct a soap request
                      template and will then use OGNL to populate the values (from the Smooks 

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/readme.txt
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/readme.txt	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/readme.txt	2007-06-08 06:12:44 UTC (rev 12406)
@@ -1,22 +1,29 @@
 Overview:
 =========
-   TODO
+   This sample demonstrates how to deploy a JSR181 Webservice endpoint on JBossESB
+   using the JBossWSAdapter action.
 
 
 Before Running:
 ===============
 1. Update the "org.jboss.esb.server.home" property in the quickstarts.properties
-   file in "../".
-2. Make sure the jbossesb.sar is deployed on your JBoss Application Server.
-   In the ESB "install" folder update deployment.properties and then run "ant".
-   This example does require you to use a version for 4.0.4+ with the EJB3 profile.
-3. Make sure the JBoss Application server is running.
+   file in "../conf".
+2. Make sure you're running the ESB on JBoss AS v4.2.0GA.
+3. Make sure the following ESB components are deployed to your JBoss AS. These
+   components can be located in the "lib" folder of the distro (build/jbossesb/lib
+   if you are working from the SVN source).
+        a) jbossesb.esb
+        b) jbossesb.sar
+4. Delete the jbm-queue-service.xml file from jbossesb.esb.
+5. Checkout everything from the following Subversion address and run the
+   Ant script contained therein: http://anonsvn.labs.jboss.com/labs/jbossesb/workspace/jbossws2_0_0/
+6. Start the JBoss App Server.
 
 
 To Run:
 =======
-1. In the first command window, execute "ant".  This will compile the project, build
-the needed jars and deploy the ESB archive component to the Application Server.  If you are 
-monitoring the Application Server console you will see it hot deploy the WAR.
+1. In the first command window, execute "ant clean deploy".  This will compile the project, build
+   the needed jars and deploy the ESB archive component to the Application Server.  If you are
+   monitoring the Application Server console you will see it hot deploy the WAR.
 
-2. Run "ant runtest". 
+2. Run "ant runtest".  You will see the message being processed on the App Server Java console window. 

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/src/org/jboss/soa/esb/samples/quickstart/webservicejbosswsadapter01/test/soap_message_01.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/src/org/jboss/soa/esb/samples/quickstart/webservicejbosswsadapter01/test/soap_message_01.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/src/org/jboss/soa/esb/samples/quickstart/webservicejbosswsadapter01/test/soap_message_01.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -2,7 +2,7 @@
    <soapenv:Header/>
    <soapenv:Body>
       <good:sayGoodbye>
-         <String_1>Goodbye!!</String_1>
+         <message>Goodbye!!</message>
       </good:sayGoodbye>
    </soapenv:Body>
 </soapenv:Envelope>
\ No newline at end of file

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/src/org/jboss/soa/esb/samples/quickstart/webservicejbosswsadapter01/test/soap_message_02.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/src/org/jboss/soa/esb/samples/quickstart/webservicejbosswsadapter01/test/soap_message_02.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/src/org/jboss/soa/esb/samples/quickstart/webservicejbosswsadapter01/test/soap_message_02.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -2,7 +2,7 @@
    <soapenv:Header/>
    <soapenv:Body>
       <good:sayGoodbyeWithoutResponse>
-         <String_1>Goodbye!!</String_1>
+         <message>Goodbye!!</message>
       </good:sayGoodbyeWithoutResponse>
    </soapenv:Body>
 </soapenv:Envelope>
\ No newline at end of file

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/src/org/jboss/soa/esb/samples/quickstart/webservicejbosswsadapter01/webservice/GoodbyeWorldWS.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/src/org/jboss/soa/esb/samples/quickstart/webservicejbosswsadapter01/webservice/GoodbyeWorldWS.java	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/webservice_jbossws_adapter_01/src/org/jboss/soa/esb/samples/quickstart/webservicejbosswsadapter01/webservice/GoodbyeWorldWS.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -2,6 +2,7 @@
 
 import javax.jws.WebService;
 import javax.jws.WebMethod;
+import javax.jws.WebParam;
 import javax.jws.soap.SOAPBinding;
 
 import org.jboss.soa.esb.message.Message;
@@ -15,7 +16,7 @@
 public class GoodbyeWorldWS {
 
     @WebMethod
-    public String sayGoodbye(String message) {
+    public String sayGoodbye(@WebParam(name="message") String message) {
 
         Message esbMessage = JBossWSAdapter.getMessage();
         if(esbMessage != null) {
@@ -26,7 +27,7 @@
     }
 
     @WebMethod
-    public void sayGoodbyeWithoutResponse(String message) {
+    public void sayGoodbyeWithoutResponse(@WebParam(name="message") String message) {
 
         Message esbMessage = JBossWSAdapter.getMessage();
         if(esbMessage != null) {

Modified: labs/jbossesb/workspace/dbevenius/product/services/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/build.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/services/build.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -8,6 +8,7 @@
 		<ant dir="jbrules" target="dist"/>
 		<ant dir="smooks" target="dist"/>
         <ant dir="soapui-client" target="sar"/>
+        <ant dir="spring" target="dist"/>
     </target>
 
     <target name="clean">
@@ -16,6 +17,7 @@
 		<ant dir="jbrules" target="clean"/>
 		<ant dir="smooks" target="clean"/>
         <ant dir="soapui-client" target="clean"/>
+        <ant dir="spring" target="clean"/>
     </target>
 
     <target name="test">
@@ -24,6 +26,7 @@
 		<ant dir="jbrules" target="test"/>
 		<ant dir="smooks" target="test"/>
 		<ant dir="soapui-client" target="test"/>
+		<ant dir="spring" target="test"/>
     </target>
     
     <target name="copy-buildfiles">
@@ -37,6 +40,8 @@
         <copy todir="smooks" file="build.properties"/>
         <copy todir="soapui-client" file="base-project-build.xml"/>
         <copy todir="soapui-client" file="build.properties"/>
+        <copy todir="spring" file="base-project-build.xml"/>
+        <copy todir="spring" file="build.properties"/>
     </target>
 	
 </project>

Modified: labs/jbossesb/workspace/dbevenius/product/services/smooks/base-project-build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/smooks/base-project-build.xml	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/base-project-build.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -60,7 +60,7 @@
     <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="src/main/resources/"/>
         	<fileset dir="build" includes="*.jar"/>
          </copy>
     </target>
@@ -69,7 +69,7 @@
 		<!-- 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="**/*" />
+    		<fileset dir="build/${ant.project.name}.esb" />
     	</copy>
 	</target>
     

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

Modified: 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/SmooksInstanceManager.java	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksInstanceManager.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -337,14 +337,22 @@
 			public void onException(JMSException e) {
 				synchronized (ExceptionListener.class) {
 					if(!hasHandledOneException) {
-						logger.error("JMS Exception on Transformation Configuration Update Listener.", e);
-						close();
+                        if(!logger.isDebugEnabled()) {
+                            logger.warn("JMS Exception on Transformation Configuration Update Listener: " + e.getMessage());
+                        } else {
+                            logger.debug("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);
-							}
+                                if(!logger.isDebugEnabled()) {
+	    							logger.warn("Interrupted during reconnect attempt.  Aborting reconnect!  Will need restart to reconnect: " + e.getMessage());
+                                } else {
+                                    logger.debug("Interrupted during reconnect attempt.  Aborting reconnect!  Will need restart to reconnect.", e);
+                                }
+                            }
 						}
 						hasHandledOneException = true;
 					}

Modified: 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/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -211,6 +211,9 @@
     }
 
     public void destroy() throws ActionLifecycleException {
+        if(smooksInstanceManager != SmooksService.getGlobalSmooksInstanceManager()) {
+            smooksInstanceManager.close();
+        }
     }
 
 	/* (non-Javadoc)

Modified: labs/jbossesb/workspace/dbevenius/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java	2007-06-08 05:38:39 UTC (rev 12405)
+++ labs/jbossesb/workspace/dbevenius/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -28,6 +28,11 @@
 import java.util.ArrayList;
 import java.math.BigDecimal;
 
+import javax.xml.transform.stream.StreamResult;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.dom.YADOMUtil;
+import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
 /**
@@ -118,15 +123,24 @@
 
     // Lifted from milyn commons
     public static boolean compareCharStreams(InputStream s1, InputStream s2) {
-        StringBuffer s1Buf, s2Buf;
-
         try {
-            s1Buf = trimLines(s1);
-            s2Buf = trimLines(s2);
-
-            return s1Buf.toString().equals(s2Buf.toString());
+            final String xml1 = trimLines(s1).toString() ;
+            final String xml2 = trimLines(s2).toString() ;
+            
+            final Document doc1 = YADOMUtil.parse(xml1) ;
+            final Document doc2 = YADOMUtil.parse(xml2) ;
+            
+            final StringWriter writer1 = new StringWriter() ;
+            final StringWriter writer2 = new StringWriter() ;
+            YADOMUtil.serialize(doc1, new StreamResult(writer1)) ;
+            YADOMUtil.serialize(doc2, new StreamResult(writer2)) ;
+            return (writer1.toString().equals(writer2.toString())) ;
         } catch (IOException e) {
             // fail the comparison
+        } catch (SAXException e) {
+            // fail the comparison
+        } catch (ConfigurationException e) {
+            // fail the comparison
         }
 
         return false;
@@ -142,4 +156,12 @@
 
         return stringBuf;
     }
+    
+    public static void main(final String[] args)
+    {
+        final InputStream expectedIS = SoapUIClientServiceMBeanUnitTest.class.getResourceAsStream("expected_02.xml") ;
+        final InputStream outputIS = SoapUIClientServiceMBeanUnitTest.class.getResourceAsStream("output.xml") ;
+        
+        System.out.println("compare returns: " + compareCharStreams(expectedIS, outputIS));
+    }
 }

Copied: labs/jbossesb/workspace/dbevenius/product/services/spring (from rev 12392, labs/jbossesb/trunk/product/services/spring)


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


Deleted: labs/jbossesb/workspace/dbevenius/product/services/spring/base-project-build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/spring/base-project-build.xml	2007-06-07 20:55:18 UTC (rev 12392)
+++ labs/jbossesb/workspace/dbevenius/product/services/spring/base-project-build.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -1,96 +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"/>
-	</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/spring/base-project-build.xml (from rev 12392, labs/jbossesb/trunk/product/services/spring/base-project-build.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/spring/base-project-build.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/spring/base-project-build.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -0,0 +1,96 @@
+<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"/>
+	</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/spring/build.properties
===================================================================
--- labs/jbossesb/trunk/product/services/spring/build.properties	2007-06-07 20:55:18 UTC (rev 12392)
+++ labs/jbossesb/workspace/dbevenius/product/services/spring/build.properties	2007-06-08 06:12:44 UTC (rev 12406)
@@ -1 +0,0 @@
-esb.product.lib.dir=../../../product/build/jbossesb/lib
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/services/spring/build.properties (from rev 12392, labs/jbossesb/trunk/product/services/spring/build.properties)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/spring/build.properties	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/spring/build.properties	2007-06-08 06:12:44 UTC (rev 12406)
@@ -0,0 +1 @@
+esb.product.lib.dir=../../../product/build/jbossesb/lib
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/product/services/spring/build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/spring/build.xml	2007-06-07 20:55:18 UTC (rev 12392)
+++ labs/jbossesb/workspace/dbevenius/product/services/spring/build.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -1,8 +0,0 @@
-<project name="spring" default="test" basedir=".">
-	
-	<!-- Import the base Ant build script... -->
-	<import file="base-project-build.xml"/>
-	
-	<target name="test" depends="base.test"/>
-
-</project>
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/services/spring/build.xml (from rev 12392, labs/jbossesb/trunk/product/services/spring/build.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/spring/build.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/spring/build.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -0,0 +1,8 @@
+<project name="spring" default="test" basedir=".">
+	
+	<!-- Import the base Ant build script... -->
+	<import file="base-project-build.xml"/>
+	
+	<target name="test" depends="base.test"/>
+
+</project>
\ No newline at end of file

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

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

Deleted: labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/aspectjrt.jar
===================================================================
(Binary files differ)

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

Deleted: labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/aspectjweaver.jar
===================================================================
(Binary files differ)

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

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

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

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

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

Copied: labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/build-time/cglib-2.1_3.jar (from rev 12392, labs/jbossesb/trunk/product/services/spring/lib/ext/build-time/cglib-2.1_3.jar)
===================================================================
(Binary files differ)

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

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

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

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

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

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

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

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

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

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

Deleted: labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/ibatis-2.3.0.677.jar
===================================================================
(Binary files differ)

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

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

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

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

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

Deleted: labs/jbossesb/workspace/dbevenius/product/services/spring/lib/ext/spring.jar
===================================================================
(Binary files differ)

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

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

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

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

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

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

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

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

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

Deleted: labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/java/org/jboss/soa/esb/actions/AbstractSpringAction.java
===================================================================
--- labs/jbossesb/trunk/product/services/spring/src/main/java/org/jboss/soa/esb/actions/AbstractSpringAction.java	2007-06-07 20:55:18 UTC (rev 12392)
+++ labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/java/org/jboss/soa/esb/actions/AbstractSpringAction.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -1,194 +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 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
-   {
-   }
-}

Copied: labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/java/org/jboss/soa/esb/actions/AbstractSpringAction.java (from rev 12392, labs/jbossesb/trunk/product/services/spring/src/main/java/org/jboss/soa/esb/actions/AbstractSpringAction.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/java/org/jboss/soa/esb/actions/AbstractSpringAction.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/java/org/jboss/soa/esb/actions/AbstractSpringAction.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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
+   {
+   }
+}

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

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

Deleted: labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/services/spring/src/main/resources/META-INF/jboss-esb.xml	2007-06-07 20:55:18 UTC (rev 12392)
+++ labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/resources/META-INF/jboss-esb.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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 spring integration
-     -->
-</jbossesb>

Copied: labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/resources/META-INF/jboss-esb.xml (from rev 12392, labs/jbossesb/trunk/product/services/spring/src/main/resources/META-INF/jboss-esb.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/resources/META-INF/jboss-esb.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/spring/src/main/resources/META-INF/jboss-esb.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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 spring integration
+     -->
+</jbossesb>

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

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

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

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

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

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

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

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

Deleted: labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/AbstractSpringActionUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/AbstractSpringActionUnitTest.java	2007-06-07 20:55:18 UTC (rev 12392)
+++ labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/AbstractSpringActionUnitTest.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -1,73 +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;
-
-/**
- * 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/>");
-
-      config.setAttribute("springContextXml", "/spring-context-1.xml");
-
-      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 configPath1 = "/spring-context-1.xml";
-      String configPath2 = "/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 = "/spring-context-1.xml";
-
-      config.setAttribute("springContextXml", pathToConfigFile);
-
-      MockSpringAction mockAction = new MockSpringAction(config);
-      assertEquals("Greeting Changed", mockAction.sayHelloAopStyle());
-      assertEquals(false, mockAction.isBeanFactoryNull());
-   }
-}

Copied: labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/AbstractSpringActionUnitTest.java (from rev 12392, labs/jbossesb/trunk/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/AbstractSpringActionUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/AbstractSpringActionUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/AbstractSpringActionUnitTest.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -0,0 +1,73 @@
+/*
+ * 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;
+
+/**
+ * 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/>");
+
+      config.setAttribute("springContextXml", "/spring-context-1.xml");
+
+      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 configPath1 = "/spring-context-1.xml";
+      String configPath2 = "/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 = "/spring-context-1.xml";
+
+      config.setAttribute("springContextXml", pathToConfigFile);
+
+      MockSpringAction mockAction = new MockSpringAction(config);
+      assertEquals("Greeting Changed", mockAction.sayHelloAopStyle());
+      assertEquals(false, mockAction.isBeanFactoryNull());
+   }
+}

Deleted: labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/MockSpringAction.java
===================================================================
--- labs/jbossesb/trunk/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/MockSpringAction.java	2007-06-07 20:55:18 UTC (rev 12392)
+++ labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/MockSpringAction.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/MockSpringAction.java (from rev 12392, labs/jbossesb/trunk/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/MockSpringAction.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/MockSpringAction.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/MockSpringAction.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/MyInterceptor.java
===================================================================
--- labs/jbossesb/trunk/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/MyInterceptor.java	2007-06-07 20:55:18 UTC (rev 12392)
+++ labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/MyInterceptor.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/MyInterceptor.java (from rev 12392, labs/jbossesb/trunk/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/MyInterceptor.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/MyInterceptor.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/MyInterceptor.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/SaySomething.java
===================================================================
--- labs/jbossesb/trunk/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/SaySomething.java	2007-06-07 20:55:18 UTC (rev 12392)
+++ labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/SaySomething.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/SaySomething.java (from rev 12392, labs/jbossesb/trunk/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/SaySomething.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/SaySomething.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/java/org/jboss/soa/esb/actions/spring/SaySomething.java	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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;
+   }
+}

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

Deleted: labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/resources/spring-context-1.xml
===================================================================
--- labs/jbossesb/trunk/product/services/spring/src/test/resources/spring-context-1.xml	2007-06-07 20:55:18 UTC (rev 12392)
+++ labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/resources/spring-context-1.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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/services/spring/src/test/resources/spring-context-1.xml (from rev 12392, labs/jbossesb/trunk/product/services/spring/src/test/resources/spring-context-1.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/resources/spring-context-1.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/resources/spring-context-1.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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/services/spring/src/test/resources/spring-context-2.xml
===================================================================
--- labs/jbossesb/trunk/product/services/spring/src/test/resources/spring-context-2.xml	2007-06-07 20:55:18 UTC (rev 12392)
+++ labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/resources/spring-context-2.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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/services/spring/src/test/resources/spring-context-2.xml (from rev 12392, labs/jbossesb/trunk/product/services/spring/src/test/resources/spring-context-2.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/resources/spring-context-2.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/services/spring/src/test/resources/spring-context-2.xml	2007-06-08 06:12:44 UTC (rev 12406)
@@ -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>




More information about the jboss-svn-commits mailing list