[jboss-svn-commits] JBL Code SVN: r17818 - in labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2: product/docs and 82 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jan 14 11:11:25 EST 2008
Author: kevin.conner at jboss.com
Date: 2008-01-14 11:11:24 -0500 (Mon, 14 Jan 2008)
New Revision: 17818
Added:
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/advanced/jBPMIntegrationGuide.odt
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/services/ServiceOrchestration.odt
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/services/ServiceOrchestration.pdf
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/conf/jbossesb-properties.xml.template
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/internal/soa/esb/rosetta/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/internal/soa/esb/rosetta/pooling/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainerUnitTest.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/build.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jboss-esb.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-properties.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-service.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jndi.properties
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/juddi.properties
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/lib/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/log4j.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/populate.sql
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/quickstart-ds.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/readme.txt
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/hsqldb/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/hsqldb/create.sql
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/quickstart/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/quickstart/helloworldsqlaction/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/quickstart/helloworldtxsqlaction/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/quickstart/helloworldtxsqlaction/MyAction.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/build.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/deployment.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/hsqldb-jdbc-state-service.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jbm-queue-service.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jbmq-queue-service.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jboss-esb.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jbossesb-properties.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jndi.properties
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/juddi.properties
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/log4j.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/messaging-roles.properties
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/messaging-users.properties
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/readme.txt
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/quickstart/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/quickstart/jmssecured/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/quickstart/jmssecured/test/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/quickstart/jmssecured/test/SendJMSMessage.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/ExceptionFlowTest.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/TimerTest.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/resources/testExceptionHandling.jpg
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/resources/testExceptionHandling.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/resources/testTimer.jpg
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/resources/testTimer.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/AggregatorTest.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/CustomActionTest.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/GroovyGatewayTest.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/JMSSecuredTest.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/NativeClientTest.java
Removed:
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/advanced/ServiceOrchestration.odt
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/advanced/ServiceOrchestration.pdf
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/internal/soa/esb/rosetta/pooling/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainerUnitTest.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/build.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jboss-esb.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-properties.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-service.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jndi.properties
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/juddi.properties
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/lib/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/log4j.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/populate.sql
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/quickstart-ds.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/readme.txt
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/hsqldb/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/hsqldb/create.sql
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/quickstart/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/quickstart/helloworldsqlaction/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/quickstart/helloworldtxsqlaction/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/quickstart/helloworldtxsqlaction/MyAction.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/build.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/deployment.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/hsqldb-jdbc-state-service.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jbm-queue-service.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jbmq-queue-service.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jboss-esb.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jbossesb-properties.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jndi.properties
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/juddi.properties
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/log4j.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/messaging-roles.properties
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/messaging-users.properties
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/readme.txt
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/quickstart/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/quickstart/jmssecured/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/quickstart/jmssecured/test/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/quickstart/jmssecured/test/SendJMSMessage.java
Modified:
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/build-distr.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/build.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/ProgrammersGuide.odt
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/governance/MonitoringGuide.odt
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/samples/TBGuide.odt
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/services/MessageStore.odt
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/wiki/FilesToGenerate.txt
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/etc/schemas/xml/jbossesb-1.0.1.xsd
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/build.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/standalone/jbossesb-server-base.zip
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/couriers/SqlTableCourier.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPool.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainer.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/common/TransactionStrategy.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/http/HttpClientFactory.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/SqlListenerMapper.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/actions/aggregation/JBESB_1201_UnitTest.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/actions/aggregation/JBESB_1204_1331_UnitTest.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/actions/aggregation/Nested_Splits_UnitTest.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/JMSEprUnitTest.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/rosetta/pooling/JmsConnectionPoolingIntegrationTest.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration1/processDefinition/gpd.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration1/processDefinition/processdefinition.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration1/processDefinition/processimage.jpg
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration2/processDefinition/gpd.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration2/processDefinition/processimage.jpg
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration2/readme.txt
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration2/scripts/service6.groovy
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration3/processDefinition/gpd.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration3/processDefinition/processimage.jpg
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/conf/base-build.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/custom_action/jboss-esb.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingAsyncAction.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingSyncAction.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_sql_action/jboss-esb.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_sql_action/src/hsqldb/create.sql
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_topic/src/org/jboss/soa/esb/samples/quickstart/jmstopic/MessageAugmentor.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_CSV2XML/SampleOrder.csv
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_CSV2XML/smooks-res.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/samples/quickstart/transformxml2pojo/test/ReceiveJMSMessage.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_mtom/README.html
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_mtom/build.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_mtom/src/org/jboss/soa/esb/samples/quickstart/webservicemtom/webservice/MTOMProtocolHandler.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wsaddressing/README.html
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wsaddressing/build.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wsaddressing/src/org/jboss/soa/esb/samples/quickstart/webservicewsa/ServerHandler.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wsaddressing/src/org/jboss/soa/esb/samples/quickstart/webservicewsa/client/ClientHandler.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wssecurity/README.html
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wssecurity/build.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/JBpmObjectMapper.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbNotifier.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CallbackCommand.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/resources/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/resources/log4j.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/MonitoringSessionFactory.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollector.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/Invoker.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollector.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFiler.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/Filer.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/InvokerFiler.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/OperationsFiler.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/build.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/build.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/resources/transformedmessageCSV2XML.log
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/BPMOrchestration2Test.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/StaticRouterTest.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformCSV2XMLTest.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebServiceConsumer1Test.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebServiceConsumer2Test.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebServiceProducerTest.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceAdapterTest.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceBPELTest.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WiretapTest.java
Log:
Merge of IR6 into platform
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/build-distr.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/build-distr.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/build-distr.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -38,7 +38,6 @@
<include name="tools/**/*"/>
</fileset>
</copy>
- <copy file="tools/console/contract-web/build/contract.war" todir="${esbserver.dist.dir}/tools" failonerror="false" />
<copy file="${build.dir}/jbossesb/xml/jbossesb-1.0.1.xsd"
todir="${esbserver.dist.dir}/docs/schema"/>
<copy todir="${esbserver.dist.dir}">
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/build.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/build.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -275,12 +275,10 @@
<mkdir dir="${org.jboss.esb.installationdirectory}/tools/configeditor"/>
<mkdir dir="${org.jboss.esb.installationdirectory}/tools/configeditor/resources"/>
<mkdir dir="${org.jboss.esb.installationdirectory}/tools/configeditor/dist"/>
- <mkdir dir="${org.jboss.esb.installationdirectory}/tools/contract"/>
<copy file="tools/configeditor/editor/dist/jbossesb-config-editor.war" todir="${org.jboss.esb.installationdirectory}/tools/configeditor/dist"/>
<copy file="tools/configeditor/editor/resources/action-templates.xml" todir="${org.jboss.esb.installationdirectory}/tools/configeditor/resources"/>
<copy file="tools/configeditor/editor/README.txt" todir="${org.jboss.esb.installationdirectory}/tools/configeditor"/>
- <copy file="tools/console/contract-web/build/contract.war" todir="${org.jboss.esb.installationdirectory}/tools/contract" failonerror="false" />
</target>
<!-- produce a product distribution -->
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/ProgrammersGuide.odt
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/advanced/ServiceOrchestration.odt
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/advanced/ServiceOrchestration.pdf
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/advanced/jBPMIntegrationGuide.odt (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/docs/advanced/jBPMIntegrationGuide.odt)
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/governance/MonitoringGuide.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/samples/TBGuide.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/services/MessageStore.odt
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/services/ServiceOrchestration.odt (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/docs/services/ServiceOrchestration.odt)
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/services/ServiceOrchestration.pdf (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/docs/services/ServiceOrchestration.pdf)
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/wiki/FilesToGenerate.txt
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/wiki/FilesToGenerate.txt 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/wiki/FilesToGenerate.txt 2008-01-14 16:11:24 UTC (rev 17818)
@@ -8,6 +8,7 @@
http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossESBDeadLetterService
http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossESBHelloworld
http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossESBContentBasedRouting
+http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossESBjBPMIntegration
http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossESBMessageFilter
http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossESBMessageStore
http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossESBRecipientList
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/etc/schemas/xml/jbossesb-1.0.1.xsd
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/etc/schemas/xml/jbossesb-1.0.1.xsd 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/etc/schemas/xml/jbossesb-1.0.1.xsd 2008-01-14 16:11:24 UTC (rev 17818)
@@ -608,6 +608,24 @@
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute
+ name="jms-security-principal" type="xsd:string" use="optional">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">
+ JMS destination username. Will be used when creating a connection
+ to the destination.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute
+ name="jms-security-credential" type="xsd:string" use="optional">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">
+ JMS destination password. Will be used when creating a connection
+ to the destination. Will be ignored if username is not specified.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
</xsd:complexType>
</xsd:element>
<xsd:element name="jms-bus" substitutionGroup="jesb:bus">
@@ -1184,7 +1202,7 @@
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute name="insert-timestamp-column" use="required"
+ <xsd:attribute name="insert-timestamp-column" use="optional"
type="xsd:string">
<xsd:annotation>
<xsd:documentation xml:lang="en">
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/build.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/build.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -147,7 +147,7 @@
</copy>
<!-- contracts app -->
- <copy file="${org.jboss.esb.dist}/tools/contract/contract.war" todir="${deploy.dir}" />
+ <copy file="${org.jboss.esb.dist}/tools/console/console/jboss-esb-console.ear/contract.war" todir="${deploy.dir}" />
<!-- config-editor app -->
<copy file="${org.jboss.esb.dist}/tools/configeditor/dist/jbossesb-config-editor.war" todir="${deploy.dir}" />
<copy file="${org.jboss.esb.dist}/tools/configeditor/resources/action-templates.xml" todir="${conf.dir}" />
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/conf/jbossesb-properties.xml.template (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/install/conf/jbossesb-properties.xml.template)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/conf/jbossesb-properties.xml.template (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/conf/jbossesb-properties.xml.template 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ JBoss, Home of Professional Open Source
+ Copyright 2006, JBoss Inc., and others contributors as indicated
+ by the @authors tag. All rights reserved.
+ See the copyright.txt in the distribution for a
+ full listing of individual contributors.
+ This copyrighted material is made available to anyone wishing to use,
+ modify, copy, or redistribute it subject to the terms and conditions
+ of the GNU Lesser General Public License, v. 2.1.
+ This program is distributed in the hope that it will be useful, but WITHOUT A
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ You should have received a copy of the GNU Lesser General Public License,
+ v.2.1 along with this distribution; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+ (C) 2005-2006,
+ @author JBoss Inc.
+-->
+<!-- $Id: jbossesb-unittest-properties.xml $ -->
+<!--
+ These options are described in the JBossESB manual.
+ Defaults are provided here for convenience only.
+
+ Please read through this file prior to using the system, and consider
+ updating the specified entries.
+-->
+<esb
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd">
+ <properties name="core">
+ <property name="org.jboss.soa.esb.jndi.server.type" value="jboss"/>
+ <property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
+ <property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
+ </properties>
+ <properties name="registry">
+ <property name="org.jboss.soa.esb.registry.queryManagerURI"
+ value="jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire"/>
+ <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI"
+ value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#publish" />
+ <property name="org.jboss.soa.esb.registry.implementationClass"
+ value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
+ <property name="org.jboss.soa.esb.registry.factoryClass"
+ value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
+ <property name="org.jboss.soa.esb.registry.user"
+ value="jbossesb"/>
+ <property name="org.jboss.soa.esb.registry.password"
+ value="password"/>
+ <!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
+ <property name="org.jboss.soa.esb.scout.proxy.transportClass"
+ value="org.apache.ws.scout.transport.RMITransport"/>
+ </properties>
+ <properties name="transports" depends="core">
+ <property name="org.jboss.soa.esb.mail.smtp.host" value="localhost"/>
+ <property name="org.jboss.soa.esb.mail.smtp.user" value="jbossesb"/>
+ <property name="org.jboss.soa.esb.mail.smtp.password" value=""/>
+ <property name="org.jboss.soa.esb.mail.smtp.port" value="25"/>
+ </properties>
+ <properties name="connection">
+ <property name="min-pool-size" value="5"/>
+ <property name="max-pool=size" value="10"/>
+ <property name="blocking-timeout-millis" value="5000"/>
+ <property name="abandoned-connection-timeout" value="10000"/>
+ <property name="abandoned-connection-time-interval" value="30000"/>
+ </properties>
+ <properties name="dbstore">
+ <property name="org.jboss.soa.esb.persistence.db.connection.url" value="jdbc:hsqldb:hsql://localhost:9001/"/>
+ <property name="org.jboss.soa.esb.persistence.db.jdbc.driver" value="org.hsqldb.jdbcDriver"/>
+ <property name="org.jboss.soa.esb.persistence.db.user" value="sa"/>
+ <property name="org.jboss.soa.esb.persistence.db.pwd" value=""/>
+ <property name="org.jboss.soa.esb.persistence.db.pool.initial.size" value="2"/>
+ <property name="org.jboss.soa.esb.persistence.db.pool.min.size" value="2"/>
+ <property name="org.jboss.soa.esb.persistence.db.pool.max.size" value="5"/>
+ <!--table managed by pool to test for valid connections - created by pool automatically -->
+ <property name="org.jboss.soa.esb.persistence.db.pool.test.table" value="pooltest"/>
+ <!-- # of milliseconds to timeout waiting for a connection from pool -->
+ <property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis" value="5000"/>
+ <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/>
+ </properties>
+ <properties name="messagerouting">
+ <property name="org.jboss.soa.esb.routing.cbrClass" value="org.jboss.internal.soa.esb.services.routing.cbr.JBossRulesRouter"/>
+ </properties>
+ <properties name="filters">
+ <property name="org.jboss.soa.esb.filter.1" value="org.jboss.internal.soa.esb.message.filter.MetaDataFilter"/>
+ <property name="org.jboss.soa.esb.filter.2" value="org.jboss.internal.soa.esb.message.filter.GatewayFilter"/>
+ </properties>
+</esb>
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/standalone/jbossesb-server-base.zip
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -152,9 +152,9 @@
try {
if (JMSEpr.QUEUE_TYPE.equals(sType)) {
- jmsSession = getConnectionPool().getQueueSession();
+ jmsSession = getConnectionPool().getQueueSession(acknowledgeMode);
} else {
- jmsSession = getConnectionPool().getTopicSession();
+ jmsSession = getConnectionPool().getTopicSession(acknowledgeMode);
}
} catch (NamingException e) {
throw new CourierException("Failed to get JMS Session from pool.", e);
@@ -366,11 +366,15 @@
String sFactoryClass;
String sType;
Properties properties;
+ String username;
+ String password;
try {
sFactoryClass = _epr.getConnectionFactory();
sType = _epr.getDestinationType();
properties = _epr.getJndiEnvironment();
+ username = _epr.getJMSSecurityPrincipal();
+ password = _epr.getJMSSecurityCredential();
} catch (URISyntaxException e) {
throw new ConnectionException("Unexpected exception while getting JMS connection pool.", e);
}
@@ -379,7 +383,7 @@
sFactoryClass = "ConnectionFactory";
}
- jmsConnectionPool = JmsConnectionPoolContainer.getPool(properties, sFactoryClass, sType);
+ jmsConnectionPool = JmsConnectionPoolContainer.getPool(properties, sFactoryClass, sType, username, password);
}
}
}
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/couriers/SqlTableCourier.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/couriers/SqlTableCourier.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/couriers/SqlTableCourier.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -22,10 +22,24 @@
package org.jboss.internal.soa.esb.couriers;
+import java.io.Serializable;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.UUID;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+
import org.apache.log4j.Logger;
import org.jboss.soa.esb.addressing.Call;
import org.jboss.soa.esb.addressing.MalformedEPRException;
import org.jboss.soa.esb.addressing.eprs.JDBCEpr;
+import org.jboss.soa.esb.common.TransactionStrategy;
+import org.jboss.soa.esb.common.TransactionStrategyException;
import org.jboss.soa.esb.couriers.CourierException;
import org.jboss.soa.esb.couriers.CourierTimeoutException;
import org.jboss.soa.esb.helpers.persist.JdbcCleanConn;
@@ -36,333 +50,430 @@
import org.jboss.soa.esb.util.Util;
import org.xml.sax.SAXParseException;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.sql.DataSource;
-import java.io.Serializable;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.UUID;
+public class SqlTableCourier implements PickUpOnlyCourier, DeliverOnlyCourier
+{
+ /**
+ * disable default constructor
+ */
+ private SqlTableCourier()
+ {
+ }
-public class SqlTableCourier implements PickUpOnlyCourier, DeliverOnlyCourier {
- /**
- * disable default constructor
- */
- private SqlTableCourier() {
- }
+ /**
+ * package protected constructor - Objects of Courier should only be
+ * instantiated by the Factory
+ *
+ * @param epr
+ */
+ SqlTableCourier(JDBCEpr epr) throws CourierException
+ {
+ this(epr, false);
+ }
- /**
- * package protected constructor - Objects of Courier should only be
- * instantiated by the Factory
- *
- * @param epr
- */
- SqlTableCourier(JDBCEpr epr) throws CourierException {
- this(epr, false);
- }
+ /**
+ * package protected constructor - Objects of Courier should only be
+ * instantiated by the Factory
+ *
+ * @param epr
+ */
+ SqlTableCourier(JDBCEpr epr, boolean isReceiver) throws CourierException
+ {
+ _isReceiver = isReceiver;
+ _epr = epr;
+ _sleepForRetries = 3000; // TODO magic number - configurable?
+ try
+ {
+ _postDelete = Boolean.TRUE.equals(Boolean.valueOf(epr
+ .getPostDelete()));
+ _errorDelete = Boolean.TRUE.equals(Boolean.valueOf(epr
+ .getErrorDelete()));
+ }
+ catch (URISyntaxException e)
+ {
+ throw new CourierException(e);
+ }
- /**
- * package protected constructor - Objects of Courier should only be
- * instantiated by the Factory
- *
- * @param epr
- */
- SqlTableCourier(JDBCEpr epr, boolean isReceiver) throws CourierException {
- _isReceiver = isReceiver;
- _epr = epr;
- _sleepForRetries = 3000; // TODO magic number - configurable?
- try {
- _postDelete = Boolean.TRUE.equals(Boolean.valueOf(epr
- .getPostDelete()));
- _errorDelete = Boolean.TRUE.equals(Boolean.valueOf(epr
- .getErrorDelete()));
- }
- catch (URISyntaxException e) {
- throw new CourierException(e);
- }
+ } // ________________________________
- } // ________________________________
+ public void cleanup()
+ {
+ if (null != _conn)
+ {
+ try
+ {
+ _conn.release();
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ _logger.info("Unable to release connection", e);
+ }
+ }
- public void cleanup() {
- if (null != _conn) {
- try {
- _conn.release();
- }
- catch (Exception e) {
- _logger.info("Unable to release connection");
- _logger.debug("Unable to release connection", e);
- }
- }
+ } // ________________________________
- } // ________________________________
+ /**
+ * package the ESB message in a java.io.Serializable, and write it.
+ * Delivery occurs within its own transaction.
+ *
+ * @param message
+ * Message - the message to deliverAsync
+ * @return boolean - the result of the delivery
+ * @throws CourierException -
+ * if problems were encountered
+ */
+
+ public boolean deliver(Message message) throws CourierException
+ {
+ if (_isReceiver)
+ throw new CourierException("This is a read-only Courier");
- /**
- * package the ESB message in a java.io.Serializable, and write it
- *
- * @param message Message - the message to deliverAsync
- * @return boolean - the result of the delivery
- * @throws CourierException -
- * if problems were encountered
- */
- public boolean deliver(Message message) throws CourierException {
- if (_isReceiver)
- throw new CourierException("This is a read-only Courier");
+ if (null == message)
+ return false;
- if (null == message)
- return false;
+ String msgId = null;
+ Call call = message.getHeader().getCall();
+ if (null==call)
+ message.getHeader().setCall(call=new Call());
+ try
+ {
+ if (null==call.getMessageID())
+ call.setMessageID(new URI(UUID.randomUUID().toString()));
+ msgId = call.getMessageID().toString();
+ }
+ catch (URISyntaxException e)
+ {
+ throw new CourierException("Problems with message header ",e);
+ }
- String msgId = null;
- Call call = message.getHeader().getCall();
- if (null == call)
- message.getHeader().setCall(call = new Call());
- try {
- if (null == call.getMessageID())
- call.setMessageID(new URI(UUID.randomUUID().toString()));
- msgId = call.getMessageID().toString();
- }
- catch (URISyntaxException e) {
- throw new CourierException("Problems with message header ", e);
- }
+ if (null == _conn)
+ {
+ try
+ {
+ _conn = getConn();
+ }
+ catch (Exception e)
+ {
+ throw new CourierException(e);
+ }
+ }
- if (null == _conn) {
- try {
- _conn = getConn();
- }
- catch (Exception e) {
- throw new CourierException(e);
- }
- }
+ while (_conn != null)
+ {
+ try
+ {
+ int iCol = 1;
+ PreparedStatement PS = insertStatement();
+ PS.setString(iCol++, msgId);
+ PS.setObject(iCol++, Util.serialize(message));
+ PS.setString(iCol++, State.Pending.getColumnValue());
+ PS.setLong(iCol++, System.currentTimeMillis());
- while (_conn != null) {
- try {
- int iCol = 1;
- PreparedStatement PS = insertStatement();
- PS.setString(iCol++, msgId);
- PS.setObject(iCol++, Util.serialize(message));
- PS.setString(iCol++, State.Pending.getColumnValue());
- PS.setLong(iCol++, System.currentTimeMillis());
+ _conn.execUpdWait(PS, 3);
+ _conn.commit();
+ return true;
+ }
+ catch (SQLException e)
+ {
+ if (null != _conn)
+ {
+ try
+ {
+ _conn.rollback();
+ }
+ catch (Exception roll)
+ {
+ _logger.debug(roll);
+ }
+ }
+
+ _logger.debug("SQL exception during deliver", e);
+ throw new CourierException(e);
+ }
+ catch (Exception e)
+ {
+ jdbcConnectRetry(e);
+ }
+ }
+ return false;
+ } // ________________________________
- _conn.execUpdWait(PS, 3);
- _conn.commit();
- return true;
- }
- catch (SQLException e) {
- if (null != _conn) {
- try {
- _conn.rollback();
- }
- catch (Exception roll) {
- _logger.debug(roll);
- }
- }
-
- _logger.debug("SQL exception during deliver", e);
- throw new CourierException(e);
- }
- catch (Exception e) {
- jdbcConnectRetry(e);
- }
- }
- return false;
- } // ________________________________
-
- public Message pickup(long millis) throws CourierException, CourierTimeoutException {
- Message result = null;
- long limit = System.currentTimeMillis()
- + ((millis < 100) ? 100 : millis);
- do {
- try {
+ public Message pickup(long millis) throws CourierException, CourierTimeoutException
+ {
+ Message result = null;
+ long limit = System.currentTimeMillis()
+ + ((millis < 100) ? 100 : millis);
+
+ do
+ {
+ try
+ {
+ TransactionStrategy txStrategy = TransactionStrategy.getStrategy();
+ Object txHandle = ((txStrategy == null) ? null : txStrategy.getTransaction());
+ boolean isActive = ((txStrategy == null) ? false : txStrategy.isActive());
+
+ transactional = (txHandle != null);
+
+ /*
+ * Make sure the current transaction is still active! If we
+ * have previously slept, then the timeout may be longer than that
+ * associated with the transaction.
+ */
+
+ /*
+ * MessageAwareListener will catch exceptions and roll back the transaction.
+ */
+
+ if (transactional && !isActive)
+ {
+ throw new CourierException("Associated transaction is no longer active!");
+ }
+ }
+ catch (TransactionStrategyException ex)
+ {
+ _logger.error("Could not determine transaction association!", ex);
+
+ throw new CourierException("Could not determine transaction association!");
+ }
+
+ try
+ {
ResultSet RS = getRowList();
- while (null != RS && RS.next()) {
- String messageId = RS.getString(1);
- if (null == (result = tryToPickup(messageId)))
- continue;
- /*
- * If this is fault message, then throw an exception with the contents. With the
- * exception of user-defined exceptions, faults will have nothing in the body, properties etc.
- */
+ while (null != RS && RS.next())
+ {
+ String messageId = RS.getString(1);
- if (Type.isFaultMessage(result))
- Factory.createExceptionFromFault(result);
-
- return result;
- }
+ if (null == (result = tryToPickup(messageId)))
+ continue;
+
+ /*
+ * If this is fault message, then throw an exception with the contents. With the
+ * exception of user-defined exceptions, faults will have nothing in the body, properties etc.
+ */
+
+ if (Type.isFaultMessage(result))
+ Factory.createExceptionFromFault(result);
+
+ return result;
+ }
}
+ catch (SQLException e)
+ {
+ _logger.debug("SQL Exception during pickup", e);
+ return null;
+ }
+ finally
+ {
+ // Added to make sure we release transactions from all paths
+ if (_conn != null)
+ {
+ try
+ {
+ if (!transactional)
+ _conn.rollback() ;
+ }
+ catch (final SQLException sqle) {} //ignore
+ }
+ }
+ try
+ {
+ long lSleep = limit - System.currentTimeMillis();
+ if (_pollLatency < lSleep)
+ lSleep = _pollLatency;
+ if (lSleep > 0)
+ Thread.sleep(lSleep);
+ }
+ catch (InterruptedException e)
+ {
+ return null;
+ }
+ } while (System.currentTimeMillis() <= limit);
+ return null;
+ } // ________________________________
- catch (SQLException e) {
- _logger.debug("SQL Exception during pickup", e);
- return null;
- }
- finally {
- // Added to make sure we release transactions from all paths
- if (_conn != null) {
- try {
- _conn.rollback();
- }
- catch (final SQLException sqle) {
- } //ignore
- }
- }
- try {
- long lSleep = limit - System.currentTimeMillis();
- if (_pollLatency < lSleep)
- lSleep = _pollLatency;
- if (lSleep > 0)
- Thread.sleep(lSleep);
- }
- catch (InterruptedException e) {
- return null;
- }
- } while (System.currentTimeMillis() <= limit);
- return null;
- } // ________________________________
+ private Message tryToPickup(String messageId) throws CourierException,
+ SQLException
+ {
+ int iParm = 1;
- private Message tryToPickup(String messageId) throws CourierException,
- SQLException {
- int iParm = 1;
+ select4UpdateStatement().setString(iParm++, messageId);
+ select4UpdateStatement().setString(iParm++,
+ State.Pending.getColumnValue());
- select4UpdateStatement().setString(iParm++, messageId);
- select4UpdateStatement().setString(iParm++,
- State.Pending.getColumnValue());
+ while (_conn != null)
+ {
+ try
+ {
+ ResultSet RS = _conn.execQueryWait(select4UpdateStatement(), 3);
+ while (RS.next())
+ {
+ Exception eBad = null;
+ try
+ {
+ Message result = Util.deserialize((Serializable) RS
+ .getObject(1));
+ if (_postDelete)
+ deleteMsg(messageId);
+ else
+ changeStatus(messageId, State.Done);
+ return result;
+ }
+ catch (ClassCastException e)
+ {
+ eBad = e;
+ }
+ catch (SAXParseException e)
+ {
+ eBad = e;
+ }
+ catch (Exception e)
+ {
+ throw new CourierException(e);
+ }
+ if (null != eBad)
+ {
+ if (_errorDelete)
+ deleteMsg(messageId);
+ else
+ changeStatus(messageId, State.Error);
+ continue;
+ }
+ }
+ return null;
+ }
+ catch (SQLException e)
+ {
+ throw new CourierException(e);
+ }
+ catch (Exception e)
+ {
+ jdbcConnectRetry(e);
+ }
+ }
+ return null;
+ } // ________________________________
- while (_conn != null) {
- try {
- ResultSet RS = _conn.execQueryWait(select4UpdateStatement(), 3);
- while (RS.next()) {
- Exception eBad = null;
- try {
- Message result = Util.deserialize((Serializable) RS
- .getObject(1));
- if (_postDelete)
- deleteMsg(messageId);
- else
- changeStatus(messageId, State.Done);
- return result;
- }
- catch (ClassCastException e) {
- eBad = e;
- }
- catch (SAXParseException e) {
- eBad = e;
- }
- catch (Exception e) {
- throw new CourierException(e);
- }
- if (null != eBad) {
- if (_errorDelete)
- deleteMsg(messageId);
- else
- changeStatus(messageId, State.Error);
- continue;
- }
- }
- return null;
- }
- catch (SQLException e) {
- throw new CourierException(e);
- }
- catch (Exception e) {
- jdbcConnectRetry(e);
- }
- }
- return null;
- } // ________________________________
+ private void deleteMsg(String messageId) throws SQLException
+ {
+ int iParm = 1;
+ deleteStatement().setString(iParm++, messageId);
+ _conn.execUpdWait(deleteStatement(), 3);
+
+ if (!transactional)
+ _conn.commit();
+ }
- private void deleteMsg(String messageId) throws SQLException {
- int iParm = 1;
- deleteStatement().setString(iParm++, messageId);
- _conn.execUpdWait(deleteStatement(), 3);
- _conn.commit();
- }
+ private void changeStatus(String messageId, State to) throws SQLException
+ {
+ int iParm = 1;
+ updateStatusStatement().setString(iParm++, to.getColumnValue());
+ updateStatusStatement().setString(iParm++, messageId);
+ _conn.execUpdWait(updateStatusStatement(), 3);
+
+ if (!transactional)
+ _conn.commit();
+ }
- private void changeStatus(String messageId, State to) throws SQLException {
- int iParm = 1;
- updateStatusStatement().setString(iParm++, to.getColumnValue());
- updateStatusStatement().setString(iParm++, messageId);
- _conn.execUpdWait(updateStatusStatement(), 3);
- _conn.commit();
- }
+ private ResultSet getRowList() throws CourierException
+ {
+ if (null == _conn)
+ {
+ try
+ {
+ _conn = getConn();
+ }
+ catch (Exception e)
+ {
+ throw new CourierException(e);
+ }
+ }
+ while (_conn != null)
+ {
+ try
+ {
+ return _conn.execQueryWait(listStatement(), 3);
+ }
+ catch (Exception e)
+ {
+ _logger.debug("Problem encountered while executing query.", e);
+ e.printStackTrace();
+
+ jdbcConnectRetry(e);
+ }
+ }
+ return null;
- private ResultSet getRowList() throws CourierException {
- if (null == _conn) {
- try {
- _conn = getConn();
- }
- catch (Exception e) {
- throw new CourierException(e);
- }
- }
- while (_conn != null) {
- try {
- return _conn.execQueryWait(listStatement(), 3);
- }
- catch (Exception e) {
- jdbcConnectRetry(e);
- }
- }
- return null;
+ } // _______________________________
- } // _______________________________
+ private void jdbcConnectRetry(Exception exc)
+ {
+ _logger.debug("DB problem, will try to reconnect", exc);
+
+ cleanup();
+ _conn = null;
- private void jdbcConnectRetry(Exception exc) {
- _logger.debug("DB problem, will try to reconnect", exc);
- if (null != _conn)
- _conn.release();
- _conn = null;
+ _prepDelete = _prepGetList = _prepInsert = _prepSel4Upd = _prepUpdateStatus = null;
+ for (int i1 = 0; i1 < 3; i1++)
+ {
+ try
+ {
+ _conn = getConn();
+ }
+ catch (Exception e)
+ {
+ try
+ {
+ Thread.sleep(_sleepForRetries);
+ }
+ catch (InterruptedException eInt)
+ {
+ return;
+ }
+ }
+ }
+ } // ________________________________
- _prepDelete = _prepGetList = _prepInsert = _prepSel4Upd = _prepUpdateStatus = null;
- for (int i1 = 0; i1 < 3; i1++) {
- try {
- _conn = getConn();
- }
- catch (Exception e) {
- try {
- Thread.sleep(_sleepForRetries);
- }
- catch (InterruptedException eInt) {
- return;
- }
- }
- }
- } // ________________________________
+ private JdbcCleanConn getConn() throws SQLException, MalformedEPRException, NamingException
+ {
+ if (null == _conn)
+ {
+ try
+ {
+ DataSource DS = null;
+ if (_epr.getDatasource() == null) {
+ DS = new SimpleDataSource(_epr.getDriver(),
+ _epr.getURL(), _epr.getUserName(), _epr.getPassword());
+ } else {
+ InitialContext initContext;
+ try {
+ initContext = new InitialContext();
+ DS = (DataSource) initContext.lookup(_epr.getDatasource());
+ } catch (NamingException e) {
+ _logger.error("Problem resolving DataSource through JNDI", e);
+
+ throw e; // it'll get wrapped later anyway!
+ }
+ }
+ _conn = new JdbcCleanConn(DS, transactional);
+ }
+ catch (URISyntaxException ex)
+ {
+ throw new MalformedEPRException(ex);
+ }
+ }
+ return _conn;
+ } // ________________________________
- private JdbcCleanConn getConn() throws SQLException, MalformedEPRException {
- if (null == _conn) {
- try {
- DataSource DS = null;
- if (_epr.getDatasource() == null) {
- DS = new SimpleDataSource(_epr.getDriver(),
- _epr.getURL(), _epr.getUserName(), _epr.getPassword());
- } else {
- InitialContext initContext;
- try {
- initContext = new InitialContext();
- DS = (DataSource) initContext.lookup(_epr.getDatasource());
- } catch (NamingException e) {
- _logger.error("", e);
- }
- }
- _conn = new JdbcCleanConn(DS);
- }
- catch (URISyntaxException ex) {
- throw new MalformedEPRException(ex);
- }
- }
- return _conn;
- } // ________________________________
-
protected PreparedStatement listStatement() throws SQLException
{
- if (null == _prepGetList)
+ if (null == _prepGetList)
+ {
+ try
+ {
+ String[] columns =
+ { _epr.getMessageIdColumn(), _epr.getTimestampColumn() };
- try {
- String[] columns =
- {_epr.getMessageIdColumn(), _epr.getTimestampColumn()};
-
StringBuilder sb = new StringBuilder("select");
int i1 = 0;
for (String col : columns)
@@ -379,15 +490,16 @@
}
catch (Exception e)
{
- _logger.warn("Unable to prepare SQL statement", e);
-
- throw new SQLException("Unable to prepare SQL statement: "+e);
+ e.printStackTrace();
+ _logger.debug("Unable to prepare SQL statement", e);
+ throw new SQLException("Problem encountered when trying to created PreparedStatement: "+e);
}
-
+ }
+
return _prepGetList;
} // ________________________________
- protected PreparedStatement select4UpdateStatement() throws SQLException
+ protected PreparedStatement select4UpdateStatement()
{
if (_prepSel4Upd == null)
{
@@ -397,46 +509,45 @@
* TODO make this dynamic using a factory pattern.
*/
- StringBuilder sb = null;
+ StringBuilder sb = null;
- if (!_epr.getURL().contains("hsqldb")) {
- sb = new StringBuilder("select ").append(
- _epr.getDataColumn()).append(" from ").append(
- _epr.getTableName()).append(" where ").append(
- _epr.getMessageIdColumn()).append("=?").append(
- " and ").append(_epr.getStatusColumn())
- .append("=?").append(" for update");
- } else {
- /*
- * HSQL does not support FOR UPDATE! All tables appear to
- * be inherently updatable!
- */
- sb = new StringBuilder("select ").append(
- _epr.getDataColumn()).append(" from ").append(
- _epr.getTableName()).append(" where ").append(
- _epr.getMessageIdColumn()).append("=?").append(
- " and ").append(_epr.getStatusColumn())
- .append("=?");
- }
+ if (!_epr.getURL().contains("hsqldb"))
+ {
+ sb = new StringBuilder("select ").append(
+ _epr.getDataColumn()).append(" from ").append(
+ _epr.getTableName()).append(" where ").append(
+ _epr.getMessageIdColumn()).append("=?").append(
+ " and ").append(_epr.getStatusColumn())
+ .append("=?").append(" for update");
+ }
+ else
+ {
+ /*
+ * HSQL does not support FOR UPDATE! All tables appear to
+ * be inherently updatable!
+ */
+
+ sb = new StringBuilder("select ").append(
+ _epr.getDataColumn()).append(" from ").append(
+ _epr.getTableName()).append(" where ").append(
+ _epr.getMessageIdColumn()).append("=?").append(
+ " and ").append(_epr.getStatusColumn())
+ .append("=?");
+ }
_prepSel4Upd = getConn().prepareStatement(sb.toString());
}
- catch (SQLException ex)
- {
- throw ex;
- }
catch (Exception e)
{
- _logger.warn(e);
-
- throw new SQLException("Caught exception during prepared statement: "+e);
+ _logger.debug(e);
+ return null;
}
}
-
+
return _prepSel4Upd;
- }
-
- protected PreparedStatement updateStatusStatement() throws SQLException
+ } // ________________________________
+
+ protected PreparedStatement updateStatusStatement()
{
if (null == _prepUpdateStatus)
try
@@ -447,25 +558,23 @@
.append(_epr.getMessageIdColumn()).append("=?");
_prepUpdateStatus = getConn().prepareStatement(sb.toString());
}
- catch (SQLException ex)
- {
- throw ex;
- }
catch (Exception e)
{
- _logger.warn(e);
-
- throw new SQLException("Caught exception during prepared statement: "+e);
+ _logger.debug(e);
+ return null;
}
return _prepUpdateStatus;
} // ________________________________
- protected PreparedStatement insertStatement() throws SQLException {
- if (null == _prepInsert)
- try {
- String[] columns =
- {_epr.getMessageIdColumn(), _epr.getDataColumn(),
- _epr.getStatusColumn(), _epr.getTimestampColumn()};
+ protected PreparedStatement insertStatement()
+ {
+ if (null == _prepInsert)
+ try
+ {
+ String[] columns =
+ { _epr.getMessageIdColumn(), _epr.getDataColumn(),
+ _epr.getStatusColumn(), _epr.getTimestampColumn() };
+
StringBuilder sb = new StringBuilder("insert into ").append(
_epr.getTableName()).append("(");
int i1 = 0;
@@ -474,20 +583,15 @@
sb.append(") values (?,?,?,?)");
_prepInsert = getConn().prepareStatement(sb.toString());
}
- catch (SQLException ex)
- {
- throw ex;
- }
catch (Exception e)
{
- _logger.warn(e);
-
- throw new SQLException("Caught exception during prepared statement: "+e);
+ _logger.debug(e);
+ return null;
}
return _prepInsert;
} // ________________________________
- protected PreparedStatement deleteStatement() throws SQLException
+ protected PreparedStatement deleteStatement()
{
if (null == _prepDelete)
try
@@ -497,49 +601,48 @@
_epr.getMessageIdColumn()).append(" =?");
_prepDelete = getConn().prepareStatement(sb.toString());
}
- catch (SQLException ex)
- {
- throw ex;
- }
catch (Exception e)
{
- _logger.warn(e);
-
- throw new SQLException("Caught exception during prepared statement: "+e);
+ _logger.debug(e);
+ return null;
}
return _prepDelete;
} // ________________________________
- protected enum State {
- Pending, WorkInProgress, Done, Error;
+ protected enum State
+ {
+ Pending, WorkInProgress, Done, Error;
+ String getColumnValue()
+ {
+ return toString().substring(0, 1);
+ }
+ }
- String getColumnValue() {
- return toString().substring(0, 1);
- }
- }
+ public void setPollLatency(Long millis)
+ {
+ if (millis <= 200)
+ _logger.warn("Poll latency must be >= 200 milliseconds - Keeping old value of "+_pollLatency);
+ else
+ _pollLatency = millis;
+ } // ________________________________
+
+ protected long _pollLatency = 200;
+ protected long _sleepForRetries = 3000; // milliseconds
- public void setPollLatency(Long millis) {
- if (millis <= 200)
- _logger.warn("Poll latency must be >= 200 milliseconds - Keeping old value of " + _pollLatency);
- else
- _pollLatency = millis;
- } // ________________________________
+ protected boolean _postDelete, _errorDelete;
+ protected boolean _isReceiver;
- protected long _pollLatency = 200;
- protected long _sleepForRetries = 3000; // milliseconds
+ protected JDBCEpr _epr;
- protected boolean _postDelete, _errorDelete;
- protected boolean _isReceiver;
+ protected JdbcCleanConn _conn;
- protected JDBCEpr _epr;
+ protected PreparedStatement _prepGetList;
+ protected PreparedStatement _prepSel4Upd;
+ protected PreparedStatement _prepUpdateStatus;
+ protected PreparedStatement _prepInsert;
+ protected PreparedStatement _prepDelete;
+
+ private boolean transactional = false;
- protected JdbcCleanConn _conn;
-
- protected PreparedStatement _prepGetList;
- protected PreparedStatement _prepSel4Upd;
- protected PreparedStatement _prepUpdateStatus;
- protected PreparedStatement _prepInsert;
- protected PreparedStatement _prepDelete;
-
- protected static Logger _logger = Logger.getLogger(SqlTableCourier.class);
-}
+ protected static Logger _logger = Logger.getLogger(SqlTableCourier.class);
+}
\ No newline at end of file
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPool.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPool.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPool.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -66,20 +66,28 @@
/** Maximum number of Sessions that will be created in this pool */
private int MAX_SESSIONS = DEFAULT_POOL_SIZE; //TODO Make this manageable
+
/** Time to sleep when trying to get a session. */
private int SLEEP_TIME = DEFAULT_SLEEP;
- /** Number of free sessions in the pool that can be given out. Indexed by acknowledge mode */
+
+ /** Number of free sessions in the pool that can be given out. Indexed by session key */
private Map<Integer,ArrayList<Session>> freeSessionsMap = new HashMap<Integer,ArrayList<Session>>();
- /** Number of session that are currently in use. Indexed by acknowledge mode */
+
+ /** Number of session that are currently in use. Indexed by session key mode */
private Map<Integer,ArrayList<Session>> inUseSessionsMap = new HashMap<Integer,ArrayList<Session>>();
+
/** Reference to a Queue or Topic Connection, we only need one per pool */
private Connection jmsConnection = null;
+
/** The Indentifier of the pool */
private Map<String, String> poolKey;
+
/** Logger */
private Logger logger = Logger.getLogger(this.getClass());
+
/** Context, which is cached until we encounter a naming exception, or the pool is rebuild */
private Context jndiContext;
+
/**
* Contructor of the pool.
*
@@ -133,13 +141,19 @@
jndiContext = NamingContext.getFreshServerContext(JmsConnectionPoolContainer.getJndiEnvironment(poolKey));
factoryConnection = jndiContext.lookup(connectionFactoryString);
}
+ final String username = poolKey.get( JMSEpr.JMS_SECURITY_PRINCIPAL_TAG );
+ final String password = poolKey.get( JMSEpr.JMS_SECURITY_CREDENTIAL_TAG );
+ boolean useJMSSecurity = (username != null && password != null);
+ logger.debug( "JMS Security principal [" + username + "] using JMS Security : " + useJMSSecurity );
+
if (JMSEpr.QUEUE_TYPE.equals(destinationType)) {
QueueConnectionFactory factory = (QueueConnectionFactory) factoryConnection;
- jmsConnection = factory.createQueueConnection();
+ jmsConnection = useJMSSecurity ? factory.createQueueConnection(username,password): factory.createQueueConnection();
} else {
TopicConnectionFactory factory = (TopicConnectionFactory) factoryConnection;
- jmsConnection = factory.createTopicConnection();
+ jmsConnection = useJMSSecurity ? factory.createTopicConnection(username,password): factory.createTopicConnection();
}
+
jmsConnection.setExceptionListener(new ExceptionListener() {
public void onException(JMSException arg0)
{
@@ -179,7 +193,7 @@
boolean emitExpiry = logger.isDebugEnabled() ;
for(;;) {
- ArrayList<Session> freeSessions = freeSessionsMap.get( acknowledgeMode );
+ ArrayList<Session> freeSessions = freeSessionsMap.get(acknowledgeMode );
ArrayList<Session> inUseSessions = inUseSessionsMap.get(acknowledgeMode);
if (freeSessions.size() > 0)
{
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainer.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainer.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainer.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -67,19 +67,38 @@
public static JmsConnectionPool getPool(JMSEpr jmsEpr) throws ConnectionException, URISyntaxException
{
return getPool(jmsEpr.getJndiEnvironment()
- , jmsEpr.getConnectionFactory(), jmsEpr.getDestinationType());
+ , jmsEpr.getConnectionFactory(), jmsEpr.getDestinationType(), jmsEpr.getJMSSecurityPrincipal(), jmsEpr.getJMSSecurityCredential());
}
/**
* Returns the pool given the identifiers for the JMS provider.
*
- * @param enviroment Comment me.
- * @return
+ * @param enviroment - JNDI evironment for which a JMSConnectionPool should be retreived
+ * @param connectionFactory - connectionfactory for which a JMSConnectionPool should be retreived
+ * @param destinationType - destinationType(Queue or Topic) for which a JMSConnectionPool should be retreived
+ * @return <code>JmsConnectionPool</code>
* @throws ConnectionException
*/
public static JmsConnectionPool getPool(Properties enviroment, String connectionFactory, String destinationType)
throws ConnectionException
{
- Map<String,String> poolKey = createPoolKey(enviroment, connectionFactory, destinationType);
+ return getPool(enviroment, connectionFactory, destinationType, null, null);
+ }
+ /**
+ * Returns the pool given the identifiers for the JMS provider.
+ *
+ * @param enviroment - JNDI evironment for which a JMSConnectionPool should be retreived
+ * @param connectionFactory - connectionfactory for which a JMSConnectionPool should be retreived
+ * @param destinationType - destinationType(Queue or Topic) for which a JMSConnectionPool should be retreived
+ * @param username - username that should be used to create the JMS Connection
+ * @param password - password that should be used to create the JMS Connection
+ * @return <code>JmsConnectionPool</code>
+ * @throws ConnectionException
+ */
+ public static JmsConnectionPool getPool(Properties enviroment, String connectionFactory, String destinationType,
+ final String username, final String password)
+ throws ConnectionException
+ {
+ Map<String,String> poolKey = createPoolKey(enviroment, connectionFactory, destinationType, username, password);
final Map<Map<String, String>, JmsConnectionPool> poolMap = getMap() ;
if (poolMap.containsKey(poolKey)) {
return poolMap.get(poolKey);
@@ -99,12 +118,33 @@
*/
public static Map<String, String> createPoolKey(Properties environment, String connectionFactory, String destinationType)
{
+ return createPoolKey( environment, connectionFactory, destinationType, null, null );
+ }
+ /**
+ * Creates a poolKey using the identifying parameters
+ *
+ * @param environment - the JNDI environment parameters
+ * @param connectionFactory
+ * @param destinationType
+ * @param username the JMS username to be used. Used with {@link javax.jms.ConnectionFactory } createConnection
+ * @param password the JMS password to be used. Used with {@link javax.jms.ConnectionFactory } createConnection
+ * @return
+ */
+ public static Map<String, String> createPoolKey(Properties environment, String connectionFactory, String destinationType,
+ final String username, final String password)
+ {
Map<String,String> poolKey = new HashMap<String,String>();
if (environment!=null) {
for (Object key : environment.keySet()) {
poolKey.put(key.toString(), environment.getProperty(key.toString()));
}
}
+
+ if ( username != null && (!username.equals("null")) && password != null && (!password.equals("null")) ) {
+ poolKey.put(JMSEpr.JMS_SECURITY_PRINCIPAL_TAG, username);
+ poolKey.put(JMSEpr.JMS_SECURITY_CREDENTIAL_TAG, password);
+ }
+
if (connectionFactory!=null) poolKey.put(JMSEpr.CONNECTION_FACTORY_TAG, connectionFactory);
if (destinationType!=null) poolKey.put(JMSEpr.DESTINATION_TYPE_TAG, destinationType);
return poolKey;
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -84,7 +84,11 @@
public Aggregator(ConfigTree config) throws ConfigurationException, RegistryException
{
this.config = config;
- timeoutInMillies = Long.valueOf(config.getRequiredAttribute("timeoutInMillies"));
+ String timeoutAttr = config.getRequiredAttribute("timeoutInMillies");
+
+ if (timeoutAttr != null)
+ timeoutInMillies = Long.valueOf(config.getRequiredAttribute("timeoutInMillies"));
+
logger.debug("Aggregator config: timeoutInMillies=" + timeoutInMillies);
splitId = config.getAttribute("splitId");
}
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -383,14 +383,13 @@
private void close() {
try {
+ pool.closeSession(jmsSession);
if (jmsProducer!=null) {
jmsProducer.close();
}
} catch (Exception e) {
logger.error("Unable to close JMS Queue Setup.", e);
- } finally {
- pool.closeSession(jmsSession);
- }
+ }
}
}
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -53,6 +53,7 @@
public class JMSEpr extends EPR
{
+ @SuppressWarnings("unused")
private Logger log = Logger.getLogger( JMSEpr.class );
public static final String JMS_PROTOCOL = "jms";
@@ -70,7 +71,7 @@
public static final String DESTINATION_NAME_TAG = "destination-name";
public static final String CONNECTION_FACTORY_TAG = "connection-factory";
-
+
public static final String JNDI_PKG_PREFIX_TAG = "jndi-pkg-prefix";
public static final String JNDI_URL_TAG = "jndi-URL";
@@ -87,9 +88,63 @@
public static final String PERSISTENT_TAG = "persistent";
+ /**
+ * JMS Client acknowledgment mode configuration tag
+ */
public static final String ACKNOWLEDGE_MODE_TAG = "acknowledge-mode";
- private static final String DEFAULT_ACKNOWLEDGE_MODE = "AUTO_ACKNOWLEDGE";
+ /**
+ * JMS Destination username. This is the username in the call to
+ * {@link javax.jms.ConnectionFactory#createConnection(String, String) }
+ */
+ public static final String JMS_SECURITY_PRINCIPAL_TAG = "jms-security-principal";
+
+ /**
+ * JMS Destination password. This is the password in the call to
+ * {@link javax.jms.ConnectionFactory#createConnection(String, String) }
+ */
+ public static final String JMS_SECURITY_CREDENTIAL_TAG = "jms-security-credential";
+
+ /**
+ * Enum to type-safe JMS Client Acknowledgement mode string
+ * mappings to JMS Session's integers.
+ */
+ public enum AcknowledgeMode
+ {
+ CLIENT_ACKNOWLEDGE(Session.CLIENT_ACKNOWLEDGE),
+ AUTO_ACKNOWLEDGE(Session.AUTO_ACKNOWLEDGE),
+ DUPS_OK_ACKNOWLEDGE(Session.DUPS_OK_ACKNOWLEDGE);
+
+ private static Logger log = Logger.getLogger(AcknowledgeMode.class);
+
+ private int jmsAckModeInt;
+
+ AcknowledgeMode(final int jmsAckModeInt)
+ {
+ this.jmsAckModeInt = jmsAckModeInt;
+ }
+
+ public int getAcknowledgeModeInt()
+ {
+ return jmsAckModeInt;
+ }
+
+ static public AcknowledgeMode getAckMode(final String ackMode)
+ {
+ if(ackMode != null)
+ try
+ {
+ return AcknowledgeMode.valueOf(ackMode);
+ }
+ catch (IllegalArgumentException e)
+ {
+ log.warn("' " + ackMode + "' is invalid : " + ".Will use default '" + AcknowledgeMode.AUTO_ACKNOWLEDGE);
+ }
+ return AcknowledgeMode.AUTO_ACKNOWLEDGE;
+ }
+ }
+
+ private static final String DEFAULT_ACKNOWLEDGE_MODE = AcknowledgeMode.AUTO_ACKNOWLEDGE.toString();
public JMSEpr(EPR epr)
{
@@ -139,8 +194,14 @@
} else if (tag.equals(ACKNOWLEDGE_MODE_TAG)) {
String ackMode = nl.item(i).getTextContent();
getAddr().addExtension(ACKNOWLEDGE_MODE_TAG, String.valueOf(ackMode));
+ } else if (tag.equals(JMS_SECURITY_PRINCIPAL_TAG)) {
+ String username = nl.item(i).getTextContent();
+ getAddr().addExtension(JMS_SECURITY_PRINCIPAL_TAG, String.valueOf(username));
+ } else if (tag.equals(JMS_SECURITY_CREDENTIAL_TAG)) {
+ String password = nl.item(i).getTextContent();
+ getAddr().addExtension(JMS_SECURITY_CREDENTIAL_TAG, String.valueOf(password));
} else if (tag.equals(DESTINATION_TYPE_TAG)) {
- getAddr().addExtension(DESTINATION_TYPE_TAG, nl.item(i).getTextContent());
+ getAddr().addExtension(DESTINATION_TYPE_TAG, nl.item(i).getTextContent());
}
}
}
@@ -239,10 +300,64 @@
{
this(protocol,destinationType,destinationName,connection,environment,messageSelector,peristent,DEFAULT_ACKNOWLEDGE_MODE);
}
+
+ /**
+ * Create a new JMS EPR.
+ *
+ * @param protocol
+ * the protocol version.
+ * @param destinationType
+ * the type of destination (queue/topic).
+ * @param destinationName
+ * name of the queue/topic.
+ * @param connection
+ * reference to the connection factory.
+ * @param environment
+ * reference to the jndi properties
+ * @param messageSelector
+ * reference to the connection factory.
+ * @param peristent
+ * true if messages should be sent persistently
+ * @param acknowledgeModeStr
+ * JMS client acknowledgement mode
+ */
public JMSEpr(String protocol, String destinationType,
String destinationName, String connection, Properties environment,
String messageSelector, boolean peristent, String acknowledgeModeStr)
{
+ this( protocol, destinationType, destinationName, connection, environment,
+ messageSelector, peristent, acknowledgeModeStr, null, null );
+ }
+
+ /**
+ * Create a new JMS EPR.
+ *
+ * @param protocol
+ * the protocol version.
+ * @param destinationType
+ * the type of destination (queue/topic).
+ * @param destinationName
+ * name of the queue/topic.
+ * @param connection
+ * reference to the connection factory.
+ * @param environment
+ * reference to the jndi properties
+ * @param messageSelector
+ * reference to the connection factory.
+ * @param peristent
+ * true if messages should be sent persistently
+ * @param acknowledgeModeStr
+ * JMS client acknowledgement mode
+ * @param username
+ * JMS destination username
+ * @param password
+ * JMS destination password
+ */
+ public JMSEpr(String protocol, String destinationType,
+ String destinationName, String connection, Properties environment,
+ String messageSelector, boolean peristent, String acknowledgeModeStr,
+ String username, String password)
+ {
// how many of these do we really need? modify accordingly.
if ((protocol == null) || (destinationType == null)
@@ -297,9 +412,16 @@
addr.addExtension(PERSISTENT_TAG, String.valueOf(peristent));
- addr.addExtension(ACKNOWLEDGE_MODE_TAG, String.valueOf(getAcknowledgeMode(acknowledgeModeStr)));
+ addr.addExtension(ACKNOWLEDGE_MODE_TAG, String.valueOf(AcknowledgeMode.getAckMode(acknowledgeModeStr)));
setAddr(addr);
+
+ if(username != null)
+ addr.addExtension(JMS_SECURITY_PRINCIPAL_TAG, username);
+
+ if(password != null)
+ addr.addExtension(JMS_SECURITY_CREDENTIAL_TAG, password);
+
}
else
throw new IllegalArgumentException("Invalid destination type! "+destinationType);
@@ -408,16 +530,44 @@
return Boolean.parseBoolean(getAddr().getExtensionValue(PERSISTENT_TAG));
}
+ /**
+ *
+ * @return <code>int</code> JMS Acknowledge mode, one of:
+ * <lu>
+ * <li>{@link Session#AUTO_ACKNOWLEDGE}</li>
+ * <li>{@link Session#CLIENT_ACKNOWLEDGE}</li>
+ * <li>{@link Session#DUPS_OK_ACKNOWLEDGE}</li>
+ * </lu>
+ */
public final int getAcknowledgeMode()
{
- try {
- return Integer.valueOf(getAddr().getExtensionValue(ACKNOWLEDGE_MODE_TAG));
- } catch (NullPointerException e) {
- return Session.AUTO_ACKNOWLEDGE;
- } catch (NumberFormatException e) {
- return Session.AUTO_ACKNOWLEDGE;
- }
+ AcknowledgeMode ackMode = AcknowledgeMode.getAckMode(getAddr().getExtensionValue(ACKNOWLEDGE_MODE_TAG));
+ return ackMode.getAcknowledgeModeInt();
}
+
+ /**
+ * The JMS Security principal which is indended to be used as the username
+ * argument to:
+ * {@link javax.jms.ConnectionFactory}.createConnection(String username, String password) }
+ * @return
+ */
+ public final String getJMSSecurityPrincipal()
+ {
+ final String username = getAddr().getExtensionValue(JMS_SECURITY_PRINCIPAL_TAG);
+ return username == null || username.equals("null") ? null : username;
+ }
+
+ /**
+ * The JMS Security credential which is indended to be used as the password
+ * argument to:
+ * {@link javax.jms.ConnectionFactory}.createConnection(String username, String password) }
+ * @return
+ */
+ public final String getJMSSecurityCredential()
+ {
+ final String password = getAddr().getExtensionValue(JMS_SECURITY_CREDENTIAL_TAG);
+ return password == null || password.equals("null") ? null : password;
+ }
public EPR copy ()
{
@@ -449,23 +599,4 @@
throw new ExceptionInInitializerError(ex.toString());
}
}
-
- private int getAcknowledgeMode(final String acknowledgeModeStr)
- {
- log.debug( "'" + ACKNOWLEDGE_MODE_TAG + "' is : " + acknowledgeModeStr);
- int acknowledgeMode = Session.AUTO_ACKNOWLEDGE;
- if ( acknowledgeModeStr != null )
- {
- if ( acknowledgeModeStr.equalsIgnoreCase( "AUTO_ACKNOWLEDGE") )
- acknowledgeMode = Session.AUTO_ACKNOWLEDGE;
- else if ( acknowledgeModeStr.equalsIgnoreCase( "CLIENT_ACKNOWLEDGE") )
- acknowledgeMode = Session.CLIENT_ACKNOWLEDGE;
- else if ( acknowledgeModeStr.equalsIgnoreCase( "DUPS_OK_ACKNOWLEDGE") )
- acknowledgeMode = Session.DUPS_OK_ACKNOWLEDGE;
- else
- log.warn( "' " + ACKNOWLEDGE_MODE_TAG + "' was invalid : " + acknowledgeModeStr + ". Will use default '" + DEFAULT_ACKNOWLEDGE_MODE);
- }
- return acknowledgeMode;
- }
-
}
\ No newline at end of file
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -27,6 +27,7 @@
import java.net.URL;
import javax.transaction.Status;
+import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import org.apache.log4j.Logger;
@@ -207,5 +208,82 @@
throw new TransactionStrategyException("Failed to mark the transaction on current thread for rollback", th) ;
}
}
+
+ /**
+ * Get a handle on the currently associated transaction (or null).
+ * @throws TransactionStrategyException
+ */
+
+ public Object getTransaction () throws TransactionStrategyException
+ {
+ try
+ {
+ return tm.getTransaction();
+ }
+ catch (final Throwable th)
+ {
+ throw new TransactionStrategyException("Problem when trying to getTransaction: ",th);
+ }
+ }
+
+ /**
+ * Suspend the current thread-to-transaction association.
+ *
+ * @return the associated transaction, or null.
+ * @throws TransactionStrategyException
+ */
+ public Object suspend () throws TransactionStrategyException
+ {
+ try
+ {
+ return tm.suspend();
+ }
+ catch (final Throwable th)
+ {
+ throw new TransactionStrategyException("Problem when trying to suspend transaction: ",th);
+ }
+ }
+
+ /**
+ * Associated the transaction with the current thread.
+ * @param tx
+ * @throws TransactionStrategyException
+ */
+ public void resume (Object tx) throws TransactionStrategyException
+ {
+ try
+ {
+ tm.resume((Transaction) tx);
+ }
+ catch (final Throwable th)
+ {
+ throw new TransactionStrategyException("Problem when trying to resume transaction: ",th);
+ }
+ }
+
+ /**
+ * Is the currently associated transaction active?
+ * @return
+ * @throws TransactionStrategyException
+ */
+ public boolean isActive () throws TransactionStrategyException
+ {
+ try
+ {
+ if (tm.getStatus() == Status.STATUS_ACTIVE)
+ return true;
+ else
+ return false;
+ }
+ catch (final Throwable th)
+ {
+ throw new TransactionStrategyException("Problem when trying to get transaction status: ",th);
+ }
+ }
+
+ public String toString ()
+ {
+ return "JTATransactionStrategy";
+ }
}
}
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/common/TransactionStrategy.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/common/TransactionStrategy.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/common/TransactionStrategy.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -91,6 +91,52 @@
throws TransactionStrategyException ;
/**
+ * Get a handle on the currently associated transaction (or null).
+ * @throws TransactionStrategyException
+ */
+
+ public abstract Object getTransaction () throws TransactionStrategyException;
+
+ /**
+ * Suspend the current thread-to-transaction association.
+ *
+ * @return the associated transaction, or null.
+ * @throws TransactionStrategyException
+ */
+ public abstract Object suspend () throws TransactionStrategyException;
+
+ /**
+ * Is the currently associated transaction active?
+ * @return
+ * @throws TransactionStrategyException
+ */
+ public abstract boolean isActive () throws TransactionStrategyException;
+
+ /**
+ * Associated the transaction with the current thread.
+ * @param tx
+ * @throws TransactionStrategyException
+ */
+ public abstract void resume (Object tx) throws TransactionStrategyException;
+
+ public static void setStrategy (TransactionStrategy txSt)
+ {
+ _currentStrategy.set(txSt);
+ }
+
+ public static TransactionStrategy getStrategy ()
+ {
+ return _currentStrategy.get();
+ }
+
+ public static void removeStrategy ()
+ {
+ _currentStrategy.remove();
+ }
+
+ private final static ThreadLocal<TransactionStrategy> _currentStrategy = new ThreadLocal<TransactionStrategy>();
+
+ /**
* The null transaction strategy.
* @author kevin
*/
@@ -124,5 +170,50 @@
throws TransactionStrategyException
{
}
+
+ /**
+ * Get a handle on the currently associated transaction (or null).
+ * @throws TransactionStrategyException
+ */
+
+ public Object getTransaction () throws TransactionStrategyException
+ {
+ return null;
+ }
+
+ /**
+ * Suspend the current thread-to-transaction association.
+ *
+ * @return the associated transaction, or null.
+ * @throws TransactionStrategyException
+ */
+ public Object suspend () throws TransactionStrategyException
+ {
+ return null;
+ }
+
+ /**
+ * Associated the transaction with the current thread.
+ * @param tx
+ * @throws TransactionStrategyException
+ */
+ public void resume (Object tx) throws TransactionStrategyException
+ {
+ }
+
+ /**
+ * Is the currently associated transaction active?
+ * @return
+ * @throws TransactionStrategyException
+ */
+ public boolean isActive () throws TransactionStrategyException
+ {
+ return false;
+ }
+
+ public String toString ()
+ {
+ return "NullTransactionStrategy";
+ }
}
}
\ No newline at end of file
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -38,6 +38,8 @@
private DataSource m_oDS = null;
private Connection m_conn = null;
+
+ private boolean transactional = false;
protected List<PreparedStatement> m_olPrepSt = new ArrayList<PreparedStatement>();
@@ -45,13 +47,19 @@
public JdbcCleanConn(DataSource p_oDS)
{
+ this(p_oDS, false);
+ }
+
+ public JdbcCleanConn(DataSource p_oDS, boolean transactional)
+ {
m_oDS = p_oDS;
m_oLogger = Logger.getLogger(this.getClass());
+ this.transactional = transactional;
}
public void commit() throws SQLException
{
- if (null != m_conn)
+ if ((null != m_conn) && (!transactional))
{
m_conn.commit();
}
@@ -59,7 +67,7 @@
public void rollback() throws SQLException
{
- if (null != m_conn)
+ if ((null != m_conn) && (!transactional))
{
m_conn.rollback();
} else {
@@ -73,7 +81,7 @@
public void release()
{
- if (null != m_conn)
+ if ((null != m_conn) && (!transactional))
{
try
{
@@ -135,6 +143,9 @@
connect();
}
+ if (p_PS == null)
+ throw new SQLException("Null PreparedStatement!");
+
SQLException eRet = null;
int iQtry = (p_iQtry < 1) ? 1 : (p_iQtry < 50) ? p_iQtry : 50;
for (int i1 = 0; i1 < iQtry; i1++)
@@ -172,6 +183,9 @@
connect();
}
+ if (p_PS == null)
+ throw new SQLException("Null PreparedStatement!");
+
SQLException eRet = null;
int iQtry = (p_iQtry < 1) ? 1 : (p_iQtry < 50) ? p_iQtry : 50;
for (int i1 = 0; i1 < iQtry; i1++)
@@ -250,8 +264,11 @@
throw new RuntimeException("connect() FAILED: no connection");
}
- m_conn.setAutoCommit(false);
- m_conn.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
+ if (!transactional)
+ {
+ m_conn.setAutoCommit(false);
+ m_conn.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
+ }
m_olPrepSt.clear();
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/http/HttpClientFactory.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/http/HttpClientFactory.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/http/HttpClientFactory.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -25,6 +25,9 @@
import org.jboss.internal.soa.esb.assertion.AssertArgument;
import org.jboss.internal.soa.esb.util.StreamUtils;
import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpConnectionManager;
+import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
+import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
import java.util.Properties;
import java.io.IOException;
@@ -40,6 +43,10 @@
* Target host url.
*/
public static final String TARGET_HOST_URL = "target-host-url";
+ /**
+ * Max total connections.
+ */
+ public static final String MAX_TOTAL_CONNECTIONS = "max-total-connections";
/**
* Factory method for creating the {@link org.apache.commons.httpclient.HttpClient}
@@ -52,7 +59,18 @@
public static HttpClient createHttpClient(Properties properties) throws ConfigurationException {
AssertArgument.isNotNull(properties, "properties");
- HttpClient httpClient = new HttpClient();
+ final HttpConnectionManager connectionManager = new MultiThreadedHttpConnectionManager() ;
+ final String maxTotalConnections = properties.getProperty(MAX_TOTAL_CONNECTIONS) ;
+ if (maxTotalConnections != null) {
+ final HttpConnectionManagerParams params = new HttpConnectionManagerParams() ;
+ try {
+ params.setMaxTotalConnections(Integer.parseInt(maxTotalConnections)) ;
+ } catch (final NumberFormatException nfe) {
+ throw new ConfigurationException("Invalid " + MAX_TOTAL_CONNECTIONS + " property: " + maxTotalConnections) ;
+ }
+ }
+
+ HttpClient httpClient = new HttpClient(connectionManager);
String fileConfig = (String) properties.remove("file");
String[] configurators;
@@ -90,5 +108,17 @@
}
}
-
+ /**
+ * Shutdown http client and associated connections.
+ * @param httpclient The http client
+ */
+ public static void shutdown(final HttpClient httpclient) {
+ if (httpclient != null) {
+ final HttpConnectionManager connectionManager = httpclient.getHttpConnectionManager();
+ if (connectionManager instanceof MultiThreadedHttpConnectionManager) {
+ final MultiThreadedHttpConnectionManager multiThreadedHttpConnectionManager = (MultiThreadedHttpConnectionManager)connectionManager;
+ multiThreadedHttpConnectionManager.shutdown();
+ }
+ }
+ }
}
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -57,6 +57,7 @@
/** Listeners */
public static final String LISTENER_CLASS_TAG = "listenerClass";
public static final String TRANSACTED_TAG = "transacted";
+ public static final String ROLLBACK_ON_PIPELINE_FAULTS = "rollbackOnPipelineFaults";
/** Deployment */
public static final String DEPLOYMENT_NAME_TAG = "deployment";
@@ -122,6 +123,7 @@
public static final String SQL_WHERE_CONDITION_TAG = "whereCondition";
public static final String SQL_ORDER_BY_TAG = "orderBy";
public static final String SQL_POST_DEL_TAG = "postDelete";
+ public static final String SQL_TIMESTAMP_TAG = "insert-timestamp-column";
/** Reply Listener */
public static final String REPLY_LISTENER_TIMEOUT_TAG = "replyListenerTimeout";
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -48,7 +48,6 @@
public class ListenerUtil
{
-
private static Logger logger = Logger.getLogger(ListenerUtil.class);
private ListenerUtil()
@@ -137,11 +136,15 @@
+ JMSEpr.MESSAGE_SELECTOR_TAG + " attribute"
+ " - All messages in queue <" + name
+ "> will be picked up by listener");
- boolean persistent = Boolean.valueOf(tree.getAttribute(JMSEpr.PERSISTENT_TAG));
- String acknowledgeMode = tree.getAttribute(JMSEpr.ACKNOWLEDGE_MODE_TAG);
- JMSEpr epr = new JMSEpr(JMSEpr.ONE_ONE_PROTOCOL,type, name, jmsFactoryClass, environment, selector, persistent,acknowledgeMode);
-
+ final String username = tree.getAttribute(JMSEpr.JMS_SECURITY_PRINCIPAL_TAG);
+ final String password = tree.getAttribute(JMSEpr.JMS_SECURITY_CREDENTIAL_TAG);
+ JMSEpr epr = new JMSEpr(JMSEpr.ONE_ONE_PROTOCOL,type, name, jmsFactoryClass, environment,
+ selector,
+ Boolean.valueOf(tree.getAttribute(JMSEpr.PERSISTENT_TAG)),
+ tree.getAttribute(JMSEpr.ACKNOWLEDGE_MODE_TAG),
+ username,
+ password);
return epr;
}
catch (Exception e)
@@ -271,9 +274,18 @@
boolean bErrorDel = Boolean.valueOf(tree.getAttribute(
JDBCEpr.ERROR_DEL_TAG, "true"));
JDBCEpr epr = new JDBCEpr(url, bPostDel, bErrorDel);
- epr.setDriver(tree.getRequiredAttribute(JDBCEpr.DRIVER_TAG));
- epr.setUserName(getAttrAndWarn(tree, JDBCEpr.USERNAME_TAG, ""));
- epr.setPassword(getAttrAndWarn(tree, JDBCEpr.PASSWORD_TAG, ""));
+
+ String datasource = tree.getAttribute(JDBCEpr.DATASOURCE_TAG);
+
+ if (datasource == null)
+ {
+ epr.setDriver(tree.getRequiredAttribute(JDBCEpr.DRIVER_TAG));
+ epr.setUserName(getAttrAndWarn(tree, JDBCEpr.USERNAME_TAG, ""));
+ epr.setPassword(getAttrAndWarn(tree, JDBCEpr.PASSWORD_TAG, ""));
+ }
+ else
+ epr.setDatasource(datasource);
+
epr.setTableName(tree.getRequiredAttribute(JDBCEpr.TABLE_NAME_TAG));
epr.setMessageIdColumn(getColName(tree, JDBCEpr.MESSAGE_ID_COLUMN_TAG));
epr.setStatusColumn(getColName(tree, JDBCEpr.STATUS_COLUMN_TAG));
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -24,6 +24,7 @@
import javax.jms.Queue;
import javax.jms.Topic;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.addressing.eprs.JMSEpr;
import org.jboss.soa.esb.dom.YADOMUtil;
@@ -52,6 +53,8 @@
*/
public class JmsListenerMapper {
+ @SuppressWarnings("unused")
+ private static Logger log = Logger.getLogger( JmsListenerMapper.class );
/**
* Perform the mapping.
@@ -142,6 +145,8 @@
toElement.setAttribute(JMSEpr.JNDI_URL_TAG, provider.getJndiURL());
toElement.setAttribute(JMSEpr.PERSISTENT_TAG, Boolean.toString( messageFilter.getPersistent()));
toElement.setAttribute(JMSEpr.ACKNOWLEDGE_MODE_TAG, messageFilter.getAcknowledgeMode());
+ toElement.setAttribute(JMSEpr.JMS_SECURITY_PRINCIPAL_TAG, messageFilter.getJmsSecurityPrincipal());
+ toElement.setAttribute(JMSEpr.JMS_SECURITY_CREDENTIAL_TAG, messageFilter.getJmsSecurityCredential());
}
private static void mapJmsJcaAttributes(final JmsListener listener,
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/SqlListenerMapper.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/SqlListenerMapper.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/SqlListenerMapper.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -65,10 +65,9 @@
}
if (provider.getDatasource() != null) {
- if ((provider.getUrl() != null)
- || (provider.getUsername() != null)
+ if ((provider.getUsername() != null)
|| (provider.getDriver() != null)) {
- throw new ConfigurationException ("Invalid sql-provider configuration : a datasource and a URL/username/password/driver "
+ throw new ConfigurationException ("Invalid sql-provider configuration : a datasource and a username/password/driver "
+ "combination cannot both be defined. Use only one (datasource or JDBC connection info)."
+ "Datasource : [" + provider.getDatasource() + "] JDBC URL [" + provider.getUrl() + "]");
}
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -365,13 +365,24 @@
String destType = _config.getAttribute(JMSEpr.DESTINATION_TYPE_TAG);
boolean persistent = Boolean.valueOf( _config.getAttribute(JMSEpr.PERSISTENT_TAG));
String acknowledgeMode = _config.getAttribute(JMSEpr.ACKNOWLEDGE_MODE_TAG);
+
+ final String username = _config.getAttribute( JMSEpr.JMS_SECURITY_PRINCIPAL_TAG );
+ final String password = _config.getAttribute( JMSEpr.JMS_SECURITY_CREDENTIAL_TAG );
+ if ( username != null && password != null )
+ {
+ environment.put( JMSEpr.JMS_SECURITY_PRINCIPAL_TAG, username );
+ environment.put( JMSEpr.JMS_SECURITY_CREDENTIAL_TAG, password );
+ }
+
_myEpr = (null == _serviceName) ? null : new JMSEpr(JMSEpr.ONE_ONE_PROTOCOL, destType,
- jmsDestinationName, sFactClass, environment, _messageSelector, persistent, acknowledgeMode);
-
- jmsConnectionPool = JmsConnectionPoolContainer.getPool(environment, sFactClass, destType);
-
+ jmsDestinationName, sFactClass, environment, _messageSelector, persistent, acknowledgeMode,
+ username, password);
+ jmsConnectionPool = JmsConnectionPoolContainer.getPool(environment, sFactClass, destType,username, password);
+
try {
- jmsSession = jmsConnectionPool.getSession(Session.AUTO_ACKNOWLEDGE);
+ jmsSession = _myEpr != null ? jmsConnectionPool.getSession(((JMSEpr)_myEpr).getAcknowledgeMode()):
+ jmsConnectionPool.getSession(Session.AUTO_ACKNOWLEDGE);
+
}
catch (NamingException ne) {
throw new ConfigurationException("Failed to obtain queue session from pool", ne);
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -33,6 +33,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -84,10 +85,13 @@
* <p/> The following fields are mandatory (see checkMyParms()): <br/> <br/>SQL
* table name <br/>list of fields to retrieve <br/>list of key fields to use in
* the update statement <br/>a field that will be used to mark a row as
- * 'pending(p)', 'in process(w)', 'done(d)' or 'in error(e)'
+ * 'P' (pending), 'W' (in process), 'D' (done) or 'E' (error). When adding
+ * a pending row, make sure that the status_col value if an upper-cased 'P', as
+ * upper-cased characters are used as a convention.
*
* @author <a
* href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
+ * @author <a href="mailto:tcunning at redhat.com">tcunning at redhat.com</a>
* @since Version 4.0
*/
public class SqlTableGatewayListener extends AbstractThreadedManagedLifecycle {
@@ -348,7 +352,11 @@
if (Util.isNullString(_inProcessField))
throw new ConfigurationException(
"A valid inProcessField attribute must be specified");
-
+ _timestamp = ListenerUtil.getValue(_config,
+ JDBCEpr.TIMESTAMP_COLUMN_TAG, "");
+ if (_timestamp.trim().length() < 1)
+ _logger.debug("No value specified for: "
+ + ListenerTagNames.SQL_TIMESTAMP_TAG);
_where = ListenerUtil.getValue(_config,
ListenerTagNames.SQL_WHERE_CONDITION_TAG, "");
if (_where.trim().length() < 1)
@@ -584,8 +592,11 @@
*/
protected String updateStatement() {
StringBuilder sb = new StringBuilder().append("update ").append(
- _tableName).append(" set ").append(_inProcessField).append(
- " = ? where ").append(_inProcessField).append(" = ?");
+ _tableName).append(" set ").append(_inProcessField).append(" = ? ");
+ if (_timestamp.trim().length() < 1) {
+ sb.append(", " + _timestamp + " = ? ");
+ }
+ sb.append("where ").append(_inProcessField).append(" = ?");
for (String sCurr : _keys) {
sb.append(" and ").append(sCurr).append(" = ?");
}
@@ -651,7 +662,12 @@
try {
int iParm = 1;
for (String sColName : _keys) {
- final String val = String.valueOf(_currentRow.get(sColName));
+ String val = null;
+ if (_currentRow.containsKey(sColName)) {
+ val = String.valueOf(_currentRow.get(sColName));
+ } else {
+ val = String.valueOf(_upperCurrentRow.get(sColName));
+ }
_PSdeleteRow.setString(iParm++, val);
}
@@ -705,26 +721,44 @@
try {
int iParm = 3;
+ if (_timestamp.trim().length() < 1) {
+ iParm++;
+ }
List<String> tempKeys = new ArrayList<String>();
for (String key : _currentRow.keySet()) {
tempKeys.add(key);
}
+ if (_upperCurrentRow != null) {
+ _upperCurrentRow.clear();
+ } else {
+ _upperCurrentRow = new HashMap<String, Object>();
+ }
+
for (String key : tempKeys) {
Object value = _currentRow.get(key);
- if (!_currentRow.containsKey(key.toUpperCase())) {
- _currentRow.put(key.toUpperCase(), value);
- }
+ _upperCurrentRow.put(key.toUpperCase(), value);
}
for (String sColName : _keys) {
- Object oVal = String.valueOf(_currentRow.get(sColName.toUpperCase()));
+ Object oVal = null;
+ if (_currentRow.containsKey(sColName)) {
+ oVal = String.valueOf(_currentRow.get(sColName.toUpperCase()));
+ } else {
+ oVal = String.valueOf(_upperCurrentRow.get(sColName.toUpperCase()));
+ }
+
_PSupdate.setObject(iParm++, oVal);
}
try {
- _PSupdate.setString(1, getStatus(toState));
- _PSupdate.setString(2, getStatus(fromState));
+ int counter = 1;
+ _PSupdate.setString(counter++, getStatus(toState));
+ if (_timestamp.trim().length() < 1) {
+ Date now = new Date();
+ _PSupdate.setString(counter++, now.toString());
+ }
+ _PSupdate.setString(counter++, getStatus(fromState));
final int count = getDbConn().execUpdWait(_PSupdate, 5);
if (count == 1) {
getDbConn().commit();
@@ -828,7 +862,7 @@
protected String _driver, _url, _user, _password, _datasource;
- protected String _tableName, _selectFields, _keyFields;
+ protected String _tableName, _selectFields, _keyFields, _timestamp;
protected String _where, _orderBy;
@@ -842,7 +876,7 @@
protected JdbcCleanConn _dbConn;
- protected Map<String, Object> _currentRow;
+ protected Map<String, Object> _currentRow, _upperCurrentRow;
public static enum ROW_STATE {
Pending, Working, Error, Done
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -32,6 +32,8 @@
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.addressing.MalformedEPRException;
+import org.jboss.soa.esb.common.TransactionStrategy;
+import org.jboss.soa.esb.common.TransactionStrategyException;
import org.jboss.soa.esb.couriers.CourierException;
import org.jboss.soa.esb.couriers.CourierFactory;
import org.jboss.soa.esb.couriers.CourierTimeoutException;
@@ -85,6 +87,10 @@
* The error delay.
*/
private long errorDelay ;
+
+ private TransactionStrategy transactionStrategy;
+ private boolean transactional = false;
+ private boolean rollbackOnPipelineFaults = true;
/**
* public constructor
@@ -156,6 +162,11 @@
}
}
_latencySecs = lSeconds ;
+
+ transactional = _config.getBooleanAttribute(ListenerTagNames.TRANSACTED_TAG, false) ;
+ transactionStrategy = TransactionStrategy.getTransactionStrategy(transactional) ;
+
+ rollbackOnPipelineFaults = _config.getBooleanAttribute(ListenerTagNames.ROLLBACK_ON_PIPELINE_FAULTS, true);
}
/**
@@ -261,17 +272,53 @@
}
}
+ /**
+ * We have JMS transactional delivery/work semantics: before pulling a unit of work
+ * we start a transaction. If the pipeline completes successfully then we will
+ * commit that transaction and the OUW will be deleted. If we have to roll back
+ * the transaction then the UOW will be placed back on the input "queue" (assumes that
+ * the courier is transactional).
+ *
+ * @param maxWaitMillis
+ */
public void waitForEventAndProcess (long maxWaitMillis)
{
Message message = null ;
+ boolean problem = false;
+
try
{
+ transactionStrategy.begin();
+
+ /*
+ * If this is a transactional receive then the courier
+ * needs to be reset afterwards, because we can only
+ * guarantee one instance per transaction. If the courier
+ * instance does some handy multiplexing internally across different
+ * transactions then we won't be able to handle that at this level.
+ * However, at the moment that isn't an issue.
+ */
+
+ TransactionStrategy.setStrategy(transactionStrategy);
+
message = (maxWaitMillis > 0) ? _pickUpCourier
.pickup(maxWaitMillis) : null;
errorDelay = 0 ;
}
+ catch (TransactionStrategyException ex)
+ {
+ // could not begin transaction!
+
+ _logger.error("Could not begin transaction!");
+
+ problem = true;
+
+ return;
+ }
catch (CourierTimeoutException e)
{
+ problem = true;
+
return;
}
catch (FaultMessageException fme)
@@ -280,35 +327,79 @@
}
catch (CourierException e)
{
- _logger.debug("Courier Exception", e);
- if (errorDelay == 0)
- {
- errorDelay = MIN_ERROR_DELAY ;
- }
- else if (errorDelay < MAX_ERROR_DELAY)
- {
- errorDelay <<= 1 ;
- }
- _logger.warn("Error processing courier, backing off for " + errorDelay + " milliseconds") ;
- waitForRunningStateChange(ManagedLifecycleThreadState.STOPPING, errorDelay) ;
+ _logger.debug("Courier Exception", e);
+ if (errorDelay == 0)
+ {
+ errorDelay = MIN_ERROR_DELAY ;
+ }
+ else if (errorDelay < MAX_ERROR_DELAY)
+ {
+ errorDelay <<= 1 ;
+ }
+ e.printStackTrace();
+ _logger.warn("Error processing courier, backing off for " + errorDelay + " milliseconds") ;
+ waitForRunningStateChange(ManagedLifecycleThreadState.STOPPING, errorDelay) ;
+
+ problem = true;
+
return;
}
+ finally
+ {
+ if (problem)
+ {
+ try
+ {
+ if (transactionStrategy.getTransaction() != null)
+ {
+ CourierUtil.cleanCourier(_pickUpCourier);
+
+ resetCourier();
+ }
+ }
+ catch (Throwable ex)
+ {
+ CourierUtil.cleanCourier(_pickUpCourier);
+
+ resetCourier(); // to be on the safe side!
+ }
+
+ rollbackTransaction();
+ }
+
+ TransactionStrategy.removeStrategy();
+ }
if (null != message)
{
- final Message pipelineMessage = message ;
- final Runnable pipelineRunner = new Runnable() {
- public void run() {
- try {
- pipeline.process(pipelineMessage) ;
- } finally {
- updateThreadCount(-1) ;
- }
- }
- } ;
- updateThreadCount(+1);
- _execService.execute(pipelineRunner);
+ try
+ {
+ final Message pipelineMessage = message ;
+ final Object txHandle = transactionStrategy.suspend();
+ final TransactionalRunner txRunner = new TransactionalRunner(_pickUpCourier, pipelineMessage, txHandle);
+
+ updateThreadCount(+1);
+ _execService.execute(txRunner);
+
+ if (transactional)
+ {
+ _pickUpCourier = null; // runner will clean it up.
+
+ resetCourier(); // we need another courier for the next msg.
+ }
+ }
+ catch (TransactionStrategyException ex)
+ {
+ _logger.warn("Caught transaction related exception: ", ex);
+ rollbackTransaction();
+ }
}
+ else
+ {
+ // nothing to do, so roll back the transaction before returning.
+
+ rollbackTransaction();
+ }
} // ________________________________
@@ -392,7 +483,134 @@
}
}
}
+
+ private void rollbackTransaction ()
+ {
+ try
+ {
+ transactionStrategy.rollbackOnly();
+ transactionStrategy.terminate();
+ }
+ catch (Throwable ex)
+ {
+ _logger.warn("Problem while attempting to rollback transaction!"); // timeout should catch it next!
+ }
+ }
+
+ private void resetCourier ()
+ {
+ TwoWayCourier pickUpCourier = null;
+ try
+ {
+ pickUpCourier = CourierFactory.getPickupCourier(_epr) ;
+ try
+ {
+ final Method setPollLatency = pickUpCourier.getClass().getMethod(
+ "setPollLatency", new Class[] { Long.class });
+ setPollLatency.invoke(pickUpCourier, new Long(1000 * _latencySecs));
+ }
+ catch (final NoSuchMethodException nsme)
+ {
+ // OK, just leave it null
+ }
+ catch (final Exception ex)
+ {
+ CourierUtil.cleanCourier(pickUpCourier);
+
+ _logger.error("Problems invoking setPollLatency(long)", ex);
+ }
+ }
+ catch (final MalformedEPRException mepre)
+ {
+ _logger.error("Malformed EPR: " + _epr) ;
+ }
+ catch (final CourierException ce)
+ {
+ _logger.error("No appropriate courier can be obtained for " + _epr, ce);
+ }
+
+ _pickUpCourier = pickUpCourier;
+ }
+
+ class TransactionalRunner implements Runnable
+ {
+ public TransactionalRunner (PickUpOnlyCourier courier, Message pipelineMessage, Object txHandle)
+ {
+ _courier = courier;
+ _pipelineMessage = pipelineMessage;
+ _txHandle = txHandle;
+ }
+
+ public void run()
+ {
+ boolean problem = false;
+
+ try
+ {
+ transactionStrategy.resume(_txHandle);
+
+ pipeline.setTransactional(transactional);
+
+ TransactionStrategy.setStrategy(transactionStrategy);
+
+ /*
+ * Current strategy is to commit as long as process returns true.
+ * If fails, or any exceptions are caught, then we roll back.
+ *
+ * TODO re-examine the semantics around true/false from the pipeline.
+ */
+
+ // TODO consider adding a RollbackOnFalse option to allow override.
+
+ problem = rollbackOnPipelineFaults && !pipeline.process(_pipelineMessage);
+
+ if (!problem)
+ {
+ transactionStrategy.terminate();
+ }
+ }
+ catch (TransactionStrategyException ex)
+ {
+ problem = true;
+
+ _logger.warn("TransactionalRunner caught transaction exception: ", ex);
+ }
+ catch (RuntimeException ex)
+ {
+ problem = true;
+
+ throw ex;
+ }
+ catch (Throwable ex)
+ {
+ problem = true;
+
+ _logger.warn("TransactionalRunner caught throwable: ",ex);
+ }
+ finally
+ {
+ if (problem)
+ {
+ rollbackTransaction();
+ }
+
+ if (transactional)
+ {
+ CourierUtil.cleanCourier(_courier);
+ }
+
+ TransactionStrategy.removeStrategy();
+
+ updateThreadCount(-1);
+ }
+ }
+
+ private PickUpOnlyCourier _courier;
+ private Message _pipelineMessage;
+ private Object _txHandle;
+ };
+
private ConfigTree _config;
private String _eprCategoryName;
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/internal/soa/esb/rosetta (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/rosetta/tests/src/org/jboss/internal/soa/esb/rosetta)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/internal/soa/esb/rosetta/pooling (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/rosetta/tests/src/org/jboss/internal/soa/esb/rosetta/pooling)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainerUnitTest.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/rosetta/tests/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainerUnitTest.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainerUnitTest.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,88 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and
- * individual contributors as indicated by the @authors tag. See the
- * copyright.txt in the distribution for a full listing of individual
- * contributors.
- *
- * This is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this software; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
- * site: http://www.fsf.org.
- */
-package org.jboss.internal.soa.esb.rosetta.pooling;
-
-import static org.junit.Assert.*;
-import static org.jboss.soa.esb.addressing.eprs.JMSEpr.*;
-
-import java.util.Map;
-import java.util.Properties;
-
-import javax.naming.Context;
-
-import org.jboss.soa.esb.addressing.eprs.JMSEpr;
-import org.junit.Test;
-
-import junit.framework.JUnit4TestAdapter;
-
-/**
- * Unit Test for JmsConnectionPoolContainer
- *
- * @author <a href="mailto:daniel.bevenius at gmail.com">Daniel Bevenius</a>
- *
- */
-public class JmsConnectionPoolContainerUnitTest
-{
- private String connectionFactory = "/ConnectionFactory";
-
- @Test
- public void createPoolKey_null_environment()
- {
- final Properties env = null;
- Map<String, String> poolKey = JmsConnectionPoolContainer.createPoolKey( env, connectionFactory, QUEUE_TYPE );
-
- assertEquals( connectionFactory, poolKey.get( CONNECTION_FACTORY_TAG ) );
- assertEquals( QUEUE_TYPE, poolKey.get( DESTINATION_TYPE_TAG ) );
- }
-
- @Test
- public void createPoolKey_with_naming_security_properties()
- {
- final String username = "daniel";
- final String password = "passwd";
- final Properties env = new Properties();
- env.put( Context.SECURITY_PRINCIPAL, username );
- env.put( Context.SECURITY_CREDENTIALS, password );
- Map<String, String> poolKey = JmsConnectionPoolContainer.createPoolKey( env, connectionFactory, QUEUE_TYPE);
- assertEquals( username, poolKey.get( Context.SECURITY_PRINCIPAL ) );
- assertEquals( password, poolKey.get( Context.SECURITY_CREDENTIALS ) );
- }
-
- @Test
- public void createPoolKey_with_jms_security_properties()
- {
- final String username = "daniel";
- final String password = "passwd";
- final Properties env = null;
- Map<String, String> poolKey = JmsConnectionPoolContainer.createPoolKey( env, connectionFactory, QUEUE_TYPE,
- username, password);
- assertEquals( username, poolKey.get( JMSEpr.JMS_SECURITY_PRINCIPAL_TAG ) );
- assertEquals( password, poolKey.get( JMSEpr.JMS_SECURITY_CREDENTIAL_TAG ) );
- }
-
-
- public static junit.framework.Test suite()
- {
- return new JUnit4TestAdapter( JmsConnectionPoolContainerUnitTest.class );
- }
-
-}
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainerUnitTest.java (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/rosetta/tests/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainerUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainerUnitTest.java (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainerUnitTest.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,88 @@
+/*
+ * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and
+ * individual contributors as indicated by the @authors tag. See the
+ * copyright.txt in the distribution for a full listing of individual
+ * contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ * site: http://www.fsf.org.
+ */
+package org.jboss.internal.soa.esb.rosetta.pooling;
+
+import static org.junit.Assert.*;
+import static org.jboss.soa.esb.addressing.eprs.JMSEpr.*;
+
+import java.util.Map;
+import java.util.Properties;
+
+import javax.naming.Context;
+
+import org.jboss.soa.esb.addressing.eprs.JMSEpr;
+import org.junit.Test;
+
+import junit.framework.JUnit4TestAdapter;
+
+/**
+ * Unit Test for JmsConnectionPoolContainer
+ *
+ * @author <a href="mailto:daniel.bevenius at gmail.com">Daniel Bevenius</a>
+ *
+ */
+public class JmsConnectionPoolContainerUnitTest
+{
+ private String connectionFactory = "/ConnectionFactory";
+
+ @Test
+ public void createPoolKey_null_environment()
+ {
+ final Properties env = null;
+ Map<String, String> poolKey = JmsConnectionPoolContainer.createPoolKey( env, connectionFactory, QUEUE_TYPE );
+
+ assertEquals( connectionFactory, poolKey.get( CONNECTION_FACTORY_TAG ) );
+ assertEquals( QUEUE_TYPE, poolKey.get( DESTINATION_TYPE_TAG ) );
+ }
+
+ @Test
+ public void createPoolKey_with_naming_security_properties()
+ {
+ final String username = "daniel";
+ final String password = "passwd";
+ final Properties env = new Properties();
+ env.put( Context.SECURITY_PRINCIPAL, username );
+ env.put( Context.SECURITY_CREDENTIALS, password );
+ Map<String, String> poolKey = JmsConnectionPoolContainer.createPoolKey( env, connectionFactory, QUEUE_TYPE);
+ assertEquals( username, poolKey.get( Context.SECURITY_PRINCIPAL ) );
+ assertEquals( password, poolKey.get( Context.SECURITY_CREDENTIALS ) );
+ }
+
+ @Test
+ public void createPoolKey_with_jms_security_properties()
+ {
+ final String username = "daniel";
+ final String password = "passwd";
+ final Properties env = null;
+ Map<String, String> poolKey = JmsConnectionPoolContainer.createPoolKey( env, connectionFactory, QUEUE_TYPE,
+ username, password);
+ assertEquals( username, poolKey.get( JMSEpr.JMS_SECURITY_PRINCIPAL_TAG ) );
+ assertEquals( password, poolKey.get( JMSEpr.JMS_SECURITY_CREDENTIAL_TAG ) );
+ }
+
+
+ public static junit.framework.Test suite()
+ {
+ return new JUnit4TestAdapter( JmsConnectionPoolContainerUnitTest.class );
+ }
+
+}
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/actions/aggregation/JBESB_1201_UnitTest.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/actions/aggregation/JBESB_1201_UnitTest.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/actions/aggregation/JBESB_1201_UnitTest.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,18 +1,22 @@
/*
- Milyn - Copyright (C) 2006
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License (version 2.1) as published by the Free Software
- Foundation.
-
- This library 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:
- http://www.gnu.org/licenses/lgpl.txt
-*/
+ * 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.aggregation;
import junit.framework.TestCase;
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/actions/aggregation/JBESB_1204_1331_UnitTest.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/actions/aggregation/JBESB_1204_1331_UnitTest.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/actions/aggregation/JBESB_1204_1331_UnitTest.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,18 +1,22 @@
/*
- Milyn - Copyright (C) 2006
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License (version 2.1) as published by the Free Software
- Foundation.
-
- This library 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:
- http://www.gnu.org/licenses/lgpl.txt
-*/
+ * 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.aggregation;
import junit.framework.TestCase;
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/actions/aggregation/Nested_Splits_UnitTest.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/actions/aggregation/Nested_Splits_UnitTest.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/actions/aggregation/Nested_Splits_UnitTest.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,18 +1,22 @@
/*
- Milyn - Copyright (C) 2006
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License (version 2.1) as published by the Free Software
- Foundation.
-
- This library 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:
- http://www.gnu.org/licenses/lgpl.txt
-*/
+ * 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.aggregation;
import junit.framework.TestCase;
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/JMSEprUnitTest.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/JMSEprUnitTest.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/addressing/eprs/JMSEprUnitTest.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -21,19 +21,24 @@
*/
package org.jboss.soa.esb.addressing.eprs;
+import static org.jboss.soa.esb.addressing.eprs.JMSEpr.*;
import static org.junit.Assert.assertEquals;
import java.net.URISyntaxException;
+import java.util.Properties;
import javax.jms.Session;
+import javax.naming.Context;
import junit.framework.JUnit4TestAdapter;
+
+import org.jboss.soa.esb.addressing.eprs.JMSEpr.AcknowledgeMode;
import org.jboss.soa.esb.couriers.CourierException;
import org.junit.Test;
/**
+ * Unit Test class for JMSEpr
*
* @author <a href="mailto:daniel.bevenius at gmail.com">Daniel Bevenius</a>
- *
*/
public class JMSEprUnitTest
{
@@ -41,7 +46,11 @@
private String expectedConnectionFactory = "ConnectionFactory";
private String expectedDestinationType = JMSEpr.QUEUE_TYPE;
private String expectedSelector = "JMSCorrelationID=1000";
+ private static final boolean NON_PERSISTENT = false;
+ private static final boolean PERSISTENT = true;
+ private final Properties nullEnvironment = null;
+
@Test
public void contstructor_queue() throws CourierException, URISyntaxException
{
@@ -53,7 +62,7 @@
public void contstructor_props_and_selector() throws CourierException, URISyntaxException
{
JMSEpr jmsEpr = new JMSEpr( expectedDestinationType, expectedDestination , expectedConnectionFactory,
- null, expectedSelector);
+ nullEnvironment, expectedSelector);
assertDefaults( jmsEpr.getDestinationName(), jmsEpr.getConnectionFactory(), jmsEpr.getDestinationType() );
assertEquals( expectedSelector, jmsEpr.getMessageSelector() );
@@ -62,24 +71,35 @@
@Test
public void contstructor_persistent() throws CourierException, URISyntaxException
{
- final String expectedVersion = JMSEpr.ONE_ONE_PROTOCOL;
- boolean persistent = false;
- JMSEpr jmsEpr = new JMSEpr( expectedVersion, expectedDestinationType, expectedDestination ,
+ JMSEpr jmsEpr = new JMSEpr( ONE_ONE_PROTOCOL, expectedDestinationType, expectedDestination ,
expectedConnectionFactory,
- null, expectedSelector, persistent);
+ nullEnvironment, expectedSelector, PERSISTENT);
assertDefaults( jmsEpr.getDestinationName(), jmsEpr.getConnectionFactory(), jmsEpr.getDestinationType() );
- assertEquals( expectedVersion, jmsEpr.getVersion() );
+ assertEquals( ONE_ONE_PROTOCOL, jmsEpr.getVersion() );
assertEquals( expectedSelector, jmsEpr.getMessageSelector() );
- assertEquals( persistent, jmsEpr.getPersistent() );
+ assertEquals( PERSISTENT, jmsEpr.getPersistent() );
}
@Test
+ public void contstructor_non_persistent() throws CourierException, URISyntaxException
+ {
+ JMSEpr jmsEpr = new JMSEpr( ONE_ONE_PROTOCOL, expectedDestinationType, expectedDestination ,
+ expectedConnectionFactory,
+ nullEnvironment, expectedSelector, NON_PERSISTENT);
+
+ assertDefaults( jmsEpr.getDestinationName(), jmsEpr.getConnectionFactory(), jmsEpr.getDestinationType() );
+ assertEquals( ONE_ONE_PROTOCOL, jmsEpr.getVersion() );
+ assertEquals( expectedSelector, jmsEpr.getMessageSelector() );
+ assertEquals( NON_PERSISTENT, jmsEpr.getPersistent() );
+ }
+
+ @Test
public void contstructor_acknowledeMode_default() throws CourierException, URISyntaxException
{
- JMSEpr jmsEpr = new JMSEpr( JMSEpr.ONE_ONE_PROTOCOL, expectedDestinationType, expectedDestination ,
+ JMSEpr jmsEpr = new JMSEpr( ONE_ONE_PROTOCOL, expectedDestinationType, expectedDestination ,
expectedConnectionFactory,
- null, expectedSelector, false);
+ nullEnvironment, expectedSelector, NON_PERSISTENT);
assertDefaults( jmsEpr.getDestinationName(), jmsEpr.getConnectionFactory(), jmsEpr.getDestinationType() );
assertEquals( "Default acknowledemode should be AUTO_ACKNOWLEDGE", Session.AUTO_ACKNOWLEDGE, jmsEpr.getAcknowledgeMode() );
@@ -88,9 +108,10 @@
@Test
public void contstructor_acknowledeMode_negative_ackmode_null() throws CourierException, URISyntaxException
{
- JMSEpr jmsEpr = new JMSEpr( JMSEpr.ONE_ONE_PROTOCOL, expectedDestinationType, expectedDestination ,
+ final String acknowledgeModeStr = null;
+ JMSEpr jmsEpr = new JMSEpr( ONE_ONE_PROTOCOL, expectedDestinationType, expectedDestination ,
expectedConnectionFactory,
- null, expectedSelector, false, null);
+ nullEnvironment, expectedSelector, NON_PERSISTENT, acknowledgeModeStr);
assertEquals( Session.AUTO_ACKNOWLEDGE, jmsEpr.getAcknowledgeMode() );
}
@@ -98,25 +119,95 @@
@Test
public void contstructor_acknowledeMode_negative() throws CourierException, URISyntaxException
{
- JMSEpr jmsEpr = new JMSEpr( JMSEpr.ONE_ONE_PROTOCOL, expectedDestinationType, expectedDestination ,
+ JMSEpr jmsEpr = new JMSEpr( ONE_ONE_PROTOCOL, expectedDestinationType, expectedDestination ,
expectedConnectionFactory,
- null, expectedSelector, false, "BogusAckMode");
+ nullEnvironment, expectedSelector, NON_PERSISTENT, "BogusAckMode");
assertEquals( Session.AUTO_ACKNOWLEDGE, jmsEpr.getAcknowledgeMode() );
}
@Test
public void contstructor_acknowledeMode_client_ack() throws CourierException, URISyntaxException
{
- final String clientAck = "CLIENT_ACKNOWLEDGE";
-
- JMSEpr jmsEpr = new JMSEpr( JMSEpr.ONE_ONE_PROTOCOL, expectedDestinationType, expectedDestination ,
+ JMSEpr jmsEpr = new JMSEpr( ONE_ONE_PROTOCOL, expectedDestinationType, expectedDestination ,
expectedConnectionFactory,
- null, expectedSelector, false, clientAck);
+ nullEnvironment, expectedSelector, NON_PERSISTENT, AcknowledgeMode.CLIENT_ACKNOWLEDGE.toString());
assertDefaults( jmsEpr.getDestinationName(), jmsEpr.getConnectionFactory(), jmsEpr.getDestinationType() );
assertEquals( Session.CLIENT_ACKNOWLEDGE, jmsEpr.getAcknowledgeMode() );
}
+ @Test
+ public void contstructor_with_naming_security_properties() throws CourierException, URISyntaxException
+ {
+ final String principal = "name";
+ final String credential = "password";
+
+ final Properties env = new Properties();
+ env.put( Context.SECURITY_PRINCIPAL, principal );
+ env.put( Context.SECURITY_CREDENTIALS, credential );
+
+ JMSEpr jmsEpr = new JMSEpr( ONE_ONE_PROTOCOL, expectedDestinationType, expectedDestination ,
+ expectedConnectionFactory,
+ env, expectedSelector, NON_PERSISTENT, AcknowledgeMode.CLIENT_ACKNOWLEDGE.toString());
+
+ assertEquals( principal, jmsEpr.getJndiEnvironment().getProperty( Context.SECURITY_PRINCIPAL ));
+ assertEquals( credential, jmsEpr.getJndiEnvironment().getProperty( Context.SECURITY_CREDENTIALS ));
+ }
+
+ @Test
+ public void contstructor_with_jms_destination_security_negative() throws CourierException, URISyntaxException
+ {
+ final String username = null;
+ final String password = null;
+
+ JMSEpr jmsEpr = new JMSEpr( ONE_ONE_PROTOCOL, expectedDestinationType, expectedDestination ,
+ expectedConnectionFactory,
+ nullEnvironment, expectedSelector, NON_PERSISTENT, AcknowledgeMode.CLIENT_ACKNOWLEDGE.toString(),
+ username,
+ password);
+
+ assertEquals( null, jmsEpr.getJMSSecurityPrincipal() );
+ assertEquals( null, jmsEpr.getJMSSecurityCredential() );
+ }
+
+ @Test
+ public void contstructor_with_jms_destination_security() throws CourierException, URISyntaxException
+ {
+ final String username = "daniel";
+ final String password = "password";
+
+ JMSEpr jmsEpr = new JMSEpr( ONE_ONE_PROTOCOL, expectedDestinationType, expectedDestination ,
+ expectedConnectionFactory,
+ nullEnvironment, expectedSelector, NON_PERSISTENT, AcknowledgeMode.CLIENT_ACKNOWLEDGE.toString(),
+ username,
+ password);
+
+ assertEquals( username, jmsEpr.getJMSSecurityPrincipal() );
+ assertEquals( password, jmsEpr.getJMSSecurityCredential() );
+ }
+
+ @Test
+ public void acknowledgeEnumTest()
+ {
+ AcknowledgeMode ackMode = AcknowledgeMode.getAckMode( null );
+ assertEquals( AcknowledgeMode.AUTO_ACKNOWLEDGE, ackMode );
+ assertEquals( Session.AUTO_ACKNOWLEDGE, ackMode.getAcknowledgeModeInt() );
+
+ ackMode = AcknowledgeMode.getAckMode( "bajja" );
+ assertEquals( Session.AUTO_ACKNOWLEDGE, ackMode.getAcknowledgeModeInt() );
+
+ ackMode = AcknowledgeMode.getAckMode( "-100" );
+ assertEquals( Session.AUTO_ACKNOWLEDGE, ackMode.getAcknowledgeModeInt() );
+
+ ackMode = AcknowledgeMode.getAckMode( "CLIENT_ACKNOWLEDGE" );
+ assertEquals( AcknowledgeMode.CLIENT_ACKNOWLEDGE, ackMode );
+ assertEquals( Session.CLIENT_ACKNOWLEDGE, ackMode.getAcknowledgeModeInt() );
+
+ ackMode = AcknowledgeMode.getAckMode( "DUPS_OK_ACKNOWLEDGE" );
+ assertEquals( AcknowledgeMode.DUPS_OK_ACKNOWLEDGE, ackMode );
+ assertEquals( Session.DUPS_OK_ACKNOWLEDGE, ackMode.getAcknowledgeModeInt() );
+ }
+
private void assertDefaults(final String destination, final String connectionFactory, final String destinationType)
{
assertEquals( expectedDestination, destination );
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/rosetta/pooling/JmsConnectionPoolingIntegrationTest.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/rosetta/pooling/JmsConnectionPoolingIntegrationTest.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/tests/src/org/jboss/soa/esb/rosetta/pooling/JmsConnectionPoolingIntegrationTest.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -55,7 +55,6 @@
}
@Test
- @Ignore
public void testPoolAndConnectionCreation() throws Exception
{
JmsConnectionPool jmsConnectionPool = null;
@@ -89,28 +88,28 @@
}
@Test
- @Ignore
public void testCreateSecondPool() throws Exception
{
- JmsConnectionPool jmsConnectionPool = JmsConnectionPoolContainer.getPool(environment, "ConnectionFactory", JMSEpr.QUEUE_TYPE);
- jmsConnectionPool = JmsConnectionPoolContainer.getPool(environment, "ConnectionFactory", JMSEpr.QUEUE_TYPE);
+ JmsConnectionPool jmsConnectionPool1 = JmsConnectionPoolContainer.getPool(environment, "ConnectionFactory", JMSEpr.QUEUE_TYPE);
+ jmsConnectionPool1 = JmsConnectionPoolContainer.getPool(environment, "ConnectionFactory", JMSEpr.QUEUE_TYPE);
//This should be the same pool
assertEquals(1, JmsConnectionPoolContainer.getNumberOfPools());
- jmsConnectionPool = JmsConnectionPoolContainer.getPool(environment, "ConnectionFactory", JMSEpr.TOPIC_TYPE);
+ JmsConnectionPool jmsConnectionPool2 = JmsConnectionPoolContainer.getPool(environment, "ConnectionFactory", JMSEpr.TOPIC_TYPE);
//This should be a different pool, so now we should have 2.
assertEquals(2, JmsConnectionPoolContainer.getNumberOfPools());
- jmsConnectionPool = JmsConnectionPoolContainer.getPool(null, "ConnectionFactory", JMSEpr.TOPIC_TYPE);
+ JmsConnectionPool jmsConnectionPool3 = JmsConnectionPoolContainer.getPool(null, "ConnectionFactory", JMSEpr.TOPIC_TYPE);
//This should be a different pool, so now we should have 3.
assertEquals(3, JmsConnectionPoolContainer.getNumberOfPools());
//Now lets cleanup after ourselves
- jmsConnectionPool.removeSessionPool();
+ jmsConnectionPool3.removeSessionPool();
assertEquals(2, JmsConnectionPoolContainer.getNumberOfPools());
- //Let's clean the rest up with a removeAll.
- LifecycleResourceManager.getSingleton().cleanupAllResources() ;
+ jmsConnectionPool1.removeSessionPool();
+ jmsConnectionPool2.removeSessionPool();
+ jmsConnectionPool3.removeSessionPool();
assertEquals(0, JmsConnectionPoolContainer.getNumberOfPools());
}
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration1/processDefinition/gpd.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration1/processDefinition/gpd.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration1/processDefinition/gpd.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
-<root-container name="processDefinition2" width="948" height="681">
- <node name="start" x="81" y="38" width="140" height="40">
- <edge>
+<process-diagram name="processDefinition2" width="744" height="728">
+ <node name="start" x="29" y="19" width="140" height="40">
+ <transition name="">
<label x="5" y="-10"/>
- </edge>
+ </transition>
</node>
- <node name="node1" x="236" y="97" width="140" height="40">
- <edge>
+ <node name="node1" x="132" y="99" width="140" height="40">
+ <transition name="">
<label x="5" y="-10"/>
- </edge>
+ </transition>
</node>
- <node name="node2" x="61" y="162" width="140" height="40">
- <edge>
+ <node name="node2" x="38" y="172" width="140" height="40">
+ <transition name="">
<label x="5" y="-10"/>
- </edge>
+ </transition>
</node>
- <node name="node3" x="259" y="176" width="140" height="40">
- <edge>
+ <node name="node3" x="183" y="247" width="140" height="40">
+ <transition name="">
<label x="5" y="-10"/>
- </edge>
+ </transition>
</node>
- <node name="end1" x="162" y="330" width="140" height="40"/>
- <node name="Send Results" x="57" y="251" width="140" height="40">
- <edge>
+ <node name="end1" x="46" y="415" width="140" height="40"/>
+ <node name="Send Results" x="45" y="322" width="140" height="40">
+ <transition name="">
<label x="5" y="-10"/>
- </edge>
+ </transition>
</node>
-</root-container>
+</process-diagram>
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration1/processDefinition/processdefinition.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration1/processDefinition/processdefinition.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration1/processDefinition/processdefinition.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-
+
<process-definition
- xmlns="" name="processDefinition2">
+ xmlns="urn:jbpm.org:jpdl-3.2" name="processDefinition2">
<start-state name="start">
<event type="node-leave">
<action name="action1" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.process_actions.MyBPMActionHandler" config-type="bean"></action>
@@ -13,7 +13,6 @@
<action name="action2" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
<esbCategoryName>BPM_Orchestration_Service1</esbCategoryName>
<esbServiceName>Service1</esbServiceName>
- <millisToWaitForResponse>5000</millisToWaitForResponse>
<bpmToEsbVars>
<mapping bpm="theBody" esb="BODY_CONTENT" />
</bpmToEsbVars>
@@ -40,8 +39,7 @@
<node name="node3">
<action name="action2" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
<esbCategoryName>BPM_Orchestration_Service3</esbCategoryName>
- <esbServiceName>Service3</esbServiceName>
- <millisToWaitForResponse>5000</millisToWaitForResponse>
+ <esbServiceName>Service3</esbServiceName>
<bpmToEsbVars>
<mapping bpm="theBody" esb="BODY_CONTENT" />
</bpmToEsbVars>
@@ -58,8 +56,7 @@
</event>
<action name="action2" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
<esbCategoryName>BPM_Orchestration_ResultsService</esbCategoryName>
- <esbServiceName>ResultsService</esbServiceName>
- <millisToWaitForResponse>5000</millisToWaitForResponse>
+ <esbServiceName>ResultsService</esbServiceName>
<bpmToEsbVars>
<mapping bpm="theBody" esb="BODY_CONTENT" />
</bpmToEsbVars>
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration1/processDefinition/processimage.jpg
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration2/processDefinition/gpd.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration2/processDefinition/gpd.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration2/processDefinition/gpd.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,66 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
-<root-container name="bpm_orchestration2Process" width="804" height="579">
- <node name="start" x="225" y="10" width="140" height="40">
- <edge>
+<process-diagram name="bpm_orchestration2Process" width="729" height="728">
+ <node name="start" x="0" y="10" width="140" height="40">
+ <transition name="">
<label x="5" y="-10"/>
- </edge>
+ </transition>
</node>
- <node name="Receive Order" x="114" y="81" width="140" height="40">
- <edge>
+ <node name="Receive Order" x="214" y="13" width="140" height="40">
+ <transition>
<label x="5" y="-10"/>
- </edge>
+ </transition>
</node>
- <node name="Validate Order" x="341" y="80" width="140" height="40">
- <edge>
+ <node name="Validate Order" x="247" y="131" width="140" height="40">
+ <transition>
<label x="5" y="-10"/>
- </edge>
+ </transition>
</node>
- <node name="fork1" x="170" y="234" width="325" height="25">
- <edge>
+ <node name="fork1" x="185" y="273" width="200" height="25">
+ <transition name="tr2">
<label x="5" y="-10"/>
- </edge>
- <edge>
+ </transition>
+ <transition name="to Dallas WHSE">
<label x="5" y="-10"/>
- </edge>
- <edge>
+ </transition>
+ <transition name="to Los Angeles WHSE">
<label x="5" y="-10"/>
- </edge>
+ </transition>
</node>
- <node name="Los Angeles WHSE" x="49" y="294" width="140" height="40">
- <edge>
+ <node name="Los Angeles WHSE" x="20" y="340" width="140" height="40">
+ <transition name="">
<label x="5" y="-10"/>
- </edge>
+ </transition>
</node>
- <node name="Dallas WHSE" x="235" y="295" width="140" height="40">
- <edge>
+ <node name="Dallas WHSE" x="221" y="385" width="140" height="40">
+ <transition name="">
<label x="5" y="-10"/>
- </edge>
+ </transition>
</node>
- <node name="Atlanta WHSE" x="426" y="297" width="140" height="40">
- <edge>
+ <node name="Atlanta WHSE" x="425" y="335" width="140" height="40">
+ <transition name="">
<label x="5" y="-10"/>
- </edge>
+ </transition>
</node>
- <node name="join1" x="143" y="379" width="341" height="25">
- <edge>
+ <node name="join1" x="190" y="460" width="200" height="25">
+ <transition>
<label x="5" y="-10"/>
- </edge>
+ </transition>
</node>
- <node name="Shipment Notice" x="246" y="432" width="140" height="40">
- <edge>
+ <node name="Shipment Notice" x="232" y="532" width="140" height="40">
+ <transition name="">
<label x="5" y="-10"/>
- </edge>
+ </transition>
</node>
- <node name="end1" x="246" y="499" width="140" height="40"/>
- <node name="Credit Check" x="116" y="155" width="140" height="40">
- <edge>
+ <node name="end1" x="509" y="530" width="140" height="40"/>
+ <node name="Credit Check" x="165" y="73" width="140" height="40">
+ <transition>
<label x="5" y="-10"/>
- </edge>
+ </transition>
</node>
- <node name="Inventory Check" x="335" y="156" width="140" height="40">
- <edge>
+ <node name="Inventory Check" x="192" y="193" width="140" height="40">
+ <transition>
<label x="5" y="-10"/>
- </edge>
+ </transition>
</node>
-</root-container>
+</process-diagram>
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration2/processDefinition/processimage.jpg
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration2/readme.txt
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration2/readme.txt 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration2/readme.txt 2008-01-14 16:11:24 UTC (rev 17818)
@@ -73,45 +73,45 @@
Sample Output from "ant startProcess":
======================================
-11:18:50,656 INFO [STDOUT] 11111111111 Begin Service 1 11111111111
+11:18:50,656 INFO [STDOUT] ** Begin Receive Order - Service 1 **
11:18:50,765 INFO [STDOUT] In: Getting Started
11:18:50,765 INFO [STDOUT] Out: Getting Started 'Receive Order'
-11:18:50,765 INFO [STDOUT] 111111111111 End Service 1 111111111111
-11:18:51,640 INFO [STDOUT] 33333333333 Begin Service 3 33333333333
+11:18:50,765 INFO [STDOUT] ** End Receive Order - Service 1 **
+11:18:51,640 INFO [STDOUT] ** Begin Credit Check - Service 3 **
11:18:51,640 INFO [STDOUT] In: Getting Started 'Receive Order'
11:18:51,640 INFO [STDOUT] Out: Getting Started 'Receive Order' 'Credit Check'
-11:18:51,640 INFO [STDOUT] 333333333333 End Service 3 333333333333
-11:18:52,312 INFO [STDOUT] 22222222222 Begin Service 2 22222222222
+11:18:51,640 INFO [STDOUT] ** End Credit Check - Service 3 **
+11:18:52,312 INFO [STDOUT] ** Begin Validate Order - Service 2 **
11:18:52,312 INFO [STDOUT] In: Getting Started 'Receive Order' 'Credit Check'
11:18:52,312 INFO [STDOUT] Out: Getting Started 'Receive Order' 'Credit Check'
'Validate Order'
-11:18:52,312 INFO [STDOUT] 222222222222 End Service 2 222222222222
-11:18:52,828 INFO [STDOUT] 44444444444 Begin Service 4 44444444444
+11:18:52,312 INFO [STDOUT] ** End Validate Order - Service 2 **
+11:18:52,828 INFO [STDOUT] ** Begin Inventory Check - Service 4 **
11:18:52,828 INFO [STDOUT] In: Getting Started 'Receive Order' 'Credit Check'
'Validate Order'
11:18:52,828 INFO [STDOUT] Out: Getting Started 'Receive Order' 'Credit Check'
'Validate Order' 'Inventory Check'
-11:18:52,828 INFO [STDOUT] 444444444444 End Service 4 444444444444
-11:18:53,359 INFO [STDOUT] 77777777777 Begin Service 7 77777777777
+11:18:52,828 INFO [STDOUT] ** End Inventory Check - Service 4 **
+11:18:53,359 INFO [STDOUT] ** Begin Atlanta - Service 7 **
11:18:53,359 INFO [STDOUT] In: Getting Started 'Receive Order' 'Credit Check'
'Validate Order' 'Inventory Check'
11:18:53,359 INFO [STDOUT] Out: Getting Started 'Receive Order' 'Credit Check'
'Validate Order' 'Inventory Check' 'Atlanta'
-11:18:53,359 INFO [STDOUT] 777777777777 End Service 7 777777777777
-11:18:53,734 INFO [STDOUT] 66666666666 Begin Service 6 66666666666
+11:18:53,359 INFO [STDOUT] ** End Atlanta - Service 7 **
+11:18:53,734 INFO [STDOUT] ** Begin Dallas - Service 6 **
11:18:53,734 INFO [STDOUT] In: Getting Started 'Receive Order' 'Credit Check'
'Validate Order' 'Inventory Check' 'Atlanta'
11:18:53,734 INFO [STDOUT] Out: Getting Started 'Receive Order' 'Credit Check'
'Validate Order' 'Inventory Check' 'Atlanta' 'Dallas'
-11:18:53,734 INFO [STDOUT] 666666666666 End Service 6 666666666666
-11:18:54,078 INFO [STDOUT] 55555555555 Begin Service 5 55555555555
+11:18:53,734 INFO [STDOUT] ** End Dallas - Service 6 **
+11:18:54,078 INFO [STDOUT] ** Begin Los Angeles - Service 5 **
11:18:54,093 INFO [STDOUT] In: Getting Started 'Receive Order' 'Credit Check'
'Validate Order' 'Inventory Check' 'Atlanta' 'Dallas'
11:18:54,093 INFO [STDOUT] Out: Getting Started 'Receive Order' 'Credit Check'
'Validate Order' 'Inventory Check' 'Atlanta' 'Dallas' 'Los Angeles'
-11:18:54,093 INFO [STDOUT] 555555555555 End Service 5 555555555555
+11:18:54,093 INFO [STDOUT] ** End Los Angeles - Service 5 **
11:18:54,234 INFO [STDOUT] Very simple BPM Process ActionHandler
11:18:54,453 INFO [MessageSpy] Body: Getting Started 'Receive Order' 'Credit C
heck' 'Validate Order' 'Inventory Check' 'Atlanta' 'Dallas' 'Los Angeles'
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration2/scripts/service6.groovy
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration2/scripts/service6.groovy 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration2/scripts/service6.groovy 2008-01-14 16:11:24 UTC (rev 17818)
@@ -8,4 +8,4 @@
println "Out: " + message.getBody().get()
-println "** Begin Dallas - Service 6 **"
\ No newline at end of file
+println "** End Dallas - Service 6 **"
\ No newline at end of file
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration3/processDefinition/gpd.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration3/processDefinition/gpd.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration3/processDefinition/gpd.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
-<root-container name="bpm_orchestration3Process" width="869" height="681">
- <node name="start-state1" x="115" y="32" width="132" height="36">
- <edge>
+<process-diagram name="bpm_orchestration3Process" width="728" height="728">
+ <node name="start-state1" x="178" y="60" width="140" height="40">
+ <transition>
<label x="5" y="-10"/>
- </edge>
+ </transition>
</node>
- <node name="end-state1" x="118" y="319" width="132" height="36"/>
- <node name="Service 1" x="116" y="95" width="132" height="36">
- <edge>
+ <node name="Service 1" x="183" y="160" width="140" height="40">
+ <transition>
<label x="5" y="-10"/>
- </edge>
+ </transition>
</node>
- <node name="Service 2" x="117" y="173" width="132" height="36">
- <edge>
+ <node name="Service 2" x="193" y="257" width="140" height="40">
+ <transition>
<label x="5" y="-10"/>
- </edge>
+ </transition>
</node>
- <node name="Service 3" x="118" y="247" width="132" height="36">
- <edge>
+ <node name="Service 3" x="201" y="345" width="140" height="40">
+ <transition>
<label x="5" y="-10"/>
- </edge>
+ </transition>
</node>
-</root-container>
+ <node name="end-state1" x="205" y="444" width="140" height="40"/>
+</process-diagram>
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration3/processDefinition/processimage.jpg
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/conf/base-build.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/conf/base-build.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -150,10 +150,12 @@
<!-- soap config -->
<fileset dir="${org.jboss.esb.server.server}/deploy/soap.esb" includes="*.jar"/>
<pathelement location="${org.jboss.esb.server.server}/deploy/soap.esb"/>
+ <fileset dir="${org.jboss.esb.server.server}/lib" includes="activation.jar, mail.jar, jboss-ejb3x.jar"/>
<!-- general libs -->
<pathelement location="${org.jboss.esb.server.home}/lib/commons-logging.jar"/>
<pathelement location="${org.jboss.esb.server.home}/lib/commons-codec.jar"/>
<pathelement location="${org.jboss.esb.server.home}/lib/jboss-system.jar"/>
+ <pathelement location="${org.jboss.esb.server.home}/lib/jboss-xml-binding.jar"/>
</path>
</target>
@@ -479,19 +481,21 @@
<fail unless="quickstart.ftp.config" message="Please configure ftp properties in quickstart.properties"/>
</target>
- <target name="assert-jbossremoting-2.2.2.SP1-plus">
+ <target name="assert-jbossremoting-version">
<java fork="yes" classname="org.jboss.remoting.Version" failonerror="true" outputproperty="jbr-version-string">
<classpath refid="exec-classpath"/>
</java>
<echo message="JBR Version String: '${jbr-version-string}'."/>
<condition property="is-valid-jbr-version">
- <or>
- <contains string="${jbr-version-string}" substring="2.2.2.SP1" />
- <contains string="${jbr-version-string}" substring="2.2.2.SP2" />
- </or>
+ <and>
+ <contains string="${jbr-version-string}" substring="2.2.2.SP" />
+ <not>
+ <contains string="${jbr-version-string}" substring="2.2.2.SP1 " />
+ </not>
+ </and>
</condition>
- <fail unless="is-valid-jbr-version" message="Invalid version of JBossRemoting installed on target server. Please install version 2.2.2.SP2: http://repository.jboss.org/jboss/remoting/2.2.2.SP2/lib/jboss-remoting.jar" />
+ <fail unless="is-valid-jbr-version" message="Invalid version of JBossRemoting installed on target server. Please install version 2.2.2.SP2 or higher: http://repository.jboss.org/jboss/remoting/" />
</target>
<!-- ==================================================================== -->
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/custom_action/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/custom_action/jboss-esb.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/custom_action/jboss-esb.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -69,6 +69,7 @@
<property name="information" value="Hola Mundo" />
<property name="repeatCount" value="5"/>
</action>
+ <action name="testStore" class="org.jboss.soa.esb.actions.TestMessageStore"/>
</actions>
</service>
</services>
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingAsyncAction.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingAsyncAction.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingAsyncAction.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -21,6 +21,7 @@
package org.jboss.soa.esb.samples.quickstart.deadletter;
import java.net.URI;
+import java.util.Date;
import java.util.Map;
import org.apache.log4j.Logger;
@@ -31,6 +32,7 @@
import org.jboss.soa.esb.client.ServiceInvoker;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.listeners.message.MessageDeliverException;
+import org.jboss.soa.esb.message.Body;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.services.persistence.MessageStore;
import org.jboss.soa.esb.services.persistence.MessageStoreException;
@@ -44,6 +46,9 @@
protected ConfigTree _config;
private Logger logger = Logger.getLogger(this.getClass());
+ private static final String ID = "ASYNC-ID" ;
+ private static final String DATE = "ASYNC-DATE" ;
+
public MyFailingAsyncAction(ConfigTree config) {
_config = config;
}
@@ -63,6 +68,8 @@
MessageStore ms = MessageStoreFactory.getInstance().getMessageStore();
Message rdlvrMessage = null;
+ message.getBody().add(ID, "ID:" + Integer.toHexString(System.identityHashCode(message))) ;
+ message.getBody().add(DATE, new Date()) ;
try {
//empty out the DLQ
Map<URI, Message> messageMap = ms.getAllMessages(MessageStore.CLASSIFICATION_RDLVR);
@@ -87,7 +94,7 @@
for (URI key : rdlvrMessageMap.keySet()) {
rdlvrMessage = rdlvrMessageMap.get(key);
logger.info("*******************************");
- logger.info("Message in the RDLVR should be the same message: " + message.getBody().toString().equals(rdlvrMessage.getBody().toString()));
+ logger.info("Message in the RDLVR should be the same message: " + compare(message.getBody(), rdlvrMessage.getBody()));
logger.info("Message=" + message.getBody());
logger.info("rdlvrMessage=" + rdlvrMessage.getBody());
logger.info("*******************************");
@@ -102,5 +109,18 @@
return rdlvrMessage;
}
+
+ private static boolean compare(final Body lhs, final Body rhs)
+ {
+ return compare(ID, lhs, rhs) && compare(DATE, lhs, rhs) ;
+ }
+
+ private static boolean compare(final String name, final Body lhs, final Body rhs)
+ {
+ final Object lhsObject = lhs.get(name) ;
+ final Object rhsObject = rhs.get(name) ;
+
+ return ((lhsObject != null) && lhsObject.equals(rhsObject)) ;
+ }
}
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingSyncAction.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingSyncAction.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingSyncAction.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -21,6 +21,7 @@
package org.jboss.soa.esb.samples.quickstart.deadletter;
import java.net.URI;
+import java.util.Date;
import java.util.Map;
import org.apache.log4j.Logger;
@@ -32,6 +33,7 @@
import org.jboss.soa.esb.couriers.FaultMessageException;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.listeners.message.MessageDeliverException;
+import org.jboss.soa.esb.message.Body;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.services.persistence.MessageStore;
import org.jboss.soa.esb.services.persistence.MessageStoreException;
@@ -45,6 +47,9 @@
protected ConfigTree _config;
private Logger logger = Logger.getLogger(this.getClass());
+
+ private static final String ID = "SYNC-ID" ;
+ private static final String DATE = "SYNC-DATE" ;
public MyFailingSyncAction(ConfigTree config) {
_config = config;
@@ -64,6 +69,8 @@
//MessageStore under the DLQ categorization.
MessageStore ms = MessageStoreFactory.getInstance().getMessageStore();
Message dlqMessage = null;
+ message.getBody().add(ID, "ID:" + Integer.toHexString(System.identityHashCode(message))) ;
+ message.getBody().add(DATE, new Date()) ;
try {
//empty out the DLQ
Map<URI, Message> messageMap = ms.getAllMessages(MessageStore.CLASSIFICATION_DLQ);
@@ -92,7 +99,7 @@
for (URI key : messageMap.keySet()) {
dlqMessage = messageMap.get(key);
logger.info("*******************************");
- logger.info("Message in the DLQ queue should be the same message: " + message.getBody().toString().equals(dlqMessage.getBody().toString()));
+ logger.info("Message in the DLQ queue should be the same message: " + compare(message.getBody(), dlqMessage.getBody()));
logger.info("Message=" + message.getBody());
logger.info("dlqMessage=" + dlqMessage.getBody());
logger.info("*******************************");
@@ -108,5 +115,17 @@
return dlqMessage;
}
-
+
+ private static boolean compare(final Body lhs, final Body rhs)
+ {
+ return compare(ID, lhs, rhs) && compare(DATE, lhs, rhs) ;
+ }
+
+ private static boolean compare(final String name, final Body lhs, final Body rhs)
+ {
+ final Object lhsObject = lhs.get(name) ;
+ final Object rhsObject = rhs.get(name) ;
+
+ return ((lhsObject != null) && lhsObject.equals(rhsObject)) ;
+ }
}
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_sql_action/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_sql_action/jboss-esb.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_sql_action/jboss-esb.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -13,8 +13,9 @@
status-column="STATUS_COL"
order-by="DATA_COLUMN"
where-condition="DATA_COLUMN like 'data%'"
-
+ message-column="message"
message-id-column="UNIQUE_ID"
+ insert-timestamp-column="TIMESTAMP_COL"
/>
</sql-bus>
</sql-provider>
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_sql_action/src/hsqldb/create.sql
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_sql_action/src/hsqldb/create.sql 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_sql_action/src/hsqldb/create.sql 2008-01-14 16:11:24 UTC (rev 17818)
@@ -2,5 +2,6 @@
(
unique_id INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY,
data_column VARCHAR(255) NOT NULL,
-status_col VARCHAR(255) NOT NULL
+status_col VARCHAR(255) NOT NULL,
+timestamp_col VARCHAR(255)
);
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/build.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/build.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/build.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,145 +0,0 @@
-<project name="Quickstart_helloworld_TX_SQL_action" default="run" basedir=".">
-
- <description>
- ${ant.project.name}
- ${line.separator}
- </description>
-
- <property name="additional.deploys" value="jbossesb-service.xml" />
-
- <!-- Import the base Ant build script... -->
- <import file="../conf/base-build.xml"/>
-
- <target name="quickstart-specific-assemblies" description="Quickstart specific assemblies">
- </target>
-
- <target name="quickstart-specific-deploys" description="Quickstart specific deploys">
- <copy file="quickstart-ds.xml"
- todir="${org.jboss.esb.server.deploy.dir}"
- overwrite="false"/>
- </target>
-
- <target name="runtest" depends="dependencies" description="Insert row data into sql table polled by gateway">
- <property name="hsqldb.jar"
- value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/hsqldb.jar"/>
- <echo>Insert row data into sql table polled by gateway</echo>
- <sql
- driver="org.hsqldb.jdbcDriver"
- url="jdbc:hsqldb:hsql://localhost:1703"
- userid="sa"
- autocommit="true"
- password="">
- <classpath>
- <pathelement path="${hsqldb.jar}"/>
- </classpath>
- <transaction src="populate.sql"/>
- </sql>
- </target>
-
- <target name="create" depends="dependencies" description="create table tx_esb_messages">
- <property name="hsqldb.jar"
- value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/hsqldb.jar"/>
- <echo>create table tx_esb_messages</echo>
- <sql
- print="true"
- driver="org.hsqldb.jdbcDriver"
- url="jdbc:hsqldb:hsql://localhost:1703"
- userid="sa"
- autocommit="true"
- password="">
- <classpath>
- <pathelement path="${hsqldb.jar}"/>
- </classpath>
- <transaction>
- create table tx_esb_messages(MESSAGE_ID varchar, STATUS_COL varchar NOT NULL, TIMESTAMP_COL bigint, DATA_COL varchar NOT NULL);
- </transaction>
- </sql>
-
- </target>
-
- <target name="drop" depends="dependencies" description="drop table tx_esb_messages">
- <property name="hsqldb.jar"
- value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/hsqldb.jar"/>
- <echo>drop table tx_esb_messages</echo>
- <sql
- print="true"
- driver="org.hsqldb.jdbcDriver"
- url="jdbc:hsqldb:hsql://localhost:1703"
- userid="sa"
- autocommit="true"
- password="">
- <classpath>
- <pathelement path="${hsqldb.jar}"/>
- </classpath>
- <transaction>
- drop table tx_esb_messages
- </transaction>
- </sql>
-
- </target>
-
- <target name="drop2" depends="dependencies" description="drop table gateway_table">
- <property name="hsqldb.jar"
- value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/hsqldb.jar"/>
- <echo>drop table gateway_table</echo>
- <sql
- print="true"
- driver="org.hsqldb.jdbcDriver"
- url="jdbc:hsqldb:hsql://localhost:1703"
- userid="sa"
- autocommit="true"
- password="">
- <classpath>
- <pathelement path="${hsqldb.jar}"/>
- </classpath>
- <transaction>
- drop table gateway_table
- </transaction>
- </sql>
-
- </target>
-
- <target name="select" depends="dependencies" description="select * from gateway_table">
- <property name="hsqldb.jar"
- value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/hsqldb.jar"/>
- <echo>Select * from gateway_table</echo>
- <sql
- print="true"
- driver="org.hsqldb.jdbcDriver"
- url="jdbc:hsqldb:hsql://localhost:1703"
- userid="sa"
- autocommit="true"
- password="">
- <classpath>
- <pathelement path="${hsqldb.jar}"/>
- </classpath>
- <transaction>
- select * from tx_esb_messages
- </transaction>
- </sql>
- <sql
- print="true"
- driver="org.hsqldb.jdbcDriver"
- url="jdbc:hsqldb:hsql://localhost:1703"
- userid="sa"
- autocommit="true"
- password="">
- <classpath>
- <pathelement path="${hsqldb.jar}"/>
- </classpath>
- <transaction>
- select * from gateway_table
- </transaction>
- </sql>
-
- </target>
-
- <target name="deploy-jms-dests">
- <echo message="This quickstart doesn't use any JMS Destinations. No JMS deployments required." />
- </target>
-
- <target name="undeploy-jms-dests">
- <echo message="This quickstart doesn't use any JMS Destinations. No JMS undeployments required." />
- </target>
-
-</project>
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/build.xml (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/build.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/build.xml (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/build.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,145 @@
+<project name="Quickstart_helloworld_TX_SQL_action" default="run" basedir=".">
+
+ <description>
+ ${ant.project.name}
+ ${line.separator}
+ </description>
+
+ <property name="additional.deploys" value="jbossesb-service.xml" />
+
+ <!-- Import the base Ant build script... -->
+ <import file="../conf/base-build.xml"/>
+
+ <target name="quickstart-specific-assemblies" description="Quickstart specific assemblies">
+ </target>
+
+ <target name="quickstart-specific-deploys" description="Quickstart specific deploys">
+ <copy file="quickstart-ds.xml"
+ todir="${org.jboss.esb.server.deploy.dir}"
+ overwrite="false"/>
+ </target>
+
+ <target name="runtest" depends="dependencies" description="Insert row data into sql table polled by gateway">
+ <property name="hsqldb.jar"
+ value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/hsqldb.jar"/>
+ <echo>Insert row data into sql table polled by gateway</echo>
+ <sql
+ driver="org.hsqldb.jdbcDriver"
+ url="jdbc:hsqldb:hsql://localhost:1703"
+ userid="sa"
+ autocommit="true"
+ password="">
+ <classpath>
+ <pathelement path="${hsqldb.jar}"/>
+ </classpath>
+ <transaction src="populate.sql"/>
+ </sql>
+ </target>
+
+ <target name="create" depends="dependencies" description="create table tx_esb_messages">
+ <property name="hsqldb.jar"
+ value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/hsqldb.jar"/>
+ <echo>create table tx_esb_messages</echo>
+ <sql
+ print="true"
+ driver="org.hsqldb.jdbcDriver"
+ url="jdbc:hsqldb:hsql://localhost:1703"
+ userid="sa"
+ autocommit="true"
+ password="">
+ <classpath>
+ <pathelement path="${hsqldb.jar}"/>
+ </classpath>
+ <transaction>
+ create table tx_esb_messages(MESSAGE_ID varchar, STATUS_COL varchar NOT NULL, TIMESTAMP_COL bigint, DATA_COL varchar NOT NULL);
+ </transaction>
+ </sql>
+
+ </target>
+
+ <target name="drop" depends="dependencies" description="drop table tx_esb_messages">
+ <property name="hsqldb.jar"
+ value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/hsqldb.jar"/>
+ <echo>drop table tx_esb_messages</echo>
+ <sql
+ print="true"
+ driver="org.hsqldb.jdbcDriver"
+ url="jdbc:hsqldb:hsql://localhost:1703"
+ userid="sa"
+ autocommit="true"
+ password="">
+ <classpath>
+ <pathelement path="${hsqldb.jar}"/>
+ </classpath>
+ <transaction>
+ drop table tx_esb_messages
+ </transaction>
+ </sql>
+
+ </target>
+
+ <target name="drop2" depends="dependencies" description="drop table gateway_table">
+ <property name="hsqldb.jar"
+ value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/hsqldb.jar"/>
+ <echo>drop table gateway_table</echo>
+ <sql
+ print="true"
+ driver="org.hsqldb.jdbcDriver"
+ url="jdbc:hsqldb:hsql://localhost:1703"
+ userid="sa"
+ autocommit="true"
+ password="">
+ <classpath>
+ <pathelement path="${hsqldb.jar}"/>
+ </classpath>
+ <transaction>
+ drop table gateway_table
+ </transaction>
+ </sql>
+
+ </target>
+
+ <target name="select" depends="dependencies" description="select * from gateway_table">
+ <property name="hsqldb.jar"
+ value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/hsqldb.jar"/>
+ <echo>Select * from gateway_table</echo>
+ <sql
+ print="true"
+ driver="org.hsqldb.jdbcDriver"
+ url="jdbc:hsqldb:hsql://localhost:1703"
+ userid="sa"
+ autocommit="true"
+ password="">
+ <classpath>
+ <pathelement path="${hsqldb.jar}"/>
+ </classpath>
+ <transaction>
+ select * from tx_esb_messages
+ </transaction>
+ </sql>
+ <sql
+ print="true"
+ driver="org.hsqldb.jdbcDriver"
+ url="jdbc:hsqldb:hsql://localhost:1703"
+ userid="sa"
+ autocommit="true"
+ password="">
+ <classpath>
+ <pathelement path="${hsqldb.jar}"/>
+ </classpath>
+ <transaction>
+ select * from gateway_table
+ </transaction>
+ </sql>
+
+ </target>
+
+ <target name="deploy-jms-dests">
+ <echo message="This quickstart doesn't use any JMS Destinations. No JMS deployments required." />
+ </target>
+
+ <target name="undeploy-jms-dests">
+ <echo message="This quickstart doesn't use any JMS Destinations. No JMS undeployments required." />
+ </target>
+
+</project>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jboss-esb.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/jboss-esb.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jboss-esb.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,66 +0,0 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
-
- <providers>
- <sql-provider name="GatewaySQLprovider"
- url="jdbc:hsqldb:hsql://localhost:1703"
- driver="org.hsqldb.jdbcDriver"
- username="sa"
- password="">
- <sql-bus busid="helloSQLChannel" >
- <sql-message-filter
- tablename="GATEWAY_TABLE"
- status-column="STATUS_COL"
- order-by="DATA_COLUMN"
- where-condition="DATA_COLUMN like 'data%'"
-
- message-id-column="UNIQUE_ID"
- />
- </sql-bus>
- </sql-provider>
-
- <sql-provider name="SQLprovider"
- url="jdbc:hsqldb:hsql://localhost:1703"
- datasource="java:/QuickstartDB">
- <sql-bus busid="TxHelloSQLChannel" >
- <sql-message-filter
- tablename="TX_ESB_MESSAGES"
- message-id-column="MESSAGE_ID"
- status-column="STATUS_COL"
- insert-timestamp-column="TIMESTAMP_COL"
- message-column="DATA_COL"
- />
- </sql-bus>
- </sql-provider>
-
- </providers>
-
- <services>
- <service
- category="myCategory"
- name="myTxListener"
- description="Hello World TX SQL Action (esb jdbc listener)">
- <listeners>
- <sql-listener name="SqlGateway"
- busidref="helloSQLChannel"
- maxThreads="1"
- is-gateway="true"/>
- <sql-listener name="TxSqlListener"
- busidref="TxHelloSQLChannel"
- maxThreads="1">
- <property name="transacted" value="true"/>
- </sql-listener>
- </listeners>
- <actions mep="OneWay">
- <action name="action1"
- class="org.jboss.soa.esb.samples.quickstart.helloworldtxsqlaction.MyAction"
- process="displayMessage"
- />
- <action name="action2" class="org.jboss.soa.esb.actions.SystemPrintln" />
- </actions>
-
- </service>
- </services>
-
-</jbossesb>
-
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jboss-esb.xml (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/jboss-esb.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jboss-esb.xml (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jboss-esb.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,66 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
+
+ <providers>
+ <sql-provider name="GatewaySQLprovider"
+ url="jdbc:hsqldb:hsql://localhost:1703"
+ driver="org.hsqldb.jdbcDriver"
+ username="sa"
+ password="">
+ <sql-bus busid="helloSQLChannel" >
+ <sql-message-filter
+ tablename="GATEWAY_TABLE"
+ status-column="STATUS_COL"
+ order-by="DATA_COLUMN"
+ where-condition="DATA_COLUMN like 'data%'"
+
+ message-id-column="UNIQUE_ID"
+ />
+ </sql-bus>
+ </sql-provider>
+
+ <sql-provider name="SQLprovider"
+ url="jdbc:hsqldb:hsql://localhost:1703"
+ datasource="java:/QuickstartDB">
+ <sql-bus busid="TxHelloSQLChannel" >
+ <sql-message-filter
+ tablename="TX_ESB_MESSAGES"
+ message-id-column="MESSAGE_ID"
+ status-column="STATUS_COL"
+ insert-timestamp-column="TIMESTAMP_COL"
+ message-column="DATA_COL"
+ />
+ </sql-bus>
+ </sql-provider>
+
+ </providers>
+
+ <services>
+ <service
+ category="myCategory"
+ name="myTxListener"
+ description="Hello World TX SQL Action (esb jdbc listener)">
+ <listeners>
+ <sql-listener name="SqlGateway"
+ busidref="helloSQLChannel"
+ maxThreads="1"
+ is-gateway="true"/>
+ <sql-listener name="TxSqlListener"
+ busidref="TxHelloSQLChannel"
+ maxThreads="1">
+ <property name="transacted" value="true"/>
+ </sql-listener>
+ </listeners>
+ <actions mep="OneWay">
+ <action name="action1"
+ class="org.jboss.soa.esb.samples.quickstart.helloworldtxsqlaction.MyAction"
+ process="displayMessage"
+ />
+ <action name="action2" class="org.jboss.soa.esb.actions.SystemPrintln" />
+ </actions>
+
+ </service>
+ </services>
+
+</jbossesb>
+
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-properties.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-properties.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- JBoss, Home of Professional Open Source
- Copyright 2006, JBoss Inc., and others contributors as indicated
- by the @authors tag. All rights reserved.
- See the copyright.txt in the distribution for a
- full listing of individual contributors.
- This copyrighted material is made available to anyone wishing to use,
- modify, copy, or redistribute it subject to the terms and conditions
- of the GNU Lesser General Public License, v. 2.1.
- This program is distributed in the hope that it will be useful, but WITHOUT A
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- You should have received a copy of the GNU Lesser General Public License,
- v.2.1 along with this distribution; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301, USA.
-
- (C) 2005-2006,
- @author JBoss Inc.
--->
-<!-- $Id: jbossesb-unittest-properties.xml $ -->
-<!--
- These options are described in the JBossESB manual.
- Defaults are provided here for convenience only.
-
- Please read through this file prior to using the system, and consider
- updating the specified entries.
--->
-<esb
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd">
- <properties name="core">
- <property name="org.jboss.soa.esb.jndi.server.type" value="jboss"/>
- <property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
- <property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
- </properties>
- <properties name="registry">
- <property name="org.jboss.soa.esb.registry.queryManagerURI"
- value="jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire"/>
- <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI"
- value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#publish" />
- <property name="org.jboss.soa.esb.registry.implementationClass"
- value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
- <property name="org.jboss.soa.esb.registry.factoryClass"
- value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
- <property name="org.jboss.soa.esb.registry.user"
- value="jbossesb"/>
- <property name="org.jboss.soa.esb.registry.password"
- value="password"/>
- <!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
- <property name="org.jboss.soa.esb.scout.proxy.transportClass"
- value="org.apache.ws.scout.transport.RMITransport"/>
- </properties>
- <properties name="transports" depends="core">
- <property name="org.jboss.soa.esb.mail.smtp.host" value="localhost"/>
- <property name="org.jboss.soa.esb.mail.smtp.user" value="jbossesb"/>
- <property name="org.jboss.soa.esb.mail.smtp.password" value=""/>
- <property name="org.jboss.soa.esb.mail.smtp.port" value="25"/>
- </properties>
- <properties name="connection">
- <property name="min-pool-size" value="5"/>
- <property name="max-pool=size" value="10"/>
- <property name="blocking-timeout-millis" value="5000"/>
- <property name="abandoned-connection-timeout" value="10000"/>
- <property name="abandoned-connection-time-interval" value="30000"/>
- </properties>
- <properties name="dbstore">
- <property name="org.jboss.soa.esb.persistence.db.connection.url" value="jdbc:hsqldb:hsql://localhost:9001/"/>
- <property name="org.jboss.soa.esb.persistence.db.jdbc.driver" value="org.hsqldb.jdbcDriver"/>
- <property name="org.jboss.soa.esb.persistence.db.user" value="sa"/>
- <property name="org.jboss.soa.esb.persistence.db.pwd" value=""/>
- <property name="org.jboss.soa.esb.persistence.db.pool.initial.size" value="2"/>
- <property name="org.jboss.soa.esb.persistence.db.pool.min.size" value="2"/>
- <property name="org.jboss.soa.esb.persistence.db.pool.max.size" value="5"/>
- <!--table managed by pool to test for valid connections - created by pool automatically -->
- <property name="org.jboss.soa.esb.persistence.db.pool.test.table" value="pooltest"/>
- <!-- # of milliseconds to timeout waiting for a connection from pool -->
- <property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis" value="5000"/>
- <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/>
- </properties>
- <properties name="messagerouting">
- <property name="org.jboss.soa.esb.routing.cbrClass" value="org.jboss.internal.soa.esb.services.routing.cbr.JBossRulesRouter"/>
- </properties>
-</esb>
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-properties.xml (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-properties.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-properties.xml (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-properties.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ JBoss, Home of Professional Open Source
+ Copyright 2006, JBoss Inc., and others contributors as indicated
+ by the @authors tag. All rights reserved.
+ See the copyright.txt in the distribution for a
+ full listing of individual contributors.
+ This copyrighted material is made available to anyone wishing to use,
+ modify, copy, or redistribute it subject to the terms and conditions
+ of the GNU Lesser General Public License, v. 2.1.
+ This program is distributed in the hope that it will be useful, but WITHOUT A
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ You should have received a copy of the GNU Lesser General Public License,
+ v.2.1 along with this distribution; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+ (C) 2005-2006,
+ @author JBoss Inc.
+-->
+<!-- $Id: jbossesb-unittest-properties.xml $ -->
+<!--
+ These options are described in the JBossESB manual.
+ Defaults are provided here for convenience only.
+
+ Please read through this file prior to using the system, and consider
+ updating the specified entries.
+-->
+<esb
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd">
+ <properties name="core">
+ <property name="org.jboss.soa.esb.jndi.server.type" value="jboss"/>
+ <property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
+ <property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
+ </properties>
+ <properties name="registry">
+ <property name="org.jboss.soa.esb.registry.queryManagerURI"
+ value="jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire"/>
+ <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI"
+ value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#publish" />
+ <property name="org.jboss.soa.esb.registry.implementationClass"
+ value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
+ <property name="org.jboss.soa.esb.registry.factoryClass"
+ value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
+ <property name="org.jboss.soa.esb.registry.user"
+ value="jbossesb"/>
+ <property name="org.jboss.soa.esb.registry.password"
+ value="password"/>
+ <!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
+ <property name="org.jboss.soa.esb.scout.proxy.transportClass"
+ value="org.apache.ws.scout.transport.RMITransport"/>
+ </properties>
+ <properties name="transports" depends="core">
+ <property name="org.jboss.soa.esb.mail.smtp.host" value="localhost"/>
+ <property name="org.jboss.soa.esb.mail.smtp.user" value="jbossesb"/>
+ <property name="org.jboss.soa.esb.mail.smtp.password" value=""/>
+ <property name="org.jboss.soa.esb.mail.smtp.port" value="25"/>
+ </properties>
+ <properties name="connection">
+ <property name="min-pool-size" value="5"/>
+ <property name="max-pool=size" value="10"/>
+ <property name="blocking-timeout-millis" value="5000"/>
+ <property name="abandoned-connection-timeout" value="10000"/>
+ <property name="abandoned-connection-time-interval" value="30000"/>
+ </properties>
+ <properties name="dbstore">
+ <property name="org.jboss.soa.esb.persistence.db.connection.url" value="jdbc:hsqldb:hsql://localhost:9001/"/>
+ <property name="org.jboss.soa.esb.persistence.db.jdbc.driver" value="org.hsqldb.jdbcDriver"/>
+ <property name="org.jboss.soa.esb.persistence.db.user" value="sa"/>
+ <property name="org.jboss.soa.esb.persistence.db.pwd" value=""/>
+ <property name="org.jboss.soa.esb.persistence.db.pool.initial.size" value="2"/>
+ <property name="org.jboss.soa.esb.persistence.db.pool.min.size" value="2"/>
+ <property name="org.jboss.soa.esb.persistence.db.pool.max.size" value="5"/>
+ <!--table managed by pool to test for valid connections - created by pool automatically -->
+ <property name="org.jboss.soa.esb.persistence.db.pool.test.table" value="pooltest"/>
+ <!-- # of milliseconds to timeout waiting for a connection from pool -->
+ <property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis" value="5000"/>
+ <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/>
+ </properties>
+ <properties name="messagerouting">
+ <property name="org.jboss.soa.esb.routing.cbrClass" value="org.jboss.internal.soa.esb.services.routing.cbr.JBossRulesRouter"/>
+ </properties>
+</esb>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-service.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-service.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-service.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
- <mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
- name="jboss.esb:service=QuickstartDatabaseInitializer">
- <attribute name="Datasource">java:/QuickstartDB</attribute>
- <attribute name="ExistsSql">select * from gateway_table</attribute>
- <attribute name="SqlFiles">
- hsqldb/create.sql
- </attribute>
- <depends>jboss.jca:name=QuickstartDB,service=DataSourceBinding</depends>
- </mbean>
-</server>
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-service.xml (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-service.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-service.xml (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-service.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+ <mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
+ name="jboss.esb:service=QuickstartDatabaseInitializer">
+ <attribute name="Datasource">java:/QuickstartDB</attribute>
+ <attribute name="ExistsSql">select * from gateway_table</attribute>
+ <attribute name="SqlFiles">
+ hsqldb/create.sql
+ </attribute>
+ <depends>jboss.jca:name=QuickstartDB,service=DataSourceBinding</depends>
+ </mbean>
+</server>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jndi.properties
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/jndi.properties 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jndi.properties 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,5 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-java.naming.factory.url.pkgs=org.jnp.interfaces
-
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jndi.properties (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/jndi.properties)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jndi.properties (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/jndi.properties 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,5 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming
+java.naming.factory.url.pkgs=org.jnp.interfaces
+
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/juddi.properties
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/juddi.properties 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/juddi.properties 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,69 +0,0 @@
-# jUDDI Registry Properties (used by RegistryServer)
-# see http://www.juddi.org for more information
-
-# The UDDI Operator Name
-juddi.operatorName = jUDDI.org
-
-# The i18n locale default codes
-juddi.i18n.languageCode = en
-juddi.i18n.countryCode = US
-
-# The UDDI DiscoveryURL Prefix
-juddi.discoveryURL = http://localhost:8080/juddi/uddiget.jsp?
-
-# The UDDI Operator Contact Email Address
-juddi.operatorEmailAddress = admin at juddi.org
-
-# The maximum name size and maximum number
-# of name elements allows in several of the
-# FindXxxx and SaveXxxx UDDI functions.
-juddi.maxNameLength=255
-juddi.maxNameElementsAllowed=5
-
-# The maximum number of UDDI artifacts allowed
-# per publisher. A value of '-1' indicates any
-# number of artifacts is valid (These values can be
-# overridden at the individual publisher level).
-juddi.maxBusinessesPerPublisher=25
-juddi.maxServicesPerBusiness=20
-juddi.maxBindingsPerService=10
-juddi.maxTModelsPerPublisher=100
-
-# jUDDI Authentication module to use
-juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
-
-# jUDDI DataStore module currently to use
-juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore
-
-# use a dataSource (if set to false a direct
-# jdbc connection will be used.
-juddi.isUseDataSource=false
-juddi.jdbcDriver=com.mysql.jdbc.Driver
-juddi.jdbcUrl=jdbc:mysql://localhost:3306/juddi
-juddi.jdbcUsername=root
-juddi.jdbcPassword=admin
-# jUDDI DataSource to use
-# juddi.dataSource=java:comp/env/jdbc/MySqlDS
-
-# jUDDI UUIDGen implementation to use
-juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
-
-# jUDDI Cryptor implementation to use
-juddi.cryptor = org.apache.juddi.cryptor.DefaultCryptor
-
-# jUDDI Validator to use
-juddi.validator=org.apache.juddi.validator.DefaultValidator
-
-# jUDDI Proxy Properties (used by RegistryProxy)
-juddi.proxy.adminURL = http://localhost:8080/juddi/admin
-juddi.proxy.inquiryURL = http://localhost:8080/juddi/inquiry
-juddi.proxy.publishURL = http://localhost:8080/juddi/publish
-juddi.proxy.transportClass = org.apache.juddi.proxy.AxisTransport
-juddi.proxy.securityProvider = com.sun.net.ssl.internal.ssl.Provider
-juddi.proxy.protocolHandler = com.sun.net.ssl.internal.www.protocol
-
-# JNDI settings (used by RMITransport)
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/juddi.properties (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/juddi.properties)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/juddi.properties (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/juddi.properties 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,69 @@
+# jUDDI Registry Properties (used by RegistryServer)
+# see http://www.juddi.org for more information
+
+# The UDDI Operator Name
+juddi.operatorName = jUDDI.org
+
+# The i18n locale default codes
+juddi.i18n.languageCode = en
+juddi.i18n.countryCode = US
+
+# The UDDI DiscoveryURL Prefix
+juddi.discoveryURL = http://localhost:8080/juddi/uddiget.jsp?
+
+# The UDDI Operator Contact Email Address
+juddi.operatorEmailAddress = admin at juddi.org
+
+# The maximum name size and maximum number
+# of name elements allows in several of the
+# FindXxxx and SaveXxxx UDDI functions.
+juddi.maxNameLength=255
+juddi.maxNameElementsAllowed=5
+
+# The maximum number of UDDI artifacts allowed
+# per publisher. A value of '-1' indicates any
+# number of artifacts is valid (These values can be
+# overridden at the individual publisher level).
+juddi.maxBusinessesPerPublisher=25
+juddi.maxServicesPerBusiness=20
+juddi.maxBindingsPerService=10
+juddi.maxTModelsPerPublisher=100
+
+# jUDDI Authentication module to use
+juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
+
+# jUDDI DataStore module currently to use
+juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore
+
+# use a dataSource (if set to false a direct
+# jdbc connection will be used.
+juddi.isUseDataSource=false
+juddi.jdbcDriver=com.mysql.jdbc.Driver
+juddi.jdbcUrl=jdbc:mysql://localhost:3306/juddi
+juddi.jdbcUsername=root
+juddi.jdbcPassword=admin
+# jUDDI DataSource to use
+# juddi.dataSource=java:comp/env/jdbc/MySqlDS
+
+# jUDDI UUIDGen implementation to use
+juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
+
+# jUDDI Cryptor implementation to use
+juddi.cryptor = org.apache.juddi.cryptor.DefaultCryptor
+
+# jUDDI Validator to use
+juddi.validator=org.apache.juddi.validator.DefaultValidator
+
+# jUDDI Proxy Properties (used by RegistryProxy)
+juddi.proxy.adminURL = http://localhost:8080/juddi/admin
+juddi.proxy.inquiryURL = http://localhost:8080/juddi/inquiry
+juddi.proxy.publishURL = http://localhost:8080/juddi/publish
+juddi.proxy.transportClass = org.apache.juddi.proxy.AxisTransport
+juddi.proxy.securityProvider = com.sun.net.ssl.internal.ssl.Provider
+juddi.proxy.protocolHandler = com.sun.net.ssl.internal.www.protocol
+
+# JNDI settings (used by RMITransport)
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming
+
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/lib (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/lib)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/log4j.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/log4j.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/log4j.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id: log4j.xml,v 1.26.2.5 2005/09/15 09:31:02 dimitris Exp $ -->
-
-<!--
- | For more configuration infromation and examples see the Jakarta Log4j
- | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="Target" value="System.out"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%t][%c{1}] %m%n"/>
- </layout>
- </appender>
-
- <!-- ================================= -->
- <!-- Preserve messages in a local file -->
- <!-- ================================= -->
-
- <!-- A size based file rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="./listener.log"/>
- <param name="Append" value="false"/>
- <param name="MaxFileSize" value="500KB"/>
- <param name="MaxBackupIndex" value="1"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%t][%c] %m%n"/>
- </layout>
- </appender>
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <category name="org.jboss">
- <priority value="WARN"/>
- </category>
- <category name="org.jboss.soa.esb">
- <priority value="ERROR"/>
- </category>
- <category name="org.jboss.internal.soa.esb">
- <priority value="ERROR"/>
- </category>
- <category name="org.apache">
- <priority value="ERROR"/>
- </category>
- <category name="quickstart">
- <priority value="INFO"/>
- </category>
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
- </root>
-
-</log4j:configuration>
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/log4j.xml (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/log4j.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/log4j.xml (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/log4j.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml,v 1.26.2.5 2005/09/15 09:31:02 dimitris Exp $ -->
+
+<!--
+ | For more configuration infromation and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Target" value="System.out"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%t][%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A size based file rolling appender -->
+ <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="./listener.log"/>
+ <param name="Append" value="false"/>
+ <param name="MaxFileSize" value="500KB"/>
+ <param name="MaxBackupIndex" value="1"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%t][%c] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <category name="org.jboss">
+ <priority value="WARN"/>
+ </category>
+ <category name="org.jboss.soa.esb">
+ <priority value="ERROR"/>
+ </category>
+ <category name="org.jboss.internal.soa.esb">
+ <priority value="ERROR"/>
+ </category>
+ <category name="org.apache">
+ <priority value="ERROR"/>
+ </category>
+ <category name="quickstart">
+ <priority value="INFO"/>
+ </category>
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/populate.sql
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/populate.sql 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/populate.sql 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,6 +0,0 @@
-insert into gateway_table(data_column, status_col) values('data 111111','P');
-insert into gateway_table(data_column, status_col) values('data 22','P');
-insert into gateway_table(data_column, status_col) values('data 333333333333111111','P');
-insert into gateway_table(data_column, status_col) values('data d d d d','P');
-insert into gateway_table(data_column, status_col) values('do not consume', 'P');
-insert into gateway_table(data_column, status_col) values('data last record','P');
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/populate.sql (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/populate.sql)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/populate.sql (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/populate.sql 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,6 @@
+insert into gateway_table(data_column, status_col) values('data 111111','P');
+insert into gateway_table(data_column, status_col) values('data 22','P');
+insert into gateway_table(data_column, status_col) values('data 333333333333111111','P');
+insert into gateway_table(data_column, status_col) values('data d d d d','P');
+insert into gateway_table(data_column, status_col) values('do not consume', 'P');
+insert into gateway_table(data_column, status_col) values('data last record','P');
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/quickstart-ds.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/quickstart-ds.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/quickstart-ds.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources>
- <local-tx-datasource>
- <jndi-name>QuickstartDB</jndi-name>
- <connection-url>jdbc:hsqldb:hsql://${jboss.bind.address}:1703</connection-url>
- <driver-class>org.hsqldb.jdbcDriver</driver-class>
- <user-name>sa</user-name>
- <password></password>
- <min-pool-size>5</min-pool-size>
- <max-pool-size>20</max-pool-size>
- <idle-timeout-minutes>0</idle-timeout-minutes>
- <depends>jboss:service=Hypersonic</depends>
- <prepared-statement-cache-size>32</prepared-statement-cache-size>
- </local-tx-datasource>
-
- <!-- For hsqldb accessed from jboss only, in-process (standalone) mode -->
- <mbean code="org.jboss.jdbc.HypersonicDatabase"
- name="jboss:service=Hypersonic">
- <attribute name="Port">1703</attribute>
- <attribute name="BindAddress">${jboss.bind.address}</attribute>
- <attribute name="Database">QuickstartDB</attribute>
- <attribute name="Silent">true</attribute>
- <attribute name="Trace">false</attribute>
- <attribute name="No_system_exit">true</attribute>
- </mbean>
-</datasources>
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/quickstart-ds.xml (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/quickstart-ds.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/quickstart-ds.xml (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/quickstart-ds.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>QuickstartDB</jndi-name>
+ <connection-url>jdbc:hsqldb:hsql://${jboss.bind.address}:1703</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ <user-name>sa</user-name>
+ <password></password>
+ <min-pool-size>5</min-pool-size>
+ <max-pool-size>20</max-pool-size>
+ <idle-timeout-minutes>0</idle-timeout-minutes>
+ <depends>jboss:service=Hypersonic</depends>
+ <prepared-statement-cache-size>32</prepared-statement-cache-size>
+ </local-tx-datasource>
+
+ <!-- For hsqldb accessed from jboss only, in-process (standalone) mode -->
+ <mbean code="org.jboss.jdbc.HypersonicDatabase"
+ name="jboss:service=Hypersonic">
+ <attribute name="Port">1703</attribute>
+ <attribute name="BindAddress">${jboss.bind.address}</attribute>
+ <attribute name="Database">QuickstartDB</attribute>
+ <attribute name="Silent">true</attribute>
+ <attribute name="Trace">false</attribute>
+ <attribute name="No_system_exit">true</attribute>
+ </mbean>
+</datasources>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/readme.txt
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/readme.txt 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/readme.txt 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,33 +0,0 @@
-Overview:
-=========
- This quickstart demonstrates an SQL listener.
-
-Running this quickstart:
-========================
- Please refer to 'ant help-quickstarts' for prerequisites about the quickstarts
- and a more detailed descripton of the different ways to run the quickstarts.
-
- NOTE:
- 1. This quickstart uses hsqldb so that it can be deployed without any
- setup required.
- 2. "ant select" will show you the contents of the database table. The
- <sql-message-filter> defined has a where-condition, so one of the rows
- that the table is populated with will never be processed. There
- should be one remaining row for each time the table is populated.
- 3. run 'ant create' after deploying.
-
-To Run standalone mode:
-=======================
- 1. In a command terminal window in this folder ("Window1"), type 'ant run'.
- 2. Open another command terminal window in this folder ("Window2"), type
- 'ant runtest'.
- 3. Switch back to "Window1" to see the output from the ESB
- 4. When finished, interrupt the ESB using Ctrl-C.
-
-To Run '.esb' archive mode:
-===========================
- 1. In a command terminal window in this folder ("Window1"), type 'ant deploy'.
- 2. Open another command terminal window in this folder ("Window2"), type
- 'ant runtest'.
- 3. Switch back to Application Server console to see the output from the ESB
- 4. In this folder ("Window1"), type 'ant undeploy'.
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/readme.txt (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/readme.txt)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/readme.txt (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/readme.txt 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,33 @@
+Overview:
+=========
+ This quickstart demonstrates an SQL listener.
+
+Running this quickstart:
+========================
+ Please refer to 'ant help-quickstarts' for prerequisites about the quickstarts
+ and a more detailed descripton of the different ways to run the quickstarts.
+
+ NOTE:
+ 1. This quickstart uses hsqldb so that it can be deployed without any
+ setup required.
+ 2. "ant select" will show you the contents of the database table. The
+ <sql-message-filter> defined has a where-condition, so one of the rows
+ that the table is populated with will never be processed. There
+ should be one remaining row for each time the table is populated.
+ 3. run 'ant create' after deploying.
+
+To Run standalone mode:
+=======================
+ 1. In a command terminal window in this folder ("Window1"), type 'ant run'.
+ 2. Open another command terminal window in this folder ("Window2"), type
+ 'ant runtest'.
+ 3. Switch back to "Window1" to see the output from the ESB
+ 4. When finished, interrupt the ESB using Ctrl-C.
+
+To Run '.esb' archive mode:
+===========================
+ 1. In a command terminal window in this folder ("Window1"), type 'ant deploy'.
+ 2. Open another command terminal window in this folder ("Window2"), type
+ 'ant runtest'.
+ 3. Switch back to Application Server console to see the output from the ESB
+ 4. In this folder ("Window1"), type 'ant undeploy'.
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/src)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/hsqldb (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/src/hsqldb)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/hsqldb/create.sql
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/src/hsqldb/create.sql 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/hsqldb/create.sql 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,6 +0,0 @@
-create table gateway_table
-(
-unique_id INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY,
-data_column VARCHAR(255) NOT NULL,
-status_col VARCHAR(255) NOT NULL
-);
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/hsqldb/create.sql (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/src/hsqldb/create.sql)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/hsqldb/create.sql (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/hsqldb/create.sql 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,6 @@
+create table gateway_table
+(
+unique_id INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY,
+data_column VARCHAR(255) NOT NULL,
+status_col VARCHAR(255) NOT NULL
+);
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/src/org)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/quickstart (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/quickstart)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/quickstart/helloworldsqlaction (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/quickstart/helloworldsqlaction)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/quickstart/helloworldtxsqlaction (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/quickstart/helloworldtxsqlaction)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/quickstart/helloworldtxsqlaction/MyAction.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/quickstart/helloworldtxsqlaction/MyAction.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/quickstart/helloworldtxsqlaction/MyAction.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,89 +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.helloworldtxsqlaction;
-
-import java.util.Map;
-
-import org.jboss.soa.esb.actions.AbstractActionLifecycle;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.listeners.ListenerTagNames;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.body.content.BytesBody;
-
-public class MyAction extends AbstractActionLifecycle
-{
- private static int checkIter = 0;
-
- protected ConfigTree _config;
-
- public MyAction(ConfigTree config) { _config = config; }
-
- public Message noOperation(Message message) { return message; }
-
- @SuppressWarnings("unchecked")
- public Message displayMessage(Message message) throws Exception{
- boolean problem = false;
-
- logHeader();
- Map<String,Object> rowData =(Map)message.getBody().get();
- StringBuffer results = new StringBuffer();
- for (Map.Entry<String,Object> curr : rowData.entrySet()) {
- results.append("column "+curr.getKey()+" = <" + curr.getValue()+">");
-
- if (curr.getValue().equals("data 22"))
- {
- System.out.println("DATA READ: "+curr.getValue());
-
- if (checkIter++ < 2)
- problem = true;
- }
- }
- System.out.println(results.toString());
- logFooter();
-
- // Set message properties and message body so that SystemPrintln will display message
- message.getProperties().setProperty("jbesbfilename", "helloworldTxSQlAction.log");
- message.getBody().add(results.toString());
-
- if (problem)
- System.out.println("Will rollback transaction. Expect to see record again!");
- else
- System.out.println("Will commit transaction. Will not see record again!");
-
- if (!problem)
- return message;
- else
- {
- System.out.println("BAD READ ON DATA!");
-
- throw new RuntimeException();
- }
- }
-
- // This makes it easier to read on the console
- private void logHeader() {
- System.out.println("\n&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
- }
- private void logFooter() {
- System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&\n");
- }
-
-}
\ No newline at end of file
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/quickstart/helloworldtxsqlaction/MyAction.java (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/quickstart/helloworldtxsqlaction/MyAction.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/quickstart/helloworldtxsqlaction/MyAction.java (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_tx_sql_action/src/org/jboss/soa/esb/samples/quickstart/helloworldtxsqlaction/MyAction.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,89 @@
+/*
+ * 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.helloworldtxsqlaction;
+
+import java.util.Map;
+
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.listeners.ListenerTagNames;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.body.content.BytesBody;
+
+public class MyAction extends AbstractActionLifecycle
+{
+ private static int checkIter = 0;
+
+ protected ConfigTree _config;
+
+ public MyAction(ConfigTree config) { _config = config; }
+
+ public Message noOperation(Message message) { return message; }
+
+ @SuppressWarnings("unchecked")
+ public Message displayMessage(Message message) throws Exception{
+ boolean problem = false;
+
+ logHeader();
+ Map<String,Object> rowData =(Map)message.getBody().get();
+ StringBuffer results = new StringBuffer();
+ for (Map.Entry<String,Object> curr : rowData.entrySet()) {
+ results.append("column "+curr.getKey()+" = <" + curr.getValue()+">");
+
+ if (curr.getValue().equals("data 22"))
+ {
+ System.out.println("DATA READ: "+curr.getValue());
+
+ if (checkIter++ < 2)
+ problem = true;
+ }
+ }
+ System.out.println(results.toString());
+ logFooter();
+
+ // Set message properties and message body so that SystemPrintln will display message
+ message.getProperties().setProperty("jbesbfilename", "helloworldTxSQlAction.log");
+ message.getBody().add(results.toString());
+
+ if (problem)
+ System.out.println("Will rollback transaction. Expect to see record again!");
+ else
+ System.out.println("Will commit transaction. Will not see record again!");
+
+ if (!problem)
+ return message;
+ else
+ {
+ System.out.println("BAD READ ON DATA!");
+
+ throw new RuntimeException();
+ }
+ }
+
+ // This makes it easier to read on the console
+ private void logHeader() {
+ System.out.println("\n&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
+ }
+ private void logFooter() {
+ System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&\n");
+ }
+
+}
\ No newline at end of file
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/build.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/build.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/build.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,44 +0,0 @@
-<project name="Quickstart_JMS_Secured" default="run" basedir=".">
-
- <description>
- ${ant.project.name}
- ${line.separator}
- </description>
-
- <!-- Import the base Ant build script... -->
- <import file="../conf/base-build.xml"/>
-
- <target name="quickstart-specific-deploys" depends="messaging-config">
- <antcall target="jbm-deploys"/>
- <antcall target="jbmq-deploys"/>
- </target>
-
- <target name="jbm-deploys" if="messaging.present">
- <echo message="Copy message-roles.properties and message-user-properties to conf/props dir" />
- <echo message="This will require a server restart unless running the jbossesb-server!"/>
- <property name="org.jboss.esb.server.server.props" location="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/conf/props"/>
- <copy todir="${org.jboss.esb.server.server.props}">
- <fileset dir="${basedir}" includes="messaging-roles.properties" />
- <fileset dir="${basedir}" includes="messaging-users.properties" />
- </copy>
- </target>
-
- <target name="jbmq-deploys" if="jbossmq.present">
- <property name="org.jboss.esb.server.jbmq.dir" location="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jms"/>
- <copy todir="${org.jboss.esb.server.jbmq.dir}" overwrite="true">
- <fileset dir="${basedir}" includes="hsqldb-jdbc-state-service.xml" />
- </copy>
- </target>
-
-
-
- <target name="runtest" depends="compile"
- description="sends a JMS message to queue/quickstart_jms_secured_Request_gw">
- <echo>Runs Test JMS Sender</echo>
- <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.jmssecured.test.SendJMSMessage" failonerror="true">
- <arg value="Hello Secured JMS World"/>
- <classpath refid="exec-classpath"/>
- </java>
- </target>
-
-</project>
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/build.xml (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/build.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/build.xml (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/build.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,44 @@
+<project name="Quickstart_JMS_Secured" default="run" basedir=".">
+
+ <description>
+ ${ant.project.name}
+ ${line.separator}
+ </description>
+
+ <!-- Import the base Ant build script... -->
+ <import file="../conf/base-build.xml"/>
+
+ <target name="quickstart-specific-deploys" depends="messaging-config">
+ <antcall target="jbm-deploys"/>
+ <antcall target="jbmq-deploys"/>
+ </target>
+
+ <target name="jbm-deploys" if="messaging.present">
+ <echo message="Copy message-roles.properties and message-user-properties to conf/props dir" />
+ <echo message="This will require a server restart unless running the jbossesb-server!"/>
+ <property name="org.jboss.esb.server.server.props" location="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/conf/props"/>
+ <copy todir="${org.jboss.esb.server.server.props}">
+ <fileset dir="${basedir}" includes="messaging-roles.properties" />
+ <fileset dir="${basedir}" includes="messaging-users.properties" />
+ </copy>
+ </target>
+
+ <target name="jbmq-deploys" if="jbossmq.present">
+ <property name="org.jboss.esb.server.jbmq.dir" location="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jms"/>
+ <copy todir="${org.jboss.esb.server.jbmq.dir}" overwrite="true">
+ <fileset dir="${basedir}" includes="hsqldb-jdbc-state-service.xml" />
+ </copy>
+ </target>
+
+
+
+ <target name="runtest" depends="compile"
+ description="sends a JMS message to queue/quickstart_jms_secured_Request_gw">
+ <echo>Runs Test JMS Sender</echo>
+ <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.jmssecured.test.SendJMSMessage" failonerror="true">
+ <arg value="Hello Secured JMS World"/>
+ <classpath refid="exec-classpath"/>
+ </java>
+ </target>
+
+</project>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/deployment.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/deployment.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/deployment.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,4 +0,0 @@
-<jbossesb-deployment>
- <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_jms_secured_Request_esb</depends>
- <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_jms_secured_Request_gw</depends>
-</jbossesb-deployment>
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/deployment.xml (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/deployment.xml (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/deployment.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,4 @@
+<jbossesb-deployment>
+ <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_jms_secured_Request_esb</depends>
+ <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_jms_secured_Request_gw</depends>
+</jbossesb-deployment>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/hsqldb-jdbc-state-service.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/hsqldb-jdbc-state-service.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/hsqldb-jdbc-state-service.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id: hsqldb-jdbc-state-service.xml 61572 2007-03-22 14:32:18Z adrian at jboss.org $ -->
-
-<server>
-
- <!-- ==================================================================== -->
- <!-- JBossMQ State Management using HSQLDB -->
- <!-- See docs/examples/jms for other configurations -->
- <!-- ==================================================================== -->
-
- <!-- A Statemanager that stores state in the database -->
- <mbean code="org.jboss.mq.sm.jdbc.JDBCStateManager"
- name="jboss.mq:service=StateManager">
- <depends optional-attribute-name="ConnectionManager">jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
- <attribute name="SqlProperties">
- CREATE_TABLES_ON_STARTUP = TRUE
- CREATE_USER_TABLE = CREATE TABLE JMS_USERS (USERID VARCHAR(32) NOT NULL, PASSWD VARCHAR(32) NOT NULL, \
- CLIENTID VARCHAR(128) NULL, PRIMARY KEY(USERID))
- CREATE_ROLE_TABLE = CREATE TABLE JMS_ROLES (ROLEID VARCHAR(32) NOT NULL, USERID VARCHAR(32) NOT NULL, \
- PRIMARY KEY(USERID, ROLEID))
- CREATE_SUBSCRIPTION_TABLE = CREATE TABLE JMS_SUBSCRIPTIONS (CLIENTID VARCHAR(128) NOT NULL, \
- SUBNAME VARCHAR(128) NOT NULL, TOPIC VARCHAR(255) NOT NULL, \
- SELECTOR VARCHAR(255) NULL, PRIMARY KEY(CLIENTID, SUBNAME))
- GET_SUBSCRIPTION = SELECT TOPIC, SELECTOR FROM JMS_SUBSCRIPTIONS WHERE CLIENTID=? AND SUBNAME=?
- LOCK_SUBSCRIPTION = SELECT TOPIC, SELECTOR FROM JMS_SUBSCRIPTIONS WHERE CLIENTID=? AND SUBNAME=?
- GET_SUBSCRIPTIONS_FOR_TOPIC = SELECT CLIENTID, SUBNAME, SELECTOR FROM JMS_SUBSCRIPTIONS WHERE TOPIC=?
- INSERT_SUBSCRIPTION = INSERT INTO JMS_SUBSCRIPTIONS (CLIENTID, SUBNAME, TOPIC, SELECTOR) VALUES(?,?,?,?)
- UPDATE_SUBSCRIPTION = UPDATE JMS_SUBSCRIPTIONS SET TOPIC=?, SELECTOR=? WHERE CLIENTID=? AND SUBNAME=?
- REMOVE_SUBSCRIPTION = DELETE FROM JMS_SUBSCRIPTIONS WHERE CLIENTID=? AND SUBNAME=?
- GET_USER_BY_CLIENTID = SELECT USERID, PASSWD, CLIENTID FROM JMS_USERS WHERE CLIENTID=?
- GET_USER = SELECT PASSWD, CLIENTID FROM JMS_USERS WHERE USERID=?
- POPULATE.TABLES.01 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('guest', 'guest')
- POPULATE.TABLES.02 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('j2ee', 'j2ee')
- POPULATE.TABLES.03 = INSERT INTO JMS_USERS (USERID, PASSWD, CLIENTID) VALUES ('john', 'needle', 'DurableSubscriberExample')
- POPULATE.TABLES.04 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('nobody', 'nobody')
- POPULATE.TABLES.05 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('dynsub', 'dynsub')
- POPULATE.TABLES.06 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('guest','guest')
- POPULATE.TABLES.07 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('j2ee','guest')
- POPULATE.TABLES.08 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('john','guest')
- POPULATE.TABLES.09 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('subscriber','john')
- POPULATE.TABLES.10 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('publisher','john')
- POPULATE.TABLES.11 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('publisher','dynsub')
- POPULATE.TABLES.12 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('durpublisher','john')
- POPULATE.TABLES.13 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('durpublisher','dynsub')
- POPULATE.TABLES.14 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('noacc','nobody')
- POPULATE.TABLES.15 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('gatewayuser', 'gwpassword')
- POPULATE.TABLES.16 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('gatewayrole','gatewayuser')
- POPULATE.TABLES.17 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('esbuser', 'esbpassword')
- POPULATE.TABLES.18 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('esbrole','esbuser')
- POPULATE.TABLES.19 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('esbuser2', 'esbpassword')
- </attribute>
- </mbean>
-
-</server>
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/hsqldb-jdbc-state-service.xml (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/hsqldb-jdbc-state-service.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/hsqldb-jdbc-state-service.xml (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/hsqldb-jdbc-state-service.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: hsqldb-jdbc-state-service.xml 61572 2007-03-22 14:32:18Z adrian at jboss.org $ -->
+
+<server>
+
+ <!-- ==================================================================== -->
+ <!-- JBossMQ State Management using HSQLDB -->
+ <!-- See docs/examples/jms for other configurations -->
+ <!-- ==================================================================== -->
+
+ <!-- A Statemanager that stores state in the database -->
+ <mbean code="org.jboss.mq.sm.jdbc.JDBCStateManager"
+ name="jboss.mq:service=StateManager">
+ <depends optional-attribute-name="ConnectionManager">jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+ <attribute name="SqlProperties">
+ CREATE_TABLES_ON_STARTUP = TRUE
+ CREATE_USER_TABLE = CREATE TABLE JMS_USERS (USERID VARCHAR(32) NOT NULL, PASSWD VARCHAR(32) NOT NULL, \
+ CLIENTID VARCHAR(128) NULL, PRIMARY KEY(USERID))
+ CREATE_ROLE_TABLE = CREATE TABLE JMS_ROLES (ROLEID VARCHAR(32) NOT NULL, USERID VARCHAR(32) NOT NULL, \
+ PRIMARY KEY(USERID, ROLEID))
+ CREATE_SUBSCRIPTION_TABLE = CREATE TABLE JMS_SUBSCRIPTIONS (CLIENTID VARCHAR(128) NOT NULL, \
+ SUBNAME VARCHAR(128) NOT NULL, TOPIC VARCHAR(255) NOT NULL, \
+ SELECTOR VARCHAR(255) NULL, PRIMARY KEY(CLIENTID, SUBNAME))
+ GET_SUBSCRIPTION = SELECT TOPIC, SELECTOR FROM JMS_SUBSCRIPTIONS WHERE CLIENTID=? AND SUBNAME=?
+ LOCK_SUBSCRIPTION = SELECT TOPIC, SELECTOR FROM JMS_SUBSCRIPTIONS WHERE CLIENTID=? AND SUBNAME=?
+ GET_SUBSCRIPTIONS_FOR_TOPIC = SELECT CLIENTID, SUBNAME, SELECTOR FROM JMS_SUBSCRIPTIONS WHERE TOPIC=?
+ INSERT_SUBSCRIPTION = INSERT INTO JMS_SUBSCRIPTIONS (CLIENTID, SUBNAME, TOPIC, SELECTOR) VALUES(?,?,?,?)
+ UPDATE_SUBSCRIPTION = UPDATE JMS_SUBSCRIPTIONS SET TOPIC=?, SELECTOR=? WHERE CLIENTID=? AND SUBNAME=?
+ REMOVE_SUBSCRIPTION = DELETE FROM JMS_SUBSCRIPTIONS WHERE CLIENTID=? AND SUBNAME=?
+ GET_USER_BY_CLIENTID = SELECT USERID, PASSWD, CLIENTID FROM JMS_USERS WHERE CLIENTID=?
+ GET_USER = SELECT PASSWD, CLIENTID FROM JMS_USERS WHERE USERID=?
+ POPULATE.TABLES.01 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('guest', 'guest')
+ POPULATE.TABLES.02 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('j2ee', 'j2ee')
+ POPULATE.TABLES.03 = INSERT INTO JMS_USERS (USERID, PASSWD, CLIENTID) VALUES ('john', 'needle', 'DurableSubscriberExample')
+ POPULATE.TABLES.04 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('nobody', 'nobody')
+ POPULATE.TABLES.05 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('dynsub', 'dynsub')
+ POPULATE.TABLES.06 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('guest','guest')
+ POPULATE.TABLES.07 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('j2ee','guest')
+ POPULATE.TABLES.08 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('john','guest')
+ POPULATE.TABLES.09 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('subscriber','john')
+ POPULATE.TABLES.10 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('publisher','john')
+ POPULATE.TABLES.11 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('publisher','dynsub')
+ POPULATE.TABLES.12 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('durpublisher','john')
+ POPULATE.TABLES.13 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('durpublisher','dynsub')
+ POPULATE.TABLES.14 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('noacc','nobody')
+ POPULATE.TABLES.15 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('gatewayuser', 'gwpassword')
+ POPULATE.TABLES.16 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('gatewayrole','gatewayuser')
+ POPULATE.TABLES.17 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('esbuser', 'esbpassword')
+ POPULATE.TABLES.18 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('esbrole','esbuser')
+ POPULATE.TABLES.19 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('esbuser2', 'esbpassword')
+ </attribute>
+ </mbean>
+
+</server>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/jbm-queue-service.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jbm-queue-service.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_jms_secured_Request_gw"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <attribute name="SecurityConfig">
- <security>
- <!-- gatewayrole role can post messages but not read -->
- <role name="gatewayrole" write="true"/>
-
- <!-- esb role can consume and post messages (redeliver) -->
- <role name="esbrole" read="true" write="true"/>
- </security>
- </attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_jms_secured_Request_esb"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <attribute name="SecurityConfig">
- <security>
- <!-- esb role can consume and post messages (redeliver) -->
- <role name="esbrole" read="true" write="true"/>
- </security>
- </attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
-</server>
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jbm-queue-service.xml (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/jbm-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jbm-queue-service.xml (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jbm-queue-service.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_jms_secured_Request_gw"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <attribute name="SecurityConfig">
+ <security>
+ <!-- gatewayrole role can post messages but not read -->
+ <role name="gatewayrole" write="true"/>
+
+ <!-- esb role can consume and post messages (redeliver) -->
+ <role name="esbrole" read="true" write="true"/>
+ </security>
+ </attribute>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_jms_secured_Request_esb"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <attribute name="SecurityConfig">
+ <security>
+ <!-- esb role can consume and post messages (redeliver) -->
+ <role name="esbrole" read="true" write="true"/>
+ </security>
+ </attribute>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+</server>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/jbmq-queue-service.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jbmq-queue-service.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_jms_secured_Request_gw">
- <attribute name="SecurityConf">
- <security>
- <!-- gatewayrole role can post messages but not read -->
- <role name="gatewayrole" write="true"/>
-
- <!-- esb role can consume and post messages (redeliver) -->
- <role name="esbrole" read="true" write="true"/>
- </security>
- </attribute>
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
- </mbean>
-
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_jms_secured_Request_esb">
- <attribute name="SecurityConf">
- <security>
-
- <!-- esb role can consume and post messages (redeliver) -->
- <role name="esbrole" read="true" write="true"/>
- </security>
- </attribute>
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
- </mbean>
-</server>
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jbmq-queue-service.xml (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jbmq-queue-service.xml (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jbmq-queue-service.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,30 @@
+<?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_jms_secured_Request_gw">
+ <attribute name="SecurityConf">
+ <security>
+ <!-- gatewayrole role can post messages but not read -->
+ <role name="gatewayrole" write="true"/>
+
+ <!-- esb role can consume and post messages (redeliver) -->
+ <role name="esbrole" read="true" write="true"/>
+ </security>
+ </attribute>
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
+ </mbean>
+
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_jms_secured_Request_esb">
+ <attribute name="SecurityConf">
+ <security>
+
+ <!-- esb role can consume and post messages (redeliver) -->
+ <role name="esbrole" read="true" write="true"/>
+ </security>
+ </attribute>
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
+ </mbean>
+</server>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jboss-esb.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/jboss-esb.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jboss-esb.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,55 +0,0 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
-
- <providers>
- <jms-provider name="JBossMessaging" connection-factory="ConnectionFactory"
- jndi-URL="jnp://127.0.0.1:1099" jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
- jndi-pkg-prefix="org.jboss.naming:org.jnp.interfaces">
-
- <jms-bus busid="quickstartGwChannel">
- <jms-message-filter
- dest-type="QUEUE"
- dest-name="queue/quickstart_jms_secured_Request_gw"
- jms-security-principal="esbuser" jms-security-credential="esbpassword"
- />
- </jms-bus>
- <jms-bus busid="quickstartEsbChannel">
- <jms-message-filter
- dest-type="QUEUE"
- dest-name="queue/quickstart_jms_secured_Request_esb"
- jms-security-principal="esbuser" jms-security-credential="esbpassword"
- />
- </jms-bus>
-
- </jms-provider>
- </providers>
-
- <services>
- <service
- category="JMSSecuredESB"
- name="SimpleListener"
- description="JMS Secured quickstart sample">
- <listeners>
- <jms-listener name="JMS-Gateway"
- busidref="quickstartGwChannel"
- maxThreads="1"
- is-gateway="true"
- />
- <jms-listener name="jmssecured"
- busidref="quickstartEsbChannel"
- maxThreads="1"/>
- </listeners>
- <actions mep="OneWay">
-
- <action name="printMessage" class="org.jboss.soa.esb.actions.SystemPrintln">
- <property name="message" value="JMS Secured Quickstart message"/>
- <property name="printfull" value="false"/>
- </action>
-
- <!-- The next action is for Continuous Integration testing -->
- <action name="testStore" class="org.jboss.soa.esb.actions.TestMessageStore"/>
- </actions>
- </service>
- </services>
-
-</jbossesb>
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jboss-esb.xml (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/jboss-esb.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jboss-esb.xml (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jboss-esb.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,55 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
+
+ <providers>
+ <jms-provider name="JBossMessaging" connection-factory="ConnectionFactory"
+ jndi-URL="jnp://127.0.0.1:1099" jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
+ jndi-pkg-prefix="org.jboss.naming:org.jnp.interfaces">
+
+ <jms-bus busid="quickstartGwChannel">
+ <jms-message-filter
+ dest-type="QUEUE"
+ dest-name="queue/quickstart_jms_secured_Request_gw"
+ jms-security-principal="esbuser" jms-security-credential="esbpassword"
+ />
+ </jms-bus>
+ <jms-bus busid="quickstartEsbChannel">
+ <jms-message-filter
+ dest-type="QUEUE"
+ dest-name="queue/quickstart_jms_secured_Request_esb"
+ jms-security-principal="esbuser" jms-security-credential="esbpassword"
+ />
+ </jms-bus>
+
+ </jms-provider>
+ </providers>
+
+ <services>
+ <service
+ category="JMSSecuredESB"
+ name="SimpleListener"
+ description="JMS Secured quickstart sample">
+ <listeners>
+ <jms-listener name="JMS-Gateway"
+ busidref="quickstartGwChannel"
+ maxThreads="1"
+ is-gateway="true"
+ />
+ <jms-listener name="jmssecured"
+ busidref="quickstartEsbChannel"
+ maxThreads="1"/>
+ </listeners>
+ <actions mep="OneWay">
+
+ <action name="printMessage" class="org.jboss.soa.esb.actions.SystemPrintln">
+ <property name="message" value="JMS Secured Quickstart message"/>
+ <property name="printfull" value="false"/>
+ </action>
+
+ <!-- The next action is for Continuous Integration testing -->
+ <action name="testStore" class="org.jboss.soa.esb.actions.TestMessageStore"/>
+ </actions>
+ </service>
+ </services>
+
+</jbossesb>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/jbossesb-properties.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jbossesb-properties.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- JBoss, Home of Professional Open Source
- Copyright 2006, JBoss Inc., and others contributors as indicated
- by the @authors tag. All rights reserved.
- See the copyright.txt in the distribution for a
- full listing of individual contributors.
- This copyrighted material is made available to anyone wishing to use,
- modify, copy, or redistribute it subject to the terms and conditions
- of the GNU Lesser General Public License, v. 2.1.
- This program is distributed in the hope that it will be useful, but WITHOUT A
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- You should have received a copy of the GNU Lesser General Public License,
- v.2.1 along with this distribution; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301, USA.
-
- (C) 2005-2006,
- @author JBoss Inc.
--->
-<!-- $Id: jbossesb-unittest-properties.xml $ -->
-<!--
- These options are described in the JBossESB manual.
- Defaults are provided here for convenience only.
-
- Please read through this file prior to using the system, and consider
- updating the specified entries.
--->
-<esb
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd">
- <properties name="core">
- <property name="org.jboss.soa.esb.jndi.server.type" value="jboss"/>
- <property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
- <property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
- </properties>
- <properties name="registry">
- <property name="org.jboss.soa.esb.registry.queryManagerURI"
- value="jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire"/>
- <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI"
- value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#publish" />
- <property name="org.jboss.soa.esb.registry.implementationClass"
- value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
- <property name="org.jboss.soa.esb.registry.factoryClass"
- value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
- <property name="org.jboss.soa.esb.registry.user"
- value="jbossesb"/>
- <property name="org.jboss.soa.esb.registry.password"
- value="password"/>
- <!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
- <property name="org.jboss.soa.esb.scout.proxy.transportClass"
- value="org.apache.ws.scout.transport.RMITransport"/>
- </properties>
- <properties name="transports" depends="core">
- <property name="org.jboss.soa.esb.mail.smtp.host" value="localhost"/>
- <property name="org.jboss.soa.esb.mail.smtp.user" value="jbossesb"/>
- <property name="org.jboss.soa.esb.mail.smtp.password" value=""/>
- <property name="org.jboss.soa.esb.mail.smtp.port" value="25"/>
- </properties>
- <properties name="connection">
- <property name="min-pool-size" value="5"/>
- <property name="max-pool=size" value="10"/>
- <property name="blocking-timeout-millis" value="5000"/>
- <property name="abandoned-connection-timeout" value="10000"/>
- <property name="abandoned-connection-time-interval" value="30000"/>
- </properties>
- <properties name="dbstore">
- <property name="org.jboss.soa.esb.persistence.db.connection.url" value="jdbc:hsqldb:hsql://localhost:9001/"/>
- <property name="org.jboss.soa.esb.persistence.db.jdbc.driver" value="org.hsqldb.jdbcDriver"/>
- <property name="org.jboss.soa.esb.persistence.db.user" value="sa"/>
- <property name="org.jboss.soa.esb.persistence.db.pwd" value=""/>
- <property name="org.jboss.soa.esb.persistence.db.pool.initial.size" value="2"/>
- <property name="org.jboss.soa.esb.persistence.db.pool.min.size" value="2"/>
- <property name="org.jboss.soa.esb.persistence.db.pool.max.size" value="5"/>
- <!--table managed by pool to test for valid connections - created by pool automatically -->
- <property name="org.jboss.soa.esb.persistence.db.pool.test.table" value="pooltest"/>
- <!-- # of milliseconds to timeout waiting for a connection from pool -->
- <property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis" value="5000"/>
- <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/>
- </properties>
- <properties name="messagerouting">
- <property name="org.jboss.soa.esb.routing.cbrClass" value="org.jboss.internal.soa.esb.services.routing.cbr.JBossRulesRouter"/>
- </properties>
-</esb>
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jbossesb-properties.xml (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/jbossesb-properties.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jbossesb-properties.xml (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jbossesb-properties.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ JBoss, Home of Professional Open Source
+ Copyright 2006, JBoss Inc., and others contributors as indicated
+ by the @authors tag. All rights reserved.
+ See the copyright.txt in the distribution for a
+ full listing of individual contributors.
+ This copyrighted material is made available to anyone wishing to use,
+ modify, copy, or redistribute it subject to the terms and conditions
+ of the GNU Lesser General Public License, v. 2.1.
+ This program is distributed in the hope that it will be useful, but WITHOUT A
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ You should have received a copy of the GNU Lesser General Public License,
+ v.2.1 along with this distribution; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+ (C) 2005-2006,
+ @author JBoss Inc.
+-->
+<!-- $Id: jbossesb-unittest-properties.xml $ -->
+<!--
+ These options are described in the JBossESB manual.
+ Defaults are provided here for convenience only.
+
+ Please read through this file prior to using the system, and consider
+ updating the specified entries.
+-->
+<esb
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd">
+ <properties name="core">
+ <property name="org.jboss.soa.esb.jndi.server.type" value="jboss"/>
+ <property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
+ <property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
+ </properties>
+ <properties name="registry">
+ <property name="org.jboss.soa.esb.registry.queryManagerURI"
+ value="jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire"/>
+ <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI"
+ value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#publish" />
+ <property name="org.jboss.soa.esb.registry.implementationClass"
+ value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
+ <property name="org.jboss.soa.esb.registry.factoryClass"
+ value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
+ <property name="org.jboss.soa.esb.registry.user"
+ value="jbossesb"/>
+ <property name="org.jboss.soa.esb.registry.password"
+ value="password"/>
+ <!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
+ <property name="org.jboss.soa.esb.scout.proxy.transportClass"
+ value="org.apache.ws.scout.transport.RMITransport"/>
+ </properties>
+ <properties name="transports" depends="core">
+ <property name="org.jboss.soa.esb.mail.smtp.host" value="localhost"/>
+ <property name="org.jboss.soa.esb.mail.smtp.user" value="jbossesb"/>
+ <property name="org.jboss.soa.esb.mail.smtp.password" value=""/>
+ <property name="org.jboss.soa.esb.mail.smtp.port" value="25"/>
+ </properties>
+ <properties name="connection">
+ <property name="min-pool-size" value="5"/>
+ <property name="max-pool=size" value="10"/>
+ <property name="blocking-timeout-millis" value="5000"/>
+ <property name="abandoned-connection-timeout" value="10000"/>
+ <property name="abandoned-connection-time-interval" value="30000"/>
+ </properties>
+ <properties name="dbstore">
+ <property name="org.jboss.soa.esb.persistence.db.connection.url" value="jdbc:hsqldb:hsql://localhost:9001/"/>
+ <property name="org.jboss.soa.esb.persistence.db.jdbc.driver" value="org.hsqldb.jdbcDriver"/>
+ <property name="org.jboss.soa.esb.persistence.db.user" value="sa"/>
+ <property name="org.jboss.soa.esb.persistence.db.pwd" value=""/>
+ <property name="org.jboss.soa.esb.persistence.db.pool.initial.size" value="2"/>
+ <property name="org.jboss.soa.esb.persistence.db.pool.min.size" value="2"/>
+ <property name="org.jboss.soa.esb.persistence.db.pool.max.size" value="5"/>
+ <!--table managed by pool to test for valid connections - created by pool automatically -->
+ <property name="org.jboss.soa.esb.persistence.db.pool.test.table" value="pooltest"/>
+ <!-- # of milliseconds to timeout waiting for a connection from pool -->
+ <property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis" value="5000"/>
+ <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/>
+ </properties>
+ <properties name="messagerouting">
+ <property name="org.jboss.soa.esb.routing.cbrClass" value="org.jboss.internal.soa.esb.services.routing.cbr.JBossRulesRouter"/>
+ </properties>
+</esb>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jndi.properties
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/jndi.properties 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jndi.properties 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,5 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-java.naming.factory.url.pkgs=org.jnp.interfaces
-
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jndi.properties (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/jndi.properties)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jndi.properties (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/jndi.properties 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,5 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming
+java.naming.factory.url.pkgs=org.jnp.interfaces
+
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/juddi.properties
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/juddi.properties 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/juddi.properties 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,69 +0,0 @@
-# jUDDI Registry Properties (used by RegistryServer)
-# see http://www.juddi.org for more information
-
-# The UDDI Operator Name
-juddi.operatorName = jUDDI.org
-
-# The i18n locale default codes
-juddi.i18n.languageCode = en
-juddi.i18n.countryCode = US
-
-# The UDDI DiscoveryURL Prefix
-juddi.discoveryURL = http://localhost:8080/juddi/uddiget.jsp?
-
-# The UDDI Operator Contact Email Address
-juddi.operatorEmailAddress = admin at juddi.org
-
-# The maximum name size and maximum number
-# of name elements allows in several of the
-# FindXxxx and SaveXxxx UDDI functions.
-juddi.maxNameLength=255
-juddi.maxNameElementsAllowed=5
-
-# The maximum number of UDDI artifacts allowed
-# per publisher. A value of '-1' indicates any
-# number of artifacts is valid (These values can be
-# overridden at the individual publisher level).
-juddi.maxBusinessesPerPublisher=25
-juddi.maxServicesPerBusiness=20
-juddi.maxBindingsPerService=10
-juddi.maxTModelsPerPublisher=100
-
-# jUDDI Authentication module to use
-juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
-
-# jUDDI DataStore module currently to use
-juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore
-
-# use a dataSource (if set to false a direct
-# jdbc connection will be used.
-juddi.isUseDataSource=false
-juddi.jdbcDriver=com.mysql.jdbc.Driver
-juddi.jdbcUrl=jdbc:mysql://localhost:3306/juddi
-juddi.jdbcUsername=root
-juddi.jdbcPassword=admin
-# jUDDI DataSource to use
-# juddi.dataSource=java:comp/env/jdbc/MySqlDS
-
-# jUDDI UUIDGen implementation to use
-juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
-
-# jUDDI Cryptor implementation to use
-juddi.cryptor = org.apache.juddi.cryptor.DefaultCryptor
-
-# jUDDI Validator to use
-juddi.validator=org.apache.juddi.validator.DefaultValidator
-
-# jUDDI Proxy Properties (used by RegistryProxy)
-juddi.proxy.adminURL = http://localhost:8080/juddi/admin
-juddi.proxy.inquiryURL = http://localhost:8080/juddi/inquiry
-juddi.proxy.publishURL = http://localhost:8080/juddi/publish
-juddi.proxy.transportClass = org.apache.juddi.proxy.AxisTransport
-juddi.proxy.securityProvider = com.sun.net.ssl.internal.ssl.Provider
-juddi.proxy.protocolHandler = com.sun.net.ssl.internal.www.protocol
-
-# JNDI settings (used by RMITransport)
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/juddi.properties (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/juddi.properties)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/juddi.properties (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/juddi.properties 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,69 @@
+# jUDDI Registry Properties (used by RegistryServer)
+# see http://www.juddi.org for more information
+
+# The UDDI Operator Name
+juddi.operatorName = jUDDI.org
+
+# The i18n locale default codes
+juddi.i18n.languageCode = en
+juddi.i18n.countryCode = US
+
+# The UDDI DiscoveryURL Prefix
+juddi.discoveryURL = http://localhost:8080/juddi/uddiget.jsp?
+
+# The UDDI Operator Contact Email Address
+juddi.operatorEmailAddress = admin at juddi.org
+
+# The maximum name size and maximum number
+# of name elements allows in several of the
+# FindXxxx and SaveXxxx UDDI functions.
+juddi.maxNameLength=255
+juddi.maxNameElementsAllowed=5
+
+# The maximum number of UDDI artifacts allowed
+# per publisher. A value of '-1' indicates any
+# number of artifacts is valid (These values can be
+# overridden at the individual publisher level).
+juddi.maxBusinessesPerPublisher=25
+juddi.maxServicesPerBusiness=20
+juddi.maxBindingsPerService=10
+juddi.maxTModelsPerPublisher=100
+
+# jUDDI Authentication module to use
+juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
+
+# jUDDI DataStore module currently to use
+juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore
+
+# use a dataSource (if set to false a direct
+# jdbc connection will be used.
+juddi.isUseDataSource=false
+juddi.jdbcDriver=com.mysql.jdbc.Driver
+juddi.jdbcUrl=jdbc:mysql://localhost:3306/juddi
+juddi.jdbcUsername=root
+juddi.jdbcPassword=admin
+# jUDDI DataSource to use
+# juddi.dataSource=java:comp/env/jdbc/MySqlDS
+
+# jUDDI UUIDGen implementation to use
+juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
+
+# jUDDI Cryptor implementation to use
+juddi.cryptor = org.apache.juddi.cryptor.DefaultCryptor
+
+# jUDDI Validator to use
+juddi.validator=org.apache.juddi.validator.DefaultValidator
+
+# jUDDI Proxy Properties (used by RegistryProxy)
+juddi.proxy.adminURL = http://localhost:8080/juddi/admin
+juddi.proxy.inquiryURL = http://localhost:8080/juddi/inquiry
+juddi.proxy.publishURL = http://localhost:8080/juddi/publish
+juddi.proxy.transportClass = org.apache.juddi.proxy.AxisTransport
+juddi.proxy.securityProvider = com.sun.net.ssl.internal.ssl.Provider
+juddi.proxy.protocolHandler = com.sun.net.ssl.internal.www.protocol
+
+# JNDI settings (used by RMITransport)
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming
+
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/log4j.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/log4j.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/log4j.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id: log4j.xml,v 1.26.2.5 2005/09/15 09:31:02 dimitris Exp $ -->
-
-<!--
- | For more configuration infromation and examples see the Jakarta Log4j
- | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="Target" value="System.out"/>
- <param name="Threshold" value="INFO"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%t][%c{1}] %m%n"/>
- </layout>
- </appender>
-
- <!-- ================================= -->
- <!-- Preserve messages in a local file -->
- <!-- ================================= -->
-
- <!-- A size based file rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="./listener.log"/>
- <param name="Append" value="false"/>
- <param name="MaxFileSize" value="500KB"/>
- <param name="MaxBackupIndex" value="1"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%t][%c] %m%n"/>
- </layout>
- </appender>
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <category name="org.jboss">
- <priority value="WARN"/>
- </category>
- <category name="org.jboss.soa.esb">
- <priority value="ERROR"/>
- </category>
- <category name="org.jboss.internal.soa.esb">
- <priority value="ERROR"/>
- </category>
- <category name="org.apache">
- <priority value="ERROR"/>
- </category>
- <category name="quickstart">
- <priority value="DEBUG"/>
- </category>
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
- </root>
-
-</log4j:configuration>
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/log4j.xml (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/log4j.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/log4j.xml (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/log4j.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml,v 1.26.2.5 2005/09/15 09:31:02 dimitris Exp $ -->
+
+<!--
+ | For more configuration infromation and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="INFO"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%t][%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A size based file rolling appender -->
+ <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="./listener.log"/>
+ <param name="Append" value="false"/>
+ <param name="MaxFileSize" value="500KB"/>
+ <param name="MaxBackupIndex" value="1"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%t][%c] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <category name="org.jboss">
+ <priority value="WARN"/>
+ </category>
+ <category name="org.jboss.soa.esb">
+ <priority value="ERROR"/>
+ </category>
+ <category name="org.jboss.internal.soa.esb">
+ <priority value="ERROR"/>
+ </category>
+ <category name="org.apache">
+ <priority value="ERROR"/>
+ </category>
+ <category name="quickstart">
+ <priority value="DEBUG"/>
+ </category>
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/messaging-roles.properties
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/messaging-roles.properties 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/messaging-roles.properties 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,6 +0,0 @@
-#
-# user=role1,role2,...
-#
-guest=guest
-gatewayuser=gatewayrole
-esbuser=esbrole
\ No newline at end of file
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/messaging-roles.properties (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/messaging-roles.properties)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/messaging-roles.properties (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/messaging-roles.properties 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,6 @@
+#
+# user=role1,role2,...
+#
+guest=guest
+gatewayuser=gatewayrole
+esbuser=esbrole
\ No newline at end of file
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/messaging-users.properties
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/messaging-users.properties 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/messaging-users.properties 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,11 +0,0 @@
-#
-# user=password
-#
-guest=guest
-
-# gatewayuser: clients that publish to the gateway
-gatewayuser=gwpassword
-
-# esbuser:
-# internal ESB user
-esbuser=esbpassword
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/messaging-users.properties (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/messaging-users.properties)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/messaging-users.properties (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/messaging-users.properties 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,11 @@
+#
+# user=password
+#
+guest=guest
+
+# gatewayuser: clients that publish to the gateway
+gatewayuser=gwpassword
+
+# esbuser:
+# internal ESB user
+esbuser=esbpassword
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/readme.txt
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/readme.txt 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/readme.txt 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,53 +0,0 @@
-Overview:
-=========
- The purpose of the jms_secured quickstart is to show how JMS destinations
- can be configured with security properties.
-
- This quickstart is exactly like the basic helloworld quickstart except that
- 'jms-security-principal' and 'jms-security-credential' properties are
- specified for the jms-bus elements.
-
- NOTE: this quickstart copies message-roles.properties and message-users.properties
- to ${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/conf/props,
- and this will require a server restart to funktion correctly.
-
-Running this quickstart:
-========================
- Please refer to 'ant help-quickstarts' for prerequisites about the quickstarts
- and a more detailed descripton of the different ways to run the quickstarts.
-
-To Run standalone mode:
-=======================
- 1. In a command terminal window in the quickstart folder type
- 'ant deploy-jms-dests'.
- 2. In a command terminal window in this folder ("Window1"), type 'ant run'.
- 3. Open another command terminal window in this folder ("Window2"), type
- 'ant runtest'.
- 4. Switch back to "Window1" to see the output from the ESB
- 5. When finished, interrupt the ESB using Ctrl-C and, in this folder
- ("Window1"), type 'ant undeploy-jms-dests'.
-
-To Run '.esb' archive mode:
-===========================
- 1. In a command terminal window in this folder ("Window1"), type 'ant deploy'.
- 2. Open another command terminal window in this folder ("Window2"), type
- 'ant runtest'.
- 3. Switch back to Application Server console to see the output from the ESB
- 4. In this folder ("Window1"), type 'ant undeploy'.
-
-What to look at in this Quickstart:
-===================================
- 1. src/org/jboss/soa/esb/samples/quickstart/jmssecured/test/SendJMSMessage
- Notice how the username(gatewayuser) and password for the destination
- queue/quickstart_jms_secured_Request_gw is specified during the creation of
- the QueueConnection.
- 2. jbm-queue-service.xml (JBM) or jbmq-queue-service.xml
- Notice how quickstart_jmssecured_Request_gw is defined with a SecurityConfig
- attribute and specifies two roles. One is a gatewayrole, which is used by the
- SendJMSMessage class to publish messages to the destination. The 'gatewayrole'
- can only write to the destination and not read.
- 3. jboss-esb.xml
- The message-filter for the jms-bus now specifies 'jms-security-principal' and
- 'jms-security-credential'
-
-
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/readme.txt (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/readme.txt)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/readme.txt (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/readme.txt 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,53 @@
+Overview:
+=========
+ The purpose of the jms_secured quickstart is to show how JMS destinations
+ can be configured with security properties.
+
+ This quickstart is exactly like the basic helloworld quickstart except that
+ 'jms-security-principal' and 'jms-security-credential' properties are
+ specified for the jms-bus elements.
+
+ NOTE: this quickstart copies message-roles.properties and message-users.properties
+ to ${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/conf/props,
+ and this will require a server restart to funktion correctly.
+
+Running this quickstart:
+========================
+ Please refer to 'ant help-quickstarts' for prerequisites about the quickstarts
+ and a more detailed descripton of the different ways to run the quickstarts.
+
+To Run standalone mode:
+=======================
+ 1. In a command terminal window in the quickstart folder type
+ 'ant deploy-jms-dests'.
+ 2. In a command terminal window in this folder ("Window1"), type 'ant run'.
+ 3. Open another command terminal window in this folder ("Window2"), type
+ 'ant runtest'.
+ 4. Switch back to "Window1" to see the output from the ESB
+ 5. When finished, interrupt the ESB using Ctrl-C and, in this folder
+ ("Window1"), type 'ant undeploy-jms-dests'.
+
+To Run '.esb' archive mode:
+===========================
+ 1. In a command terminal window in this folder ("Window1"), type 'ant deploy'.
+ 2. Open another command terminal window in this folder ("Window2"), type
+ 'ant runtest'.
+ 3. Switch back to Application Server console to see the output from the ESB
+ 4. In this folder ("Window1"), type 'ant undeploy'.
+
+What to look at in this Quickstart:
+===================================
+ 1. src/org/jboss/soa/esb/samples/quickstart/jmssecured/test/SendJMSMessage
+ Notice how the username(gatewayuser) and password for the destination
+ queue/quickstart_jms_secured_Request_gw is specified during the creation of
+ the QueueConnection.
+ 2. jbm-queue-service.xml (JBM) or jbmq-queue-service.xml
+ Notice how quickstart_jmssecured_Request_gw is defined with a SecurityConfig
+ attribute and specifies two roles. One is a gatewayrole, which is used by the
+ SendJMSMessage class to publish messages to the destination. The 'gatewayrole'
+ can only write to the destination and not read.
+ 3. jboss-esb.xml
+ The message-filter for the jms-bus now specifies 'jms-security-principal' and
+ 'jms-security-credential'
+
+
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/src)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/src/org)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/src/org/jboss)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/src/org/jboss/soa)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/quickstart (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/quickstart)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/quickstart/jmssecured (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/quickstart/jmssecured)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/quickstart/jmssecured/test (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/quickstart/jmssecured/test)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/quickstart/jmssecured/test/SendJMSMessage.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/quickstart/jmssecured/test/SendJMSMessage.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/quickstart/jmssecured/test/SendJMSMessage.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,87 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-package org.jboss.soa.esb.samples.quickstart.jmssecured.test;
-
-import java.util.Properties;
-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;
-
-/**
- *
- * @author <a href="mailto:daniel.bevenius at gmail.com">Daniel Bevenius</a>
- *
- */
-public class SendJMSMessage
-{
- private QueueConnection connection;
- private QueueSession session;
- private Queue queue;
-
- private String jmsSecurityPrincipal = "gatewayuser";
- private String jmsSecurityCredential = "gwpassword";
-
- public void setupConnection() throws JMSException, NamingException
- {
- InitialContext iniCtx = new InitialContext();
-
- QueueConnectionFactory queueConnectionFactory = (QueueConnectionFactory) iniCtx.lookup("ConnectionFactory");
-
- connection = queueConnectionFactory.createQueueConnection(jmsSecurityPrincipal, jmsSecurityCredential);
-
- queue = (Queue) iniCtx.lookup("queue/quickstart_jms_secured_Request_gw");
- session = connection.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
- connection.start();
- System.out.println("Connection Started");
- }
-
- public void stop() throws JMSException
- {
- connection.stop();
- session.close();
- connection.close();
- }
-
- public void sendAMessage(String msg) throws JMSException {
-
- QueueSender sender = session.createSender(queue);
- ObjectMessage objectMsg = session.createObjectMessage(msg);
-
- sender.send(objectMsg);
- sender.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/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/quickstart/jmssecured/test/SendJMSMessage.java (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/quickstart/jmssecured/test/SendJMSMessage.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/quickstart/jmssecured/test/SendJMSMessage.java (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_secured/src/org/jboss/soa/esb/samples/quickstart/jmssecured/test/SendJMSMessage.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package org.jboss.soa.esb.samples.quickstart.jmssecured.test;
+
+import java.util.Properties;
+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;
+
+/**
+ *
+ * @author <a href="mailto:daniel.bevenius at gmail.com">Daniel Bevenius</a>
+ *
+ */
+public class SendJMSMessage
+{
+ private QueueConnection connection;
+ private QueueSession session;
+ private Queue queue;
+
+ private String jmsSecurityPrincipal = "gatewayuser";
+ private String jmsSecurityCredential = "gwpassword";
+
+ public void setupConnection() throws JMSException, NamingException
+ {
+ InitialContext iniCtx = new InitialContext();
+
+ QueueConnectionFactory queueConnectionFactory = (QueueConnectionFactory) iniCtx.lookup("ConnectionFactory");
+
+ connection = queueConnectionFactory.createQueueConnection(jmsSecurityPrincipal, jmsSecurityCredential);
+
+ queue = (Queue) iniCtx.lookup("queue/quickstart_jms_secured_Request_gw");
+ session = connection.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+ connection.start();
+ System.out.println("Connection Started");
+ }
+
+ public void stop() throws JMSException
+ {
+ connection.stop();
+ session.close();
+ connection.close();
+ }
+
+ public void sendAMessage(String msg) throws JMSException {
+
+ QueueSender sender = session.createSender(queue);
+ ObjectMessage objectMsg = session.createObjectMessage(msg);
+
+ sender.send(objectMsg);
+ sender.close();
+ }
+
+
+ public static void main(String args[]) throws Exception
+ {
+ SendJMSMessage sm = new SendJMSMessage();
+ sm.setupConnection();
+ sm.sendAMessage(args[0]);
+ sm.stop();
+ }
+
+}
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_topic/src/org/jboss/soa/esb/samples/quickstart/jmstopic/MessageAugmentor.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_topic/src/org/jboss/soa/esb/samples/quickstart/jmstopic/MessageAugmentor.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/jms_topic/src/org/jboss/soa/esb/samples/quickstart/jmstopic/MessageAugmentor.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -28,11 +28,6 @@
import org.jboss.soa.esb.client.ServiceInvoker;
import org.jboss.soa.esb.message.Message;
-import java.util.List;
-import java.util.ArrayList;
-
-import junit.framework.TestCase;
-
/**
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
*/
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_CSV2XML/SampleOrder.csv
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_CSV2XML/SampleOrder.csv 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_CSV2XML/SampleOrder.csv 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1 +1,4 @@
1,Wed Nov 15 13:45:28 EST 2006,0,59.97,64.92,4.95,user1,Harry,Fletcher,SD,1,1,364,The 40-Year-Old Virgin,29.98,2,1,299,Pulp Fiction,29.99
+2,Wed Nov 15 13:45:28 EST 2007,0,60.00,64.92,4.95,user2,Kalle,Anka,SD,1,1,364,Fletch,29.98,2,1,299,Fletch Lives,29.99
+3,Wed Nov 15 13:45:28 EST 2007,0,60.00,64.92,4.95,user3,Donald,Duck,SD,1,1,364,The Goonies,29.98,2,1,4,Happy Gilmor,29.99
+
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_CSV2XML/smooks-res.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_CSV2XML/smooks-res.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_CSV2XML/smooks-res.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -30,6 +30,7 @@
<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[
+ <orders>
<xsl:for-each select="csv-record">
<Order orderId="{orderId}"
orderDate="{orderDate}"
@@ -40,14 +41,15 @@
<Customer userName="{userName}" firstName="{firstName}" lastName="{lastName}" state="{state}" />
<OrderLines>
<OrderLine posistion="{orderLine1Position}" quantity="{orderLine1Quantity}">
- <Product productId="{orderLine1ProductId}" title="{orderLine1Title}" price="{orderLine1Price}"/>
+ <Product productId="{orderLine1ProductId}" title="{orderLine1ProductTitle}" price="{orderLine1ProductPrice}"/>
</OrderLine>
- <OrderLine posistion="{orderLine1Position}" quantity="{orderLine1Quantity}">
- <Product productId="{orderLine1ProductId}" title="{orderLine1Title}" price="{orderLine1Price}"/>
+ <OrderLine posistion="{orderLine2Position}" quantity="{orderLine2Quantity}">
+ <Product productId="{orderLine2ProductId}" title="{orderLine2ProductTitle}" price="{orderLine2ProductPrice}"/>
</OrderLine>
</OrderLines>
</Order>
</xsl:for-each>
+ </orders>
]]>
</resource>
<param name="is-xslt-templatelet">true</param>
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/samples/quickstart/transformxml2pojo/test/ReceiveJMSMessage.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/samples/quickstart/transformxml2pojo/test/ReceiveJMSMessage.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/samples/quickstart/transformxml2pojo/test/ReceiveJMSMessage.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -117,25 +117,25 @@
}
public static void main(String[] args) {
- final ReceiveJMSMessage receiver = new ReceiveJMSMessage();
-
- if ((args.length > 0) && (args[0] != null)) {
- receiver.receiveQueueName = args[0];
- System.out.println("Receiving on: " + receiver.receiveQueueName );
- Runtime.getRuntime().addShutdownHook(new Thread() {
- public void run() {
- receiver.cleanup() ;
- }
- }) ;
- while (true) { // loop until I'm killed
- receiver.receiveOne();
- try {
- Thread.sleep(500);
- } catch (InterruptedException e) {break;}
- }
-
- } else {
- System.out.println("Usage <queue-name>");
- }
+ final ReceiveJMSMessage receiver = new ReceiveJMSMessage();
+
+ // check if default queue name is being overridden
+
+ if ((args.length > 0) && (args[0] != null)) {
+ receiver.receiveQueueName = args[0];
+ }
+
+ System.out.println("Receiving on: " + receiver.receiveQueueName );
+ Runtime.getRuntime().addShutdownHook(new Thread() {
+ public void run() {
+ receiver.cleanup() ;
+ }
+ }) ;
+ while (true) { // loop until I'm killed
+ receiver.receiveOne();
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {break;}
+ }
}
}
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_mtom/README.html
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_mtom/README.html 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_mtom/README.html 2008-01-14 16:11:24 UTC (rev 17818)
@@ -19,7 +19,7 @@
JBoss AS 4.2.1.GA. Installation instructions for both can be found in the
install/readme.txt.
<p/>
- <b style="text-decoration: blink; color: red">NOTE:</b> This Quickstart requires the JBossRemoting 2.2.2SP2 patch to be applied.
+ <b style="text-decoration: blink; color: red">NOTE:</b> This Quickstart requires the JBossRemoting 2.2.2SP2 or higher patch to be applied.
This simply involves downloading <a href="http://repository.jboss.org/jboss/remoting/2.2.2.SP2/lib/jboss-remoting.jar">jboss-remoting.jar</a>
and copying it into your "server/<server>/lib" folder. Be sure to restart your JBoss
Application/ESB Server instance.
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_mtom/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_mtom/build.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_mtom/build.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -8,7 +8,7 @@
<!-- Import the base Ant build script... -->
<import file="../conf/base-build.xml"/>
- <target name="quickstart-specific-dependencies" depends="assert-ws-available,assert-jbossremoting-2.2.2.SP1-plus">
+ <target name="quickstart-specific-dependencies" depends="assert-ws-available,assert-jbossremoting-version">
<path id="quickstart-dependencies-classpath">
<fileset dir="${org.jboss.esb.server.home}/client" includes="jbossws-client.jar,jboss-remoting.jar" />
</path>
@@ -27,7 +27,6 @@
</war>
</target>
-
<target name="runtest" depends="compile" description="runs test JMS Sender">
<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webservicemtom.webservice.client.MTOMClient"
failonerror="true">
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_mtom/src/org/jboss/soa/esb/samples/quickstart/webservicemtom/webservice/MTOMProtocolHandler.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_mtom/src/org/jboss/soa/esb/samples/quickstart/webservicemtom/webservice/MTOMProtocolHandler.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_mtom/src/org/jboss/soa/esb/samples/quickstart/webservicemtom/webservice/MTOMProtocolHandler.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -22,7 +22,7 @@
package org.jboss.soa.esb.samples.quickstart.webservicemtom.webservice;
import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler;
+import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wsaddressing/README.html
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wsaddressing/README.html 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wsaddressing/README.html 2008-01-14 16:11:24 UTC (rev 17818)
@@ -24,7 +24,7 @@
JBoss AS 4.2.1.GA. Installation instructions for both can be found in the
install/readme.txt.
<p/>
- <b style="text-decoration: blink; color: red">NOTE:</b> This Quickstart requires the JBossRemoting 2.2.2SP2 patch to be applied.
+ <b style="text-decoration: blink; color: red">NOTE:</b> This Quickstart requires the JBossRemoting 2.2.2SP2 or higher patch to be applied.
This simply involves downloading <a href="http://repository.jboss.org/jboss/remoting/2.2.2.SP2/lib/jboss-remoting.jar">jboss-remoting.jar</a>
and copying it into your "server/<server>/lib" folder. Be sure to restart your JBoss
Application/ESB Server instance.
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wsaddressing/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wsaddressing/build.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wsaddressing/build.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -8,7 +8,7 @@
<!-- Import the base Ant build script... -->
<import file="../conf/base-build.xml"/>
- <target name="quickstart-specific-dependencies" depends="assert-ws-available,assert-jbossremoting-2.2.2.SP1-plus">
+ <target name="quickstart-specific-dependencies" depends="assert-ws-available,assert-jbossremoting-version">
<path id="quickstart-dependencies-classpath">
<fileset dir="${org.jboss.esb.server.home}/client" includes="jbossws-client.jar,jboss-remoting.jar" />
</path>
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wsaddressing/src/org/jboss/soa/esb/samples/quickstart/webservicewsa/ServerHandler.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wsaddressing/src/org/jboss/soa/esb/samples/quickstart/webservicewsa/ServerHandler.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wsaddressing/src/org/jboss/soa/esb/samples/quickstart/webservicewsa/ServerHandler.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -34,8 +34,8 @@
import javax.xml.ws.handler.MessageContext.Scope;
import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler;
-import org.jboss.wsf.spi.utils.DOMUtils;
+import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler;
/**
* A server side handler for the ws-addressing
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wsaddressing/src/org/jboss/soa/esb/samples/quickstart/webservicewsa/client/ClientHandler.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wsaddressing/src/org/jboss/soa/esb/samples/quickstart/webservicewsa/client/ClientHandler.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wsaddressing/src/org/jboss/soa/esb/samples/quickstart/webservicewsa/client/ClientHandler.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -36,9 +36,9 @@
import javax.xml.ws.handler.MessageContext.Scope;
import org.jboss.logging.Logger;
+import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler;
import org.jboss.ws.core.utils.UUIDGenerator;
-import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler;
-import org.jboss.wsf.spi.utils.DOMUtils;
import org.jboss.soa.esb.samples.quickstart.webservicewsa.StatefulEndpointImpl;
/**
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wssecurity/README.html
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wssecurity/README.html 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wssecurity/README.html 2008-01-14 16:11:24 UTC (rev 17818)
@@ -19,7 +19,7 @@
JBoss AS 4.2.1.GA. Installation instructions for both can be found in the
install/readme.txt.
<p/>
- <b style="text-decoration: blink; color: red">NOTE:</b> This Quickstart requires the JBossRemoting 2.2.2SP2 patch to be applied.
+ <b style="text-decoration: blink; color: red">NOTE:</b> This Quickstart requires the JBossRemoting 2.2.2SP2 or higher patch to be applied.
This simply involves downloading <a href="http://repository.jboss.org/jboss/remoting/2.2.2.SP2/lib/jboss-remoting.jar">jboss-remoting.jar</a>
and copying it into your "server/<server>/lib" folder. Be sure to restart your JBoss
Application/ESB Server instance.
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wssecurity/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wssecurity/build.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/webservice_wssecurity/build.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -8,7 +8,7 @@
<!-- Import the base Ant build script... -->
<import file="../conf/base-build.xml"/>
- <target name="quickstart-specific-dependencies" depends="assert-ws-available,assert-jbossremoting-2.2.2.SP1-plus">
+ <target name="quickstart-specific-dependencies" depends="assert-ws-available,assert-jbossremoting-version">
<path id="quickstart-dependencies-classpath">
<fileset dir="${org.jboss.esb.server.home}/client" includes="jbossws-client.jar,jboss-remoting.jar"/>
</path>
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -52,7 +52,7 @@
public class DBMessageStoreImpl implements RedeliverStore
{
public static final String DEFAULT_TABLE_NAME = "message";
- public static final String UNCLASSIFIED_CLASSIFICATION = "UNCLASSIFIED";
+ public static final String UNCLASSIFIED_CLASSIFICATION = "NONE";
private Logger logger = Logger.getLogger(this.getClass());
@@ -80,7 +80,7 @@
/**
* add's a @Message to the database persistence store
* will set the 'delivered' flag to TRUE by default - assuming that the @Message has been delivered
- * If classification is null or "", then UNCLASSIFIED will be used.
+ * If classification is null or "", then NONE will be used.
*/
public synchronized URI addMessage (Message message, String classification) throws MessageStoreException
{
@@ -150,7 +150,7 @@
/**
* remove a @Message based on the passed in key in the form of a JBoss ESB @URI
* format for URI: "urn:jboss/esb/message/UID#" + UUID.randomUUID()" - see the method in this class @removeMessage
- * If classification is null or "", then UNCLASSIFIED will be used.
+ * If classification is null or "", then NONE will be used.
*/
public synchronized int removeMessage (URI uid, String classification)
throws MessageStoreException
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/JBpmObjectMapper.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/JBpmObjectMapper.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/JBpmObjectMapper.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -235,8 +235,10 @@
value = objectMapper.getObjectFromMessage(message, mapping.getEsb());
} catch (ObjectMappingException ome) {
log.info(mapping.getEsb() + " not found");
- value =mapping.getDefaultValue();
}
+ if (value == null) {
+ value = mapping.getDefaultValue();
+ }
log.debug("value=" + value);
return value;
}
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -97,7 +97,7 @@
message.getHeader().getCall().setReplyTo(replyTo);
if (exceptionTransition!=null) {
// Set the replyTo to the JBpmCallback Service
- EPR faultTo = createReplyTo(esbToBpmVars.asXML(), globalProcessScope, executionContext);
+ EPR faultTo = createFaultTo(esbToBpmVarsXml, globalProcessScope, executionContext);
message.getHeader().getCall().setFaultTo(faultTo);
}
//Sending the message on its way
@@ -148,7 +148,8 @@
if (globalProcessScope!=null) {
portReference.addExtension(Constants.PROCESS_SCOPE_ATTR, globalProcessScope.toString());
}
- portReference.addExtension(Constants.TOKEN_ID, String.valueOf(executionContext.getToken().getId()));
+ final long tokenId = executionContext.getToken().getId();
+ portReference.addExtension(Constants.TOKEN_ID, String.valueOf(tokenId));
String nodeId = "";
if (executionContext.getNode()!=null) {
nodeId = String.valueOf(executionContext.getNode().getId());
@@ -157,7 +158,7 @@
}
portReference.addExtension(Constants.PROCESS_INSTANCE_ID, String.valueOf(executionContext.getProcessInstance().getId()));
- String counterName = Constants.PROCESS_NODE_VERSION_COUNTER + nodeId;
+ String counterName = Constants.PROCESS_NODE_VERSION_COUNTER + nodeId + '_' + tokenId;
Long counter = Long.getLong(String.valueOf(executionContext.getVariable(counterName)));
if (counter!=null) {
counter = counter + 1;
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbNotifier.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbNotifier.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbNotifier.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -63,7 +63,7 @@
/**
* XML element to specify the mapping of variables from jBPM to ESB.
*/
- public DefaultElement jbpmToEsbVars;
+ public DefaultElement bpmToEsbVars;
/**
* Constructs an ESB Message and sends sends to the an ESB Service
* as defined in the processdefinition.xml.
@@ -79,7 +79,7 @@
"Service name (esbServiceName element) must not be null");
}
JBpmObjectMapper mapper = new JBpmObjectMapper();
- Message message = mapper.mapFromJBpmToEsbMessage(jbpmToEsbVars, globalProcessScope, executionContext);
+ Message message = mapper.mapFromJBpmToEsbMessage(bpmToEsbVars, globalProcessScope, executionContext);
if (logger.isDebugEnabled()) logger.debug("Created ESB message=" + message);
getServiceInvoker().deliverAsync(message);
logger.debug("Message send successfully");
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CallbackCommand.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CallbackCommand.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CallbackCommand.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -74,45 +74,39 @@
long nodeId = Long.parseLong(callbackEpr.getAddr().getExtensionValue(Constants.NODE_ID));
long tokenId = Long.parseLong(callbackEpr.getAddr().getExtensionValue(Constants.TOKEN_ID));
long processInstanceId = Long.parseLong(callbackEpr.getAddr().getExtensionValue(Constants.PROCESS_INSTANCE_ID));
- String counterName = Constants.PROCESS_NODE_VERSION_COUNTER + nodeId;
+ String counterName = Constants.PROCESS_NODE_VERSION_COUNTER + nodeId + '_' + tokenId;
long processNodeVersion = Long.parseLong(callbackEpr.getAddr().getExtensionValue(counterName));
if (logger.isDebugEnabled()) logger.debug("Expected nodeId=" + nodeId +
", tokenId=" + tokenId + ", processNodeVersion=" + processNodeVersion);
//get update on current state of things.
ProcessInstance instance = jbpmContext.getProcessInstance(processInstanceId);
- Long currentTokenId = null;
- Long currentNodeId = null;
+ if (instance == null) {
+ throw new CallbackException("Process instance " + processInstanceId + " is no longer active") ;
+ }
List tokens = instance.findAllTokens();
+ boolean discovered = false ;
for (Object object : tokens) {
Token token = (Token) object;
if (token.getId()==tokenId) {
- currentTokenId = token.getId();
- currentNodeId = token.getNode().getId();
+ if (nodeId != token.getNode().getId()) {
+ throw new CallbackException("Token id " + tokenId + " from process instance " + processInstanceId + " is no longer on expected node") ;
+ }
+ discovered = true ;
break;
}
}
- //Compare current with expected
- StringBuilder unExpected = new StringBuilder();
- if (nodeId!=currentNodeId) {
- unExpected.append("A timeout occured or something else signaled the node, " + currentNodeId +
- "causing it to move away from the expected node with id= ").append(nodeId).append(". ");
+ if (!discovered) {
+ throw new CallbackException("Token id " + tokenId + " from process instance " + processInstanceId + " is no longer active") ;
}
- if (tokenId!=currentTokenId) {
- unExpected.append("The process is at the expected Node, but the current Token (id=" + currentTokenId +
- ") is not the expected Token (").append(tokenId).append("), ");
- }
- if (logger.isDebugEnabled()) logger.debug("Current state nodeId=" + currentNodeId);
+ //Compare current with expected
//get the current processNode Version
Long currentProcessNodeVersion = Long.parseLong(String.valueOf(
instance.getContextInstance().getVariable(counterName)));
if (logger.isDebugEnabled()) logger.debug("ProcessNodeVersion=" + currentProcessNodeVersion);
if (processNodeVersion!=currentProcessNodeVersion) {
- unExpected.append("The current processNodeVersion (id=" + currentProcessNodeVersion +
- ") is not the expected version (version=").append(processNodeVersion).append("). ");
+ throw new CallbackException("The current processNodeVersion (id=" + currentProcessNodeVersion +
+ ") is not the expected version (version=" + processNodeVersion + ").");
}
- if (!"".equals(unExpected.toString())) {
- throw new CallbackException(unExpected.toString());
- }
return tokenId;
}
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/ExceptionFlowTest.java (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/ExceptionFlowTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/ExceptionFlowTest.java (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/ExceptionFlowTest.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,234 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.services.jbpm.actionhandlers;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.net.URI;
+
+import junit.framework.JUnit4TestAdapter;
+
+import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.couriers.MockCourier;
+import org.jboss.internal.soa.esb.couriers.MockCourierFactory;
+import org.jboss.internal.soa.esb.services.registry.MockRegistry;
+import org.jboss.soa.esb.addressing.EPR;
+import org.jbpm.JbpmConfiguration;
+import org.jbpm.JbpmContext;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.graph.exe.Token;
+import org.junit.Before;
+import org.junit.Test;
+/**
+ * Tests the capabilities of jBPM which we are using to handle exceptions.
+ *
+ * @author kstam
+ *
+ */
+public class ExceptionFlowTest
+{
+ private static String PROCESS_DEF_XML = "testExceptionHandling.xml";
+ private static Logger logger = Logger.getLogger(ExceptionFlowTest.class);
+ private static long processInstanceId;
+
+ private static EPR epr1;
+ private static MockCourier courier1;
+ private static String MOCK_CATEGORY="MockCategory";
+ private static String MOCK_SERVICE ="MockService";
+
+ @Before
+ public void setup() throws Exception
+ {
+ MockCourierFactory.install();
+ MockRegistry.install();
+ epr1 = new EPR(new URI("test1"));
+ courier1 = new MockCourier(true);
+ MockRegistry.register(MOCK_CATEGORY, MOCK_SERVICE, epr1, courier1);
+
+ logger.info("Setting up jBPM");
+ JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance();
+ JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+ jbpmContext.getJbpmConfiguration().getJobExecutor().start();
+
+ //Extract a process definition from the processdefinition.xml file.
+ ProcessDefinition processDefinition
+ = ProcessDefinition.parseXmlResource(PROCESS_DEF_XML);
+ assertNotNull(processDefinition);
+ //Create an instance of the process definition.
+ jbpmContext.deployProcessDefinition(processDefinition);
+ //processInstance = new ProcessInstance(processDefinition);
+ ProcessInstance processInstance = jbpmContext.newProcessInstance("testExceptionHandling");
+ assertTrue(
+ "Instance is in start state",
+ "start".equals(processInstance.getRootToken().getNode().getName()));
+ processInstanceId = processInstance.getId();
+ jbpmContext.close();
+ }
+
+ /**
+ * Tests timeout of the first node (service1). The time-out-transition will
+ * be taken and we should en up in the ExceptionHandling end-state.
+ *
+ * @throws Exception
+ */
+ @Test
+ public void timeOut() throws Exception
+ {
+ JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance();
+ JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+ ProcessInstance processInstance = jbpmContext.loadProcessInstance(processInstanceId);
+
+ Token token = processInstance.getRootToken();
+ assertEquals("start",token.getNode().getName());
+ //Move the process to service1
+ processInstance.signal();
+ jbpmContext.close();
+ //Our timer fires after 1000 millies, so let's wait for that
+ int seconds=0;
+ while(true) {
+ jbpmContext = jbpmConfiguration.createJbpmContext();
+ processInstance = jbpmContext.loadProcessInstance(processInstanceId);
+ token = processInstance.getRootToken();
+ logger.info(seconds++ + " Node=" + token.getNode().getName());
+ if ("ExceptionHandling".equals(token.getNode().getName())) break; //we're done waiting
+ if (seconds > 20) break; // the timer must not have fired so we are bailing (and failing)
+ jbpmContext.close();
+ try { Thread.sleep(1000); } catch (InterruptedException e) {e.printStackTrace();}
+ }
+ assertEquals("ExceptionHandling",token.getNode().getName());
+ }
+
+ /**
+ * Tests bypassing the timout and taking the exception transition on service2.
+ *
+ */
+ @Test
+ public void takeExceptionTransition() {
+ JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance();
+ JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+ ProcessInstance processInstance = jbpmContext.loadProcessInstance(processInstanceId);
+
+ Token token = processInstance.getRootToken();
+ assertEquals("start",token.getNode().getName());
+ //Move the process to service1
+ processInstance.signal();
+ assertEquals("Service1",token.getNode().getName());
+// Move the process to service2, no timeout on service1
+ processInstance.signal();
+ assertEquals("Service2",token.getNode().getName());
+ //Move the service2 ExceptionHandling
+ processInstance.signal("exception");
+ assertEquals("ExceptionHandling",token.getNode().getName());
+ }
+
+ /**
+ * Tests bypassing the timout and setting exception of 3 to take the conditional transition.
+ *
+ */
+ @Test
+ public void takeConditionalTransition() {
+ JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance();
+ JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+ ProcessInstance processInstance = jbpmContext.loadProcessInstance(processInstanceId);
+
+ Token token = processInstance.getRootToken();
+ assertEquals("start",token.getNode().getName());
+ //Move the process to service1
+ processInstance.signal();
+ assertEquals("Service1",token.getNode().getName());
+// Move the process to service2, no timeout on service1
+ processInstance.signal();
+ assertEquals("Service2",token.getNode().getName());
+ //Move the service3
+ processInstance.signal();
+ assertEquals("Service3",token.getNode().getName());
+ processInstance.getContextInstance().createVariable("exceptionCode",3);
+ processInstance.signal();
+ //Based on the setting of exceptionCode of 3 the conditional transition
+ //should be taken.
+ assertEquals("ExceptionHandling",token.getNode().getName());
+ }
+
+ /**
+ * Tests bypassing the timout and setting exception of 3 to take the conditional transition.
+ *
+ */
+ @Test
+ public void doNotTakeConditionalTransition() {
+ JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance();
+ JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+ ProcessInstance processInstance = jbpmContext.loadProcessInstance(processInstanceId);
+
+ Token token = processInstance.getRootToken();
+ assertEquals("start",token.getNode().getName());
+ //Move the process to service1
+ processInstance.signal();
+ assertEquals("Service1",token.getNode().getName());
+// Move the process to service2, no timeout on service1
+ processInstance.signal();
+ assertEquals("Service2",token.getNode().getName());
+ //Move the service3
+ processInstance.signal();
+ assertEquals("Service3",token.getNode().getName());
+ processInstance.getContextInstance().createVariable("exceptionCode",2);
+ processInstance.signal();
+ //Based on the setting of exceptionCode of 2 the conditional transition
+ //should not be taken.
+ assertEquals("end",token.getNode().getName());
+ }
+
+ /**
+ * Tests bypassing the timout and setting exception of 3 to take the conditional transition.
+ *
+ */
+ @Test
+ public void doNotTakeConditionalTransition2() {
+ JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance();
+ JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+ ProcessInstance processInstance = jbpmContext.loadProcessInstance(processInstanceId);
+
+ Token token = processInstance.getRootToken();
+ assertEquals("start",token.getNode().getName());
+ //Move the process to service1
+ processInstance.signal();
+ assertEquals("Service1",token.getNode().getName());
+// Move the process to service2, no timeout on service1
+ processInstance.signal();
+ assertEquals("Service2",token.getNode().getName());
+ //Move the service3
+ processInstance.signal();
+ assertEquals("Service3",token.getNode().getName());
+ processInstance.signal();
+ //Based on the not setting of exceptionCode the conditional transition
+ //should not be taken.
+ assertEquals("end",token.getNode().getName());
+ }
+
+ public static junit.framework.Test suite(){
+ return new JUnit4TestAdapter(ExceptionFlowTest.class);
+ }
+
+}
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/TimerTest.java (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/TimerTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/TimerTest.java (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/TimerTest.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,115 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.services.jbpm.actionhandlers;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import junit.framework.JUnit4TestAdapter;
+
+import org.apache.log4j.Logger;
+import org.jbpm.JbpmConfiguration;
+import org.jbpm.JbpmContext;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.graph.exe.Token;
+import org.junit.BeforeClass;
+import org.junit.Test;
+/**
+ * Tests the capabilities of jBPM timer, which we are using.
+ *
+ * @author kstam
+ *
+ */
+public class TimerTest
+{
+ private static String PROCESS_DEF_XML = "testTimer.xml";
+ private static Logger logger = Logger.getLogger(TimerTest.class);
+ private static long processInstanceId;
+ //private static ProcessInstance processInstance = null;
+ //private static JbpmContext jbpmContext = null;
+ //private static GraphSession graphSession = null;
+
+ @BeforeClass
+ public static void setup() throws Exception
+ {
+ logger.info("Setting up jBPM");
+ JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance();
+
+ jbpmConfiguration.getJobExecutor().start();
+ JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+ //Extract a process definition from the processdefinition.xml file.
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource(PROCESS_DEF_XML);
+ assertNotNull(processDefinition);
+ //Create an instance of the process definition.
+ jbpmContext.deployProcessDefinition(processDefinition);
+ ProcessInstance processInstance = jbpmContext.newProcessInstance("testTimer");
+ processInstanceId = processInstance.getId();
+ assertTrue(
+ "Instance is in start state",
+ "start".equals(processInstance.getRootToken().getNode().getName()));
+ processInstance.getContextInstance().createVariable("processingTime", "3000");
+ jbpmContext.close();
+ }
+
+ /**
+ * Tests timeout functionality of jBPM
+ *
+ * @throws Exception
+ */
+ @Test
+ public void timeOut() throws Exception
+ {
+ JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance();
+ JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+ ProcessInstance processInstance = jbpmContext.loadProcessInstance(processInstanceId);
+
+ Token token = processInstance.getRootToken();
+ processInstance.signal();
+ assertEquals("wait1",token.getNode().getName());
+ jbpmContext.close();
+
+ int seconds=0;
+ while (true) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {}
+ jbpmContext = jbpmConfiguration.createJbpmContext();
+ processInstance = jbpmContext.loadProcessInstance(processInstanceId);
+ token = processInstance.getRootToken();
+ String currentNode = token.getNode().getName();
+ System.out.println(seconds++ + " " + currentNode);
+ jbpmContext.close();
+ if (currentNode.equals("end")) break;
+ if (seconds > 20) break;
+ }
+
+ //Check that we are now in the end node.
+ assertEquals("end",token.getNode().getName());
+ }
+
+ public static junit.framework.Test suite(){
+ return new JUnit4TestAdapter(TimerTest.class);
+ }
+
+}
Property changes on: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/resources
___________________________________________________________________
Name: svn:ignore
- .gpd.JBpmObjectMapperTestProcessDefinition.xml
.gpd.testMappingDefinition.xml
+ .gpd.JBpmObjectMapperTestProcessDefinition.xml
.gpd.testMappingDefinition.xml
.gpd.testExceptionHandling.xml
.gpd.testTimer.xml
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/resources/log4j.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/resources/log4j.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/resources/log4j.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -35,10 +35,10 @@
<!-- ================ -->
<category name="org.jbpm">
- <priority value="INFO"/>
+ <priority value="DEBUG"/>
</category>
<category name="org.hibernate">
- <priority value="ERROR"/>
+ <priority value="INFO"/>
</category>
<category name="org.jboss">
<priority value="WARN"/>
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/resources/testExceptionHandling.jpg (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/services/jbpm/src/test/resources/testExceptionHandling.jpg)
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/resources/testExceptionHandling.xml (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/services/jbpm/src/test/resources/testExceptionHandling.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/resources/testExceptionHandling.xml (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/resources/testExceptionHandling.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition
+ xmlns="urn:jbpm.org:jpdl-3.2"
+ name="testExceptionHandling">
+ <start-state name="start">
+ <transition name="ok" to="Service1"></transition>
+ </start-state>
+ <node name="Service1">
+ <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
+ <esbCategoryName>MockCategory</esbCategoryName>
+ <esbServiceName>MockService</esbServiceName>
+ </action>
+ <timer name='timeout' duedate='1 seconds' transition='time-out-transition'/>
+ <transition name="ok" to="Service2"></transition>
+ <transition name="time-out-transition" to="ExceptionHandling"></transition>
+ </node>
+ <node name="Service2">
+ <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
+ <esbCategoryName>MockCategory</esbCategoryName>
+ <esbServiceName>MockService</esbServiceName>
+ </action>
+ <transition name="ok" to="Service3"></transition>
+ <transition name="exception" to="ExceptionHandling"></transition>
+ </node>
+ <end-state name="ExceptionHandling"></end-state>
+ <node name="Service3">
+ <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
+ <esbCategoryName>MockCategory</esbCategoryName>
+ <esbServiceName>MockService</esbServiceName>
+ </action>
+ <transition name="ok" to="exceptionDecision"></transition>
+
+ </node>
+ <end-state name="end"></end-state>
+ <decision name="exceptionDecision">
+ <transition name="ok" to="end"></transition>
+ <transition name="exceptionCondition" to="ExceptionHandling">
+ <condition>#{ exceptionCode==3}</condition>
+ </transition>
+ </decision>
+</process-definition>
\ No newline at end of file
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/resources/testTimer.jpg (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/services/jbpm/src/test/resources/testTimer.jpg)
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/resources/testTimer.xml (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/product/services/jbpm/src/test/resources/testTimer.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/resources/testTimer.xml (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/test/resources/testTimer.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition
+ xmlns="urn:jbpm.org:jpdl-3.2"
+ name="testTimer">
+ <start-state name="start">
+ <transition name="toWait" to="wait1"></transition>
+ </start-state>
+ <state name="wait1">
+ <timer duedate="2 seconds" transition="continue" />
+ <transition name="continue" to="mynode" />
+ </state>
+ <node name="mynode">
+ <transition name="toWait2" to="wait2" />
+ </node>
+ <state name="wait2">
+ <timer duedate="2 seconds" transition="continue" />
+ <transition name="continue" to="end" />
+ </state>
+ <end-state name="end"></end-state>
+</process-definition>
\ No newline at end of file
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -42,6 +42,7 @@
import org.jboss.internal.soa.esb.soap.OGNLUtils;
import org.jboss.internal.soa.esb.util.StreamUtils;
import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.listeners.ListenerTagNames;
import org.jboss.soa.esb.listeners.message.MessageDeliverException;
import org.jboss.soa.esb.http.HttpClientFactory;
import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
@@ -319,11 +320,26 @@
// Create the SoapUIInvoker instance for this SOAPClient...
soapUIInvoker = new SoapUIInvoker();
}
+
+ @Override
+ public void destroy() throws ActionLifecycleException {
+ if (httpclient != null) {
+ HttpClientFactory.shutdown(httpclient);
+ }
+ super.destroy();
+ }
private void extractHttpClientProps(ConfigTree config) {
ConfigTree[] httpClientConfigTrees = config.getChildren("http-client-property");
httpClientProps.setProperty(HttpClientFactory.TARGET_HOST_URL, wsdl);
+ final ConfigTree parent = config.getParent() ;
+ if (parent != null) {
+ final String maxThreads = config.getParent().getAttribute(ListenerTagNames.MAX_THREADS_TAG) ;
+ if (maxThreads != null) {
+ httpClientProps.setProperty(HttpClientFactory.MAX_TOTAL_CONNECTIONS, maxThreads) ;
+ }
+ }
// The HttpClient properties are attached under the factory class/impl property as <http-client-property name="x" value="y" /> nodes
for(ConfigTree httpClientProp : httpClientConfigTrees) {
@@ -342,7 +358,7 @@
try {
params = (Map) payloadProxy.getPayload(message);
} catch (MessageDeliverException e) {
- throw new ActionProcessingException("No params. SOAP message parameters must either be set as the default message body payload, or set on the body under the key defined in the 'paramsLocation' acton property.");
+ throw new ActionProcessingException("Could not locate SOAP message parameters from payload", e) ;
}
if(params.isEmpty()) {
@@ -456,7 +472,7 @@
Map<String, String> map = new LinkedHashMap<String, String>();
try {
- DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
+ DocumentBuilder docBuilder = getDocBuilder() ;
Document doc = docBuilder.parse(new InputSource(new StringReader(response)));
Element graphRootElement = getGraphRootElement(doc.getDocumentElement());
@@ -471,7 +487,7 @@
return map;
}
-
+
private void populateResponseOgnlMap(Map<String, String> map, Element element) {
NodeList children = element.getChildNodes();
int childCount = children.getLength();
@@ -527,6 +543,10 @@
return factory;
}
+ private static synchronized DocumentBuilder getDocBuilder() throws ParserConfigurationException {
+ return docBuilderFactory.newDocumentBuilder();
+ }
+
private void configureXStreamDeserializer(ConfigTree[] xstreamAliases) throws ConfigurationException {
responseXStreamDeserialzer = new XStream();
for(ConfigTree xstreamAlias : xstreamAliases) {
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -40,7 +40,6 @@
import org.jboss.system.ServiceMBeanSupport;
import org.milyn.xml.XmlUtil;
import org.milyn.Smooks;
-import org.milyn.SmooksUtil;
import org.milyn.resource.URIResourceLocator;
import org.w3c.dom.*;
import org.xml.sax.SAXException;
@@ -62,7 +61,7 @@
private static final String IS_CLONE_ATTRIB = "is-clone";
private static Logger logger = Logger.getLogger(SoapUIClientService.class);
private Map<String, WsdlInterface[]> wsdls = new HashMap<String, WsdlInterface[]>();
- private DocumentBuilder docBuilder;
+ private DocumentBuilderFactory docBuilderFactory ;
private Map<String, Smooks> smooksCache;
private ESBProperties properties;
@@ -72,13 +71,8 @@
public SoapUIClientService() throws ConfigurationException {
properties = new ESBProperties("/soapui-client.sar.properties");
- DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
+ docBuilderFactory = DocumentBuilderFactory.newInstance();
docBuilderFactory.setNamespaceAware(true);
- try {
- docBuilder = docBuilderFactory.newDocumentBuilder();
- } catch (ParserConfigurationException e) {
- throw new RuntimeException("Failed to construct DocumentBuilder instance.", e);
- }
int smooksLRUCacheSize = properties.getIntProperty("smooks.lru.cache.size", 30);
smooksCache = new LRUCache<String, Smooks>(smooksLRUCacheSize);
}
@@ -145,6 +139,19 @@
return operationInst;
}
}
+
+ // Try clearing WSDL cache, WSDL may have updated
+ wsdls.remove(wsdl);
+ wsdlInterfaces = getWsdlInterfaces(wsdl, httpClientProps);
+
+ for (WsdlInterface wsdlInterface : wsdlInterfaces) {
+ Operation operationInst = wsdlInterface.getOperationByName(operation);
+
+ if (operationInst != null) {
+ return operationInst;
+ }
+ }
+
throw new UnsupportedOperationException("Operation '" + operation + "' not supported by WSDL '" + wsdl + "'.");
}
@@ -155,7 +162,7 @@
}
private String buildRequest(String soapMessage, Map params, String smooksResource, String soapNs) throws IOException, SAXException {
- Document messageDoc = docBuilder.parse(new ByteArrayInputStream(soapMessage.getBytes()));
+ Document messageDoc = getDocBuilder().parse(new ByteArrayInputStream(soapMessage.getBytes()));
Element docRoot = messageDoc.getDocumentElement();
@@ -386,4 +393,13 @@
element.removeAttributeNS(OGNLUtils.JBOSSESB_SOAP_NS, OGNLUtils.OGNL_ATTRIB);
}
+ private synchronized DocumentBuilder getDocBuilder() throws IOException {
+ try {
+ return docBuilderFactory.newDocumentBuilder();
+ } catch (final ParserConfigurationException pce) {
+ final IOException ioe = new IOException("Could not create document builder") ;
+ ioe.initCause(pce) ;
+ throw ioe ;
+ }
+ }
}
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/MonitoringSessionFactory.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/MonitoringSessionFactory.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/MonitoringSessionFactory.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -79,7 +79,7 @@
try {
sessionFactory = new Configuration().configure("monitoring.cfg.xml").buildSessionFactory();
} catch (Exception e) {
- m_Logger.error("", e);
+ m_Logger.error("MonitoringSessionFactory failed to initialize!", e);
}
}
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollector.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollector.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollector.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -31,6 +31,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.Vector;
import javax.management.MBeanAttributeInfo;
import javax.management.MBeanInfo;
@@ -43,6 +44,8 @@
import org.apache.log4j.Logger;
import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.soa.esb.monitoring.MonitoringSessionFactory;
import org.jboss.soa.esb.monitoring.StatisticsBean;
@@ -86,11 +89,22 @@
}
public List getClassPatterns() {
- Session sess = (Session) MonitoringSessionFactory.getInstance().openSession();
- sess.beginTransaction();
- List result = sess.createQuery("from JMXPattern").list();
- sess.close();
- return result;
+ SessionFactory sf = MonitoringSessionFactory.getInstance();
+
+ if (sf != null)
+ {
+ Session sess = (Session) sf.openSession();
+ sess.beginTransaction();
+ List result = sess.createQuery("from JMXPattern").list();
+ sess.close();
+ return result;
+ }
+ else
+ {
+ logger.warn("DataCollector.getClassPatterns could not get MonitoringSessionFactory instance!");
+
+ return null;
+ }
}
public List<ObjectName> getObjectNames(JMXPattern jmc, MBeanServerConnection server) {
@@ -157,14 +171,20 @@
public void collectData() {
List jmxPatterns = getClassPatterns();
- for (int i = 0; i < jmxPatterns.size(); i++) {
- JMXPattern jmxc = (JMXPattern) jmxPatterns.get(i);
- List<ObjectName> objectNames = getObjectNames(jmxc, server);
- for (int j = 0; j < objectNames.size(); j++) {
- ObjectName on = (ObjectName) objectNames.get(j);
- insertAttributes(on);
+
+ if (jmxPatterns != null)
+ {
+ for (int i = 0; i < jmxPatterns.size(); i++) {
+ JMXPattern jmxc = (JMXPattern) jmxPatterns.get(i);
+ List<ObjectName> objectNames = getObjectNames(jmxc, server);
+ for (int j = 0; j < objectNames.size(); j++) {
+ ObjectName on = (ObjectName) objectNames.get(j);
+ insertAttributes(on);
+ }
}
}
+ else
+ logger.debug("DataCollector.collectData has no jmxPatterns!");
}
public StatisticsData getData() {
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/Invoker.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/Invoker.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/Invoker.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,3 +1,25 @@
+/*
+ * 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.monitoring.client;
import java.io.IOException;
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollector.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollector.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollector.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,3 +1,25 @@
+/*
+ * 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.monitoring.client;
import java.io.IOException;
@@ -22,6 +44,8 @@
import org.apache.log4j.Logger;
import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.soa.esb.message.body.content.ServiceControlCommand;
import org.jboss.soa.esb.monitoring.MonitoringSessionFactory;
@@ -57,11 +81,22 @@
}
public List getClassPatterns() {
- Session sess = (Session) MonitoringSessionFactory.getInstance().openSession();
- sess.beginTransaction();
- List result = sess.createQuery("from JMXPattern").list();
- sess.close();
- return result;
+ SessionFactory sf = MonitoringSessionFactory.getInstance();
+
+ if (sf != null)
+ {
+ Session sess = (Session) sf.openSession();
+ sess.beginTransaction();
+ List result = sess.createQuery("from JMXPattern").list();
+ sess.close();
+ return result;
+ }
+ else
+ {
+ logger.warn("OperationsCollector.getClassPatterns could not get MonitoringSessionFactory instance!");
+
+ return null;
+ }
}
public List<ObjectName> getObjectNames(JMXPattern jmc, MBeanServerConnection server) {
@@ -128,14 +163,20 @@
public void collectData() {
List jmxPatterns = getClassPatterns();
- for (int i = 0; i < jmxPatterns.size(); i++) {
- JMXPattern jmxc = (JMXPattern) jmxPatterns.get(i);
- List<ObjectName> objectNames = getObjectNames(jmxc, server);
- for (int j = 0; j < objectNames.size(); j++) {
- ObjectName on = (ObjectName) objectNames.get(j);
- insertOperations(on);
+
+ if (jmxPatterns != null)
+ {
+ for (int i = 0; i < jmxPatterns.size(); i++) {
+ JMXPattern jmxc = (JMXPattern) jmxPatterns.get(i);
+ List<ObjectName> objectNames = getObjectNames(jmxc, server);
+ for (int j = 0; j < objectNames.size(); j++) {
+ ObjectName on = (ObjectName) objectNames.get(j);
+ insertOperations(on);
+ }
}
}
+ else
+ logger.debug("OperationsCollector.collectData has no jmxPatterns!");
}
public OperationsData getData() {
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFiler.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFiler.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFiler.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -26,6 +26,8 @@
import org.apache.log4j.Logger;
import org.hibernate.Session;
import org.hibernate.Transaction;
+import org.jboss.soa.esb.common.TransactionStrategy;
+import org.jboss.soa.esb.common.TransactionStrategyException;
import org.jboss.soa.esb.monitoring.MonitoringSessionFactory;
import org.jboss.soa.esb.monitoring.StatisticsBean;
import org.jboss.soa.esb.monitoring.StatisticsData;
@@ -160,6 +162,21 @@
* @param f_sb statistics bean
*/
public void insertStatistics(StatisticsBean f_sb) {
+ TransactionStrategy txStrategy = TransactionStrategy.getStrategy();
+ Object txHandle = null;
+
+ if (txStrategy != null)
+ {
+ try
+ {
+ txHandle = txStrategy.suspend();
+ }
+ catch (TransactionStrategyException ex)
+ {
+ // if it failed, then the next work will fail too.
+ }
+ }
+
Session sess = null;
Transaction tx = null;
try {
@@ -187,6 +204,18 @@
sess.flush();
sess.close();
sess = null;
+
+ if (txHandle != null)
+ {
+ try
+ {
+ txStrategy.resume(txHandle);
+ }
+ catch (TransactionStrategyException ex)
+ {
+ logger.error("Problem resuming transaction!", ex);
+ }
+ }
}
}
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/Filer.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/Filer.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/Filer.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,3 +1,25 @@
+/*
+ * 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.monitoring.server;
public interface Filer {
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/InvokerFiler.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/InvokerFiler.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/InvokerFiler.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -25,6 +25,8 @@
import org.apache.log4j.Logger;
import org.hibernate.Session;
import org.hibernate.Transaction;
+import org.jboss.soa.esb.common.TransactionStrategy;
+import org.jboss.soa.esb.common.TransactionStrategyException;
import org.jboss.soa.esb.monitoring.MonitoringSessionFactory;
import org.jboss.soa.esb.monitoring.pojo.JMXOperation;
import org.jboss.soa.esb.monitoring.pojo.JMXOperationResult;
@@ -65,6 +67,20 @@
* @see org.jboss.soa.esb.monitoring.server.Filer#persistData()
*/
public void persistData() {
+ TransactionStrategy txS = TransactionStrategy.getStrategy();
+ Object txHandle = null;
+
+ if (txS != null)
+ {
+ try
+ {
+ txHandle = txS.suspend();
+ }
+ catch (TransactionStrategyException ex)
+ {
+ }
+ }
+
Session sess = null;
Transaction tx = null;
try {
@@ -86,6 +102,18 @@
sess.flush();
sess.close();
sess = null;
+
+ if (txHandle != null)
+ {
+ try
+ {
+ txS.resume(txHandle);
+ }
+ catch (TransactionStrategyException ex)
+ {
+ logger.error("Problem resuming transaction!", ex);
+ }
+ }
}
}
}
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/OperationsFiler.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/OperationsFiler.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/OperationsFiler.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -28,6 +28,8 @@
import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.Transaction;
+import org.jboss.soa.esb.common.TransactionStrategy;
+import org.jboss.soa.esb.common.TransactionStrategyException;
import org.jboss.soa.esb.message.body.content.ServiceControlCommand;
import org.jboss.soa.esb.monitoring.MonitoringSessionFactory;
import org.jboss.soa.esb.monitoring.OperationsData;
@@ -93,6 +95,20 @@
public void insertOperations(ServiceControlCommand f_ob) {
Session sess = null;
Transaction tx = null;
+ TransactionStrategy txS = TransactionStrategy.getStrategy();
+ Object txHandle = null;
+
+ if (txS != null)
+ {
+ try
+ {
+ txHandle = txS.suspend();
+ }
+ catch (TransactionStrategyException ex)
+ {
+ }
+ }
+
try {
sess = (Session) MonitoringSessionFactory.getInstance().openSession();
tx = sess.beginTransaction();
@@ -119,6 +135,18 @@
sess.flush();
sess.close();
sess = null;
+
+ if (txHandle != null)
+ {
+ try
+ {
+ txS.resume(txHandle);
+ }
+ catch (TransactionStrategyException ex)
+ {
+ logger.error("Problem resuming transaction!", ex);
+ }
+ }
}
}
@@ -130,6 +158,20 @@
public void updateActiveFlag(String serverName) {
Session sess = null;
Transaction tx = null;
+ TransactionStrategy txS = TransactionStrategy.getStrategy();
+ Object txHandle = null;
+
+ if (txS != null)
+ {
+ try
+ {
+ txHandle = txS.suspend();
+ }
+ catch (TransactionStrategyException ex)
+ {
+ }
+ }
+
try {
sess = (Session) MonitoringSessionFactory.getInstance().openSession();
tx = sess.beginTransaction();
@@ -151,6 +193,18 @@
sess.flush();
sess.close();
sess = null;
+
+ if (txHandle != null)
+ {
+ try
+ {
+ txS.resume(txHandle);
+ }
+ catch (TransactionStrategyException ex)
+ {
+ logger.error("Problem resuming transaction!", ex);
+ }
+ }
}
}
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/build.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/build.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -75,7 +75,6 @@
<echo message="Cleaning..."/>
<delete dir="${build.location}" />
- <ant dir="quickstarts" target="ci-clean" />
</target>
<target name="start-server" depends="esb.setup-esb">
Property changes on: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts
___________________________________________________________________
Name: svn:ignore
- output
build
+ output
build
junit*.properties
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/build.xml 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/build.xml 2008-01-14 16:11:24 UTC (rev 17818)
@@ -89,21 +89,25 @@
<include name="bpm_orchestration2/build/classes"/>
<include name="bpm_orchestration3/build/classes"/>
<include name="business_rules_service/build/classes"/>
+ <include name="custom_action/build/classes"/>
<include name="deadletter/build/classes"/>
<include name="dynamic_router/build/classes"/>
<include name="exceptions_faults/build/classes"/>
<include name="fun_cbr/build/classes"/>
+ <include name="groovy_gateway/build/classes"/>
<include name="helloworld/build/classes"/>
<include name="helloworld_action/build/classes"/>
<include name="helloworld_db_registration/build/classes"/>
<include name="helloworld_file_action/build/classes"/>
<include name="helloworld_file_notifier/build/classes"/>
<include name="helloworld_sql_action/build/classes"/>
+ <include name="jms_secured/build/classes"/>
<include name="jms_topic/build/classes"/>
<include name="load_generator/build/classes"/>
<include name="load_generator/load_generator_classes"/>
<include name="messagefilter/build/classes"/>
<include name="messagestore/build/classes"/>
+ <include name="native_client/build/classes"/>
<include name="recipient_list/build/classes"/>
<include name="scheduled_services/build/classes"/>
<include name="scripting_groovy/build/classes"/>
@@ -120,7 +124,7 @@
<include name="webservice_consumer1/build/classes"/>
<include name="webservice_consumer2/build/classes"/>
<include name="webservice_producer/build/classes"/>
- <include name="wiretap/build/classes"/>
+ <include name="wiretap/build/classes"/>
</dirset>
<fileset dir="${product.lib.ext}" includes="*.jar"/>
@@ -172,7 +176,7 @@
<target name="ci-clean" depends="init, clean-esb"/>
- <target name="compile" depends="compile-esb">
+ <target name="compile" depends="clean, compile-esb">
<echo message="Compiling JUnit based Quickstart tests..."/>
@@ -193,19 +197,24 @@
<exec-quickstart quickstart="bpm_orchestration2" target="clean"/>
<exec-quickstart quickstart="bpm_orchestration3" target="clean"/>
<exec-quickstart quickstart="business_rules_service" target="clean"/>
+ <exec-quickstart quickstart="custom_action" target="clean"/>
<exec-quickstart quickstart="deadletter" target="clean"/>
<exec-quickstart quickstart="dynamic_router" target="clean"/>
<exec-quickstart quickstart="exceptions_faults" target="clean"/>
<exec-quickstart quickstart="fun_cbr" target="clean"/>
+ <exec-quickstart quickstart="groovy_gateway" target="clean"/>
<exec-quickstart quickstart="helloworld" target="clean"/>
<exec-quickstart quickstart="helloworld_action" target="clean"/>
<exec-quickstart quickstart="helloworld_db_registration" target="clean"/>
<exec-quickstart quickstart="helloworld_file_action" target="clean"/>
<exec-quickstart quickstart="helloworld_file_notifier" target="clean"/>
<exec-quickstart quickstart="helloworld_sql_action" target="clean"/>
+ <exec-quickstart quickstart="jms_secured" target="clean"/>
+ <exec-quickstart quickstart="jms_topic" target="clean"/>
<exec-quickstart quickstart="load_generator" target="clean"/>
<exec-quickstart quickstart="messagefilter" target="clean"/>
<exec-quickstart quickstart="messagestore" target="clean"/>
+ <exec-quickstart quickstart="native_client" target="clean"/>
<exec-quickstart quickstart="recipient_list" target="clean"/>
<exec-quickstart quickstart="scheduled_services" target="clean"/>
<exec-quickstart quickstart="scripting_groovy" target="clean"/>
@@ -231,24 +240,27 @@
<exec-quickstart quickstart="bpm_orchestration2" target="prepare-deployment"/>
<exec-quickstart quickstart="bpm_orchestration3" target="prepare-deployment"/>
<exec-quickstart quickstart="business_rules_service" target="prepare-deployment"/>
-
+ <exec-quickstart quickstart="custom_action" target="prepare-deployment"/>
<exec-quickstart quickstart="deadletter" target="prepare-deployment"/>
<exec-quickstart quickstart="dynamic_router" target="prepare-deployment"/>
<exec-quickstart quickstart="exceptions_faults" target="prepare-deployment"/>
<exec-quickstart quickstart="fun_cbr" target="prepare-deployment"/>
+ <exec-quickstart quickstart="groovy_gateway" target="prepare-deployment"/>
<exec-quickstart quickstart="helloworld" target="prepare-deployment"/>
<exec-quickstart quickstart="helloworld_action" target="prepare-deployment"/>
<exec-quickstart quickstart="helloworld_db_registration" target="prepare-deployment"/>
<exec-quickstart quickstart="helloworld_file_action" target="prepare-deployment"/>
<exec-quickstart quickstart="helloworld_file_notifier" target="prepare-deployment"/>
<exec-quickstart quickstart="helloworld_sql_action" target="prepare-deployment"/>
+ <exec-quickstart quickstart="jms_secured" target="prepare-deployment"/>
<exec-quickstart quickstart="jms_topic" target="prepare-deployment"/>
<!--
<exec-quickstart quickstart="load_generator" target="prepare-deployment"/>
-->
<exec-quickstart quickstart="messagefilter" target="prepare-deployment"/>
<exec-quickstart quickstart="messagestore" target="prepare-deployment"/>
+ <exec-quickstart quickstart="native_client" target="prepare-deployment"/>
<exec-quickstart quickstart="recipient_list" target="prepare-deployment"/>
<exec-quickstart quickstart="scheduled_services" target="prepare-deployment"/>
<exec-quickstart quickstart="scripting_groovy" target="prepare-deployment"/>
@@ -272,20 +284,24 @@
<include name="bpm_orchestration2/build/*.esb"/>
<include name="bpm_orchestration3/build/*.esb"/>
<include name="business_rules_service/build/*.esb"/>
+ <include name="custom_action/build/*.esb"/>
<include name="deadletter/build/*.esb"/>
<include name="dynamic_router/build/*.esb"/>
<include name="exceptions_faults/build/*.esb"/>
<include name="fun_cbr/build/*.esb"/>
+ <include name="groovy_gateway/build/*.esb"/>
<include name="helloworld/build/*.esb"/>
<include name="helloworld_action/build/*.esb"/>
<include name="helloworld_db_registration/build/*.esb"/>
<include name="helloworld_file_action/build/*.esb"/>
<include name="helloworld_file_notifier/build/*.esb"/>
<include name="helloworld_sql_action/build/*.esb"/>
+ <include name="jms_secured/build/*.esb"/>
<include name="jms_topic/build/*.esb"/>
<include name="load_generator/build/*.esb"/>
<include name="messagefilter/build/*.esb"/>
<include name="messagestore/build/*.esb"/>
+ <include name="native_client/build/*.esb"/>
<include name="recipient_list/build/*.esb"/>
<include name="scripting_groovy/build/*.esb"/>
<include name="scheduled_services/build/*.esb"/>
@@ -300,6 +316,7 @@
<include name="transform_XML2XML_date_manipulation/build/*.esb"/>
<include name="transform_XML2XML_simple/build/*.esb"/>
<include name="webservice_consumer1/build/*.esb"/>
+ <include name="webservice_consumer1/build/*.war"/>
<include name="webservice_consumer2/build/*.esb"/>
<include name="webservice_producer/build/*.esb"/>
<include name="wiretap/build/*.esb"/>
@@ -343,6 +360,10 @@
<fileset dir="${qa.quickstarts.src}">
<include name="**/${tests.filter}Test.java"/>
<exclude name="${tests.exclude}"/>
+ <!-- Aggregator QS only runs standalone -->
+ <exclude name="**/AggregatorTest.java"/>
+ <!-- GroovyGateway QS requires UI interaction -->
+ <exclude name="**/GroovyGatewayTest.java"/>
<!-- SpringJPetStore requires additional configuration
files and hsqldb. The QS needs some work before
the CI test can run. -->
@@ -359,18 +380,18 @@
<exclude name="**/GroovyGatewayTest.java"/>
<exclude name="**/LoadGeneratorTest.java"/>
<exclude name="**/StaticRouterTest.java"/>
- <exclude name="**/WebserviceAdapterTest.java"/>
<exclude name="**/HelloWorldDBRegistrationTest.java"/>
+ <!-- Requires ActiveBPEL and AS -->
<exclude name="**/WebserviceBPELTest.java"/>
- <!-- The WebService quickstarts require jbossws, which
- requires jars that are not installed with
- esb-server (jboss-client.jar for example) -->
+ <!-- The WebService ws-* quickstarts require AS -->
+ <exclude name="**/WebServiceWSAddressingTest.java"/>
+ <exclude name="**/WebServiceWSSecurityTest.java"/>
+ <!-- The WSConsumer QS requires war deployment -->
+ <exclude name="**/WebserviceAdapterTest.java"/>
+ <exclude name="**/WebserviceBPELTest.java"/>
<exclude name="**/WebServiceConsumer1Test.java"/>
<exclude name="**/WebServiceConsumer2Test.java"/>
<exclude name="**/WebServiceProducerTest.java"/>
- <exclude name="**/WebServiceMTOMTest.java"/>
- <exclude name="**/WebServiceWSAddressingTest.java"/>
- <exclude name="**/WebServiceWSSecurityTest.java"/>
</fileset>
</batchtest>
<classpath>
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/resources/transformedmessageCSV2XML.log
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/resources/transformedmessageCSV2XML.log 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/resources/transformedmessageCSV2XML.log 2008-01-14 16:11:24 UTC (rev 17818)
@@ -1,12 +1,35 @@
-<Order netAmount="59.97" orderDate="Wed Nov 15 13:45:28 EST 2006"
- orderId="1" statusCode="0" tax="4.95" totalAmount="64.92">
- <Customer firstName="Harry" lastName="Fletcher" state="SD" userName="user1"/>
- <OrderLines>
- <OrderLine posistion="1" quantity="1">
- <Product price="" productId="364" title=""/>
- </OrderLine>
- <OrderLine posistion="1" quantity="1">
- <Product price="" productId="364" title=""/>
- </OrderLine>
- </OrderLines>
-</Order>
+<orders>
+ <Order netAmount="59.97" orderDate="Wed Nov 15 13:45:28 EST 2006" orderId="1" statusCode="0" tax="4.95" totalAmount="64.92">
+ <Customer firstName="Harry" lastName="Fletcher" state="SD" userName="user1"></Customer>
+ <OrderLines>
+ <OrderLine posistion="1" quantity="1">
+ <Product price="29.98" productId="364" title="The 40-Year-Old Virgin"></Product>
+ </OrderLine>
+ <OrderLine posistion="2" quantity="1">
+ <Product price="29.99" productId="299" title="Pulp Fiction"></Product>
+ </OrderLine>
+ </OrderLines>
+ </Order>
+ <Order netAmount="60.00" orderDate="Wed Nov 15 13:45:28 EST 2007" orderId="2" statusCode="0" tax="4.95" totalAmount="64.92">
+ <Customer firstName="Kalle" lastName="Anka" state="SD" userName="user2"></Customer>
+ <OrderLines>
+ <OrderLine posistion="1" quantity="1">
+ <Product price="29.98" productId="364" title="Fletch"></Product>
+ </OrderLine>
+ <OrderLine posistion="2" quantity="1">
+ <Product price="29.99" productId="299" title="Fletch Lives"></Product>
+ </OrderLine>
+ </OrderLines>
+ </Order>
+ <Order netAmount="60.00" orderDate="Wed Nov 15 13:45:28 EST 2007" orderId="3" statusCode="0" tax="4.95" totalAmount="64.92">
+ <Customer firstName="Donald" lastName="Duck" state="SD" userName="user3"></Customer>
+ <OrderLines>
+ <OrderLine posistion="1" quantity="1">
+ <Product price="29.98" productId="364" title="The Goonies"></Product>
+ </OrderLine>
+ <OrderLine posistion="2" quantity="1">
+ <Product price="29.99" productId="4" title="Happy Gilmor"></Product>
+ </OrderLine>
+ </OrderLines>
+ </Order>
+</orders>
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/AggregatorTest.java (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/AggregatorTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/AggregatorTest.java (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/AggregatorTest.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -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.quickstart.test;
+
+import junit.framework.Test;
+
+/**
+ * This is intended to be a placeholder for a test for the aggregator QS. The aggregator
+ * QS only runs standalone - does not run within AS, so
+ *
+ * @author tcunning
+ *
+ */
+public class AggregatorTest extends AbstractQuickstartTestCase {
+ public AggregatorTest(String name) {
+ super(name);
+ }
+
+ public void testMessage() throws Exception {
+ }
+
+ public static Test suite() throws Exception {
+ return getDeploySetup(HelloWorldTest.class, "QuickstartMessageStoreServer.sar, Quickstart_Aggregator.esb");
+ }
+}
\ No newline at end of file
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/BPMOrchestration2Test.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/BPMOrchestration2Test.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/BPMOrchestration2Test.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -26,7 +26,7 @@
import org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.test.SendJMSMessageStart;
/**
- * CI test for the bpmorchestration3 test.
+ * CI test for the bpmorchestration2 test.
*
* @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
*/
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/CustomActionTest.java (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/CustomActionTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/CustomActionTest.java (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/CustomActionTest.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -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.quickstart.test;
+
+import org.jboss.soa.esb.samples.quickstart.customaction.test.SendJMSMessage;
+
+import junit.framework.Test;
+
+/**
+ * CI test for customaction test.
+ *
+ * @author tcunning
+ */
+public class CustomActionTest extends AbstractQuickstartTestCase {
+ private static final String JMS_MESSAGE = "Via Gateway";
+
+ public CustomActionTest(String name) {
+ super(name);
+ }
+
+ public void testMessage() throws Exception {
+ clearMessages() ;
+ sendMessage();
+ final String[] sinkMessages = waitForMessages(1, 30000) ;
+ assertTrue("Expected to find string " + JMS_MESSAGE + " found " + sinkMessages[0],
+ sinkMessages[0].contains(JMS_MESSAGE));
+ }
+
+ public void sendMessage() throws Exception {
+ SendJMSMessage sm = new SendJMSMessage();
+ sm.setupConnection();
+ sm.sendAMessage(JMS_MESSAGE) ;
+ sm.stop();
+ }
+
+ public static Test suite() throws Exception {
+ return getDeploySetup(CustomActionTest.class, "QuickstartMessageStoreServer.sar, Quickstart_custom_action.esb");
+ }
+}
\ No newline at end of file
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/GroovyGatewayTest.java (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/GroovyGatewayTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/GroovyGatewayTest.java (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/GroovyGatewayTest.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -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.quickstart.test;
+
+import junit.framework.Test;
+
+/**
+ * This is intended to be a placeholder for a test for the groovygateway QS. The groovygateway
+ * QS requires GUI interaction, so this is a placeholder for a future test.
+ *
+ * @author tcunning
+ *
+ */
+public class GroovyGatewayTest extends AbstractQuickstartTestCase {
+ public GroovyGatewayTest(String name) {
+ super(name);
+ }
+
+ public void testMessage() throws Exception {
+ }
+
+ public static Test suite() throws Exception {
+ return getDeploySetup(GroovyGatewayTest.class, "QuickstartMessageStoreServer.sar, Quickstart_groovy_gateway.esb");
+ }
+}
\ No newline at end of file
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/JMSSecuredTest.java (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/JMSSecuredTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/JMSSecuredTest.java (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/JMSSecuredTest.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,56 @@
+/*
+ * 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.quickstart.test;
+
+import junit.framework.Test;
+
+import org.jboss.soa.esb.samples.quickstart.jmssecured.test.SendJMSMessage;
+
+/**
+ * CI test for the jms_secured quickstart.
+ *
+ * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
+ */
+public class JMSSecuredTest extends AbstractQuickstartTestCase {
+ private static final String JMS_MESSAGE = "Hello Secured JMS World";
+
+ public JMSSecuredTest(String name) {
+ super(name);
+ }
+
+ public void testMessage() throws Exception {
+ clearMessages();
+ sendMessage();
+ checkMessages(30000, JMS_MESSAGE);
+ }
+
+ public void sendMessage() throws Exception {
+ SendJMSMessage sm = new SendJMSMessage();
+ sm.setupConnection();
+ sm.sendAMessage(JMS_MESSAGE);
+ sm.stop();
+ }
+
+ public static Test suite() throws Exception {
+ return getDeploySetup(JMSSecuredTest.class, "QuickstartMessageStoreServer.sar, Quickstart_JMS_Secured.esb");
+ }
+}
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/NativeClientTest.java (from rev 17817, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR6/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/NativeClientTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/NativeClientTest.java (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/NativeClientTest.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -0,0 +1,42 @@
+/*
+ * 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.quickstart.test;
+
+import junit.framework.Test;
+
+/**
+ * This is intended to be a placeholder for a test for the nativeclient QS.
+ *
+ * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
+ */
+public class NativeClientTest extends AbstractQuickstartTestCase {
+ public NativeClientTest(String name) {
+ super(name);
+ }
+
+ public void testMessage() throws Exception {
+ }
+
+ public static Test suite() throws Exception {
+ return getDeploySetup(NativeClientTest.class, "QuickstartMessageStoreServer.sar, Quickstart_native_client.esb");
+ }
+}
\ No newline at end of file
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/StaticRouterTest.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/StaticRouterTest.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/StaticRouterTest.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -25,7 +25,7 @@
/**
- * Sample client for the jboss container.
+ * CI test for the staticrouter quickstart.
*
* @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
*/
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformCSV2XMLTest.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformCSV2XMLTest.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformCSV2XMLTest.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -37,12 +37,11 @@
extends AbstractQuickstartTestCase {
private static final String FILE_NAME = "transformedmessageCSV2XML.log";
-
public TransformCSV2XMLTest(String name)
{
super(name);
}
-
+
public void testMessage() throws Exception
{
clearMessages() ;
@@ -59,8 +58,8 @@
{
is.close() ;
}
- final boolean match = Helpers.compareXMLContent(expectedString, messages[0]) ;
- assertTrue("Unexpected response: " + messages[0], match) ;
+ final boolean match = Helpers.compareXMLContent(expectedString, messages[0]) ;
+ assertTrue("Unexpected response: " + messages[0] + " , expected, " + expectedString, match) ;
}
public void sendMessage() throws Exception
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebServiceConsumer1Test.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebServiceConsumer1Test.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebServiceConsumer1Test.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -23,6 +23,8 @@
import junit.framework.Test;
+import org.jboss.soa.esb.samples.quickstart.webservice_consumer1.test.SendEsbMessage;
+
import org.jboss.soa.esb.samples.quickstart.webservice_consumer1.test.SendJMSMessage;
/**
@@ -31,7 +33,7 @@
* @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
*/
public class WebServiceConsumer1Test extends AbstractQuickstartTestCase {
- private static final String JMS_MESSAGE = "WebServiceConsumer1Test message";
+ private static final String JMS_MESSAGE = "Jimbo";
public WebServiceConsumer1Test(String name) {
super(name);
@@ -39,13 +41,16 @@
public void testMessage() throws Exception {
clearMessages() ;
- sendMessage() ;
- checkMessages(30000, JMS_MESSAGE) ;
+ sendMessage();
+ String[] sinkMessages = waitForMessages(1, 30000);
+ assertTrue("Expected to find string " + JMS_MESSAGE + " found " + sinkMessages[0],
+ sinkMessages[0].contains(JMS_MESSAGE));
}
public void sendMessage() throws Exception {
SendJMSMessage sm = new SendJMSMessage();
- sm.sendAMessage("Jimbo");
+ sm.setupConnection();
+ sm.sendAMessage(JMS_MESSAGE);
sm.stop();
}
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebServiceConsumer2Test.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebServiceConsumer2Test.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebServiceConsumer2Test.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -23,7 +23,7 @@
import junit.framework.Test;
-import org.jboss.soa.esb.samples.quickstart.helloworld.test.SendJMSMessage;
+import org.jboss.soa.esb.samples.quickstart.webservice_consumer2.test.SendJMSMessage;
/**
* CI test for the webservice_consumer2 quickstart.
@@ -31,7 +31,8 @@
* @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
*/
public class WebServiceConsumer2Test extends AbstractQuickstartTestCase {
- private static final String JMS_MESSAGE = "WebServiceConsumer2Test message";
+ private static final String JMS_MESSAGE = "Jimbo";
+ private static final String RESULT_STRING = "{processOrderResponse.return.comment=order processed, processOrderResponse.return.id=1, processOrderResponse.return.returnCode=1}";
public WebServiceConsumer2Test(String name) {
super(name);
@@ -39,8 +40,10 @@
public void testMessage() throws Exception {
clearMessages() ;
- sendMessage() ;
- checkMessages(30000, JMS_MESSAGE) ;
+ sendMessage();
+ String[] sinkMessages = waitForMessages(1, 30000);
+ assertTrue("Expected to find string " + RESULT_STRING + " found " + sinkMessages[0],
+ sinkMessages[0].equals(RESULT_STRING));
}
public void sendMessage() throws Exception {
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebServiceProducerTest.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebServiceProducerTest.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebServiceProducerTest.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -6,6 +6,7 @@
import org.jboss.soa.esb.samples.quickstart.webserviceproducer.test.SendMessage;
import org.jboss.soa.esb.testutils.FileUtil;
+import org.jgroups.protocols.JMS;
/**
* CI test for the webservice_producer quickstart.
@@ -13,7 +14,10 @@
* @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
*/
public class WebServiceProducerTest extends AbstractQuickstartTestCase {
- private static final String JMS_MESSAGE = "WebServiceProducerTest message";
+ private static final String JMS_MESSAGE = "jms";
+ private static final String RESULT_STRING = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"
+ + "<env:Header></env:Header><env:Body><ns2:sayGoodbyeResponse xmlns:ns2=\"http://webservice_producer/goodbyeworld\">"
+ + "<return>... Ah Goodbye then!!!! - Goodbye!!</return></ns2:sayGoodbyeResponse></env:Body></env:Envelope>";
public WebServiceProducerTest(String name) {
super(name);
@@ -22,7 +26,9 @@
public void testMessage() throws Exception {
clearMessages() ;
sendMessage() ;
- checkMessages(30000, JMS_MESSAGE) ;
+ String[] sinkMessages = waitForMessages(1, 30000);
+ assertTrue("Expected to find string " + RESULT_STRING + " found " + sinkMessages[0],
+ sinkMessages[0].equals(RESULT_STRING));
}
public void sendMessage() throws Exception {
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceAdapterTest.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceAdapterTest.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceAdapterTest.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -25,7 +25,7 @@
/**
- * Sample client for the jboss container.
+ * CI test for the webserviceadapter quickstart.
*
* @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
*/
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceBPELTest.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceBPELTest.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceBPELTest.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -25,7 +25,7 @@
/**
- * Sample client for the jboss container.
+ * CI test for the webserviceBPEL quickstart.
*
* @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
*/
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WiretapTest.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WiretapTest.java 2008-01-14 15:10:23 UTC (rev 17817)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WiretapTest.java 2008-01-14 16:11:24 UTC (rev 17818)
@@ -26,9 +26,9 @@
import org.jboss.soa.esb.samples.quickstart.wiretap.test.SendStaticRouterJMSMessage;
/**
- * Sample client for the jboss container.
+ * Test for wiretap quickstart.
*
- * @author <a href="mailto:"></a>
+ * @author <a href="mailto:tcunning at redhat.com"></a>
* @version $Id: $
*/
More information about the jboss-svn-commits
mailing list