[jboss-svn-commits] JBL Code SVN: r15795 - in labs/jbossesb/workspace/dbevenius/redeliver: product/docs and 77 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Oct 12 04:05:29 EDT 2007
Author: beve
Date: 2007-10-12 04:05:28 -0400 (Fri, 12 Oct 2007)
New Revision: 15795
Added:
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/StoreMessageToFile.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer2/ProcessOrderRequest.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerBean.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/esb/conf/jbm-queue-service.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/esb/conf/jbmq-queue-service.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/services/jbossesb/src/main/resources/message-store-sql/oracle/
labs/jbossesb/workspace/dbevenius/redeliver/product/services/jbossesb/src/main/resources/message-store-sql/oracle/create_database.sql
labs/jbossesb/workspace/dbevenius/redeliver/product/services/jbossesb/src/main/resources/message-store-sql/oracle/drop_database.sql
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/build.xml
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/jndi.properties
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/quickstarts.properties
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/jndi.properties
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageCSV2XML.log
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageDateManipulation.log
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageEDI2XMLGroovyXSL.log
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageXML2POJO.log
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageXML2Simple.log
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/MyAction.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/Stats.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/StatsMBean.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/BPMOrchestrationTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/DynamicRouterTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/FunCBRTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldActionTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldDBRegistrationTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldFileActionTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldSQLActionTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/Helpers.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/RecipientlistTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/ScriptingGroovyTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/SimpleCBRTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/StaticRouterTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformCSV2XMLTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformDateManipulationTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformEDI2XMLGroovyXSLTTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformXML2PojoTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformXMLSimpleTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceAdapterTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceBPELTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WiretapTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Element.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/IdentitySAXHandler.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Node.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Text.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/server/
Removed:
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/tests/
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerWS.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerWSService.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/esb/conf/jbmq-service.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/services/jbossesb/src/main/resources/message-store-sql/oracle/create_database.sql
labs/jbossesb/workspace/dbevenius/redeliver/product/services/jbossesb/src/main/resources/message-store-sql/oracle/drop_database.sql
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/build.xml
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/jndi.properties
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/quickstarts.properties
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/jndi.properties
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageCSV2XML.log
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageDateManipulation.log
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageEDI2XMLGroovyXSL.log
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageXML2POJO.log
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageXML2Simple.log
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/MyAction.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/Stats.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/StatsMBean.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/BPMOrchestrationTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/DynamicRouterTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/FunCBRTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldActionTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldDBRegistrationTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldFileActionTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldSQLActionTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/Helpers.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/RecipientlistTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/ScriptingGroovyTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/SimpleCBRTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/StaticRouterTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformCSV2XMLTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformDateManipulationTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformEDI2XMLGroovyXSLTTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformXML2PojoTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformXMLSimpleTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceAdapterTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceBPELTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WiretapTest.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Element.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/IdentitySAXHandler.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Node.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Text.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/server/
Modified:
labs/jbossesb/workspace/dbevenius/redeliver/
labs/jbossesb/workspace/dbevenius/redeliver/integration-build.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/docs/AdministrationGuide.odt
labs/jbossesb/workspace/dbevenius/redeliver/product/docs/MessageActionGuide.odt
labs/jbossesb/workspace/dbevenius/redeliver/product/docs/MessageActionGuide.pdf
labs/jbossesb/workspace/dbevenius/redeliver/product/docs/services/MessageStore.odt
labs/jbossesb/workspace/dbevenius/redeliver/product/docs/services/MessageTransformation.odt
labs/jbossesb/workspace/dbevenius/redeliver/product/docs/services/MessageTransformation.pdf
labs/jbossesb/workspace/dbevenius/redeliver/product/install/conf/esb.juddi.properties
labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/juddi.war
labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/daffodildb/import.sql
labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/db2/import.sql
labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/derby/import.sql
labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/firebird/import.sql
labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/hsqldb/drop_database.sql
labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/hsqldb/import.sql
labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/informix/import.sql
labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/jdatastore/import.sql
labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/mysql/import.sql
labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/oracle/import.sql
labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/postgresql/import.sql
labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/sybase/import.sql
labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/totalxml/import.sql
labs/jbossesb/workspace/dbevenius/redeliver/product/install/standalone/jbossesb-server-base.zip
labs/jbossesb/workspace/dbevenius/redeliver/product/lib/ext/jboss-messaging-client.jar
labs/jbossesb/workspace/dbevenius/redeliver/product/lib/ext/jboss-remoting.jar
labs/jbossesb/workspace/dbevenius/redeliver/product/lib/ext/juddi-1.0-SNAPSHOT.jar
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/SystemPrintln.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/converters/XStreamToObject.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/couriers/CourierFactory.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResource.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResourceManager.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/util/Util.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/XStreamToObjectUnitTest.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ServiceInvokerUnitTest.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GatewayListenerControllerBaseTest.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld/jboss-esb.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/MyJMSListenerAction.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld_action/jboss-esb.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld_action/src/org/jboss/soa/esb/samples/quickstart/helloworldaction/MyJMSListenerAction.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld_file_action/jboss-esb-unfiltered.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/scripting_groovy/jboss-esb.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_CSV2XML/jboss-esb.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jboss-esb.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2POJO/jboss-esb.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2XML_date_manipulation/SampleOrder.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2XML_date_manipulation/jboss-esb.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2XML_date_manipulation/smooks-res.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2XML_date_manipulation/src/org/jboss/soa/esb/samples/quickstart/transformxml2xmldatemanipulation/test/OrderDate.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2XML_simple/jboss-esb.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/jboss-esb.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer2/MyRequestAction.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/wiretap/jboss-esb.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/build.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/resources/web.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/resources/wsdl/LoanBrokerService.wsdl
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanRequester.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerInterface.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/esb/conf/deployment.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/util/TbBootStrapper.java
labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java
labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management-esb/deployment.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management-esb/src/main/resources/hsqldb/create_database.sql
labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management/monitoring.cfg.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/MonitoringSessionFactory.java
labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/pojo/JMXData.java
labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerJob.java
labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerScheduler.java
labs/jbossesb/workspace/dbevenius/redeliver/qa/build.xml
labs/jbossesb/workspace/dbevenius/redeliver/qa/junit/build.xml
labs/jbossesb/workspace/dbevenius/redeliver/qa/lib/ext/jboss-messaging-client.jar
labs/jbossesb/workspace/dbevenius/redeliver/qa/log4j.xml
Log:
merge from main
Property changes on: labs/jbossesb/workspace/dbevenius/redeliver
___________________________________________________________________
Name: svnmerge-integrated
- /labs/jbossesb/trunk:1-15709
+ /labs/jbossesb/trunk:1-15793
Modified: labs/jbossesb/workspace/dbevenius/redeliver/integration-build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/integration-build.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/integration-build.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -2,19 +2,20 @@
<property name="clean.jms.dest" location="clean.jms"/>
<target name="integration" description="Run Continuous Integration." depends="clean">
+ <!--
+ If you are adding something here then you are probably
+ in the wrong location. This is just a wrapper for the
+ product/qa configurations. All changes should be made
+ within those build.xml files.
+ -->
<ant dir="product" target="ci-integration"/>
- <!--
- <ant dir="product/samples/quickstarts/tests" target="qs-test"/>
- -->
<ant dir="qa" target="ci-test"/>
</target>
<target name="clean" description="Clean the distribution">
<delete file="${clean.jms.dest}"/>
+ <!-- Reversed order for clean -->
+ <ant dir="qa" target="clean"/>
<ant dir="product" target="clean"/>
- <!--
- <ant dir="product/samples/quickstarts/tests" target="qs-clean"/>
- -->
- <ant dir="qa" target="clean"/>
</target>
</project>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/docs/AdministrationGuide.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/docs/MessageActionGuide.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/docs/MessageActionGuide.pdf
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/docs/services/MessageStore.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/docs/services/MessageTransformation.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/docs/services/MessageTransformation.pdf
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/install/conf/esb.juddi.properties
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/install/conf/esb.juddi.properties 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/install/conf/esb.juddi.properties 2007-10-12 08:05:28 UTC (rev 15795)
@@ -43,7 +43,7 @@
juddi.dataSource=java:/juddiDB
# jUDDI database creation
-juddi.createDatabase=true
+juddi.isCreateDatabase=true
juddi.databaseExistsSql=select * from BUSINESS_ENTITY
juddi.sqlFiles=juddi-sql/hsqldb/create_database.sql,juddi-sql/hsqldb/import.sql
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/juddi.war
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/daffodildb/import.sql
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/daffodildb/import.sql 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/daffodildb/import.sql 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,6 +1,6 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,CURTIMESTAMP());
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/db2/import.sql
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/db2/import.sql 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/db2/import.sql 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,6 +1,6 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,CURRENT TIMESTAMP);
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/derby/import.sql
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/derby/import.sql 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/derby/import.sql 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,6 +1,6 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,CURRENT TIMESTAMP);
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/firebird/import.sql
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/firebird/import.sql 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/firebird/import.sql 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,6 +1,6 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,CURRENT_DATE);
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/hsqldb/drop_database.sql
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/hsqldb/drop_database.sql 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/hsqldb/drop_database.sql 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,31 +1,31 @@
-DROP TABLE BUSINESS_DESCR IF EXISTS;
-DROP TABLE BUSINESS_CATEGORY IF EXISTS;
-DROP TABLE BUSINESS_IDENTIFIER IF EXISTS;
-DROP TABLE BUSINESS_NAME IF EXISTS;
-DROP TABLE DISCOVERY_URL IF EXISTS;
-DROP TABLE ADDRESS_LINE IF EXISTS;
-DROP TABLE ADDRESS IF EXISTS;
-DROP TABLE PHONE IF EXISTS;
-DROP TABLE EMAIL IF EXISTS;
-DROP TABLE CONTACT_DESCR IF EXISTS;
-DROP TABLE CONTACT IF EXISTS;
-DROP TABLE SERVICE_DESCR IF EXISTS;
-DROP TABLE SERVICE_CATEGORY IF EXISTS;
-DROP TABLE SERVICE_NAME IF EXISTS;
-DROP TABLE BINDING_DESCR IF EXISTS;
-DROP TABLE BINDING_CATEGORY IF EXISTS;
-DROP TABLE INSTANCE_DETAILS_DESCR IF EXISTS;
-DROP TABLE INSTANCE_DETAILS_DOC_DESCR IF EXISTS;
-DROP TABLE TMODEL_CATEGORY IF EXISTS;
-DROP TABLE TMODEL_DESCR IF EXISTS;
-DROP TABLE TMODEL_DOC_DESCR IF EXISTS;
-DROP TABLE TMODEL_IDENTIFIER IF EXISTS;
-DROP TABLE TMODEL_INSTANCE_INFO_DESCR IF EXISTS;
-DROP TABLE TMODEL_INSTANCE_INFO IF EXISTS;
-DROP TABLE PUBLISHER_ASSERTION IF EXISTS;
-DROP TABLE TMODEL IF EXISTS;
-DROP TABLE BINDING_TEMPLATE IF EXISTS;
-DROP TABLE BUSINESS_SERVICE IF EXISTS;
-DROP TABLE BUSINESS_ENTITY IF EXISTS;
-DROP TABLE PUBLISHER IF EXISTS;
-DROP TABLE AUTH_TOKEN IF EXISTS;
\ No newline at end of file
+DROP TABLE ${prefix}${prefix}BUSINESS_DESCR IF EXISTS;
+DROP TABLE ${prefix}BUSINESS_CATEGORY IF EXISTS;
+DROP TABLE ${prefix}BUSINESS_IDENTIFIER IF EXISTS;
+DROP TABLE ${prefix}BUSINESS_NAME IF EXISTS;
+DROP TABLE ${prefix}DISCOVERY_URL IF EXISTS;
+DROP TABLE ${prefix}ADDRESS_LINE IF EXISTS;
+DROP TABLE ${prefix}ADDRESS IF EXISTS;
+DROP TABLE ${prefix}PHONE IF EXISTS;
+DROP TABLE ${prefix}EMAIL IF EXISTS;
+DROP TABLE ${prefix}CONTACT_DESCR IF EXISTS;
+DROP TABLE ${prefix}CONTACT IF EXISTS;
+DROP TABLE ${prefix}SERVICE_DESCR IF EXISTS;
+DROP TABLE ${prefix}SERVICE_CATEGORY IF EXISTS;
+DROP TABLE ${prefix}SERVICE_NAME IF EXISTS;
+DROP TABLE ${prefix}BINDING_DESCR IF EXISTS;
+DROP TABLE ${prefix}BINDING_CATEGORY IF EXISTS;
+DROP TABLE ${prefix}INSTANCE_DETAILS_DESCR IF EXISTS;
+DROP TABLE ${prefix}INSTANCE_DETAILS_DOC_DESCR IF EXISTS;
+DROP TABLE ${prefix}TMODEL_CATEGORY IF EXISTS;
+DROP TABLE ${prefix}TMODEL_DESCR IF EXISTS;
+DROP TABLE ${prefix}TMODEL_DOC_DESCR IF EXISTS;
+DROP TABLE ${prefix}TMODEL_IDENTIFIER IF EXISTS;
+DROP TABLE ${prefix}TMODEL_INSTANCE_INFO_DESCR IF EXISTS;
+DROP TABLE ${prefix}TMODEL_INSTANCE_INFO IF EXISTS;
+DROP TABLE ${prefix}PUBLISHER_ASSERTION IF EXISTS;
+DROP TABLE ${prefix}TMODEL IF EXISTS;
+DROP TABLE ${prefix}BINDING_TEMPLATE IF EXISTS;
+DROP TABLE ${prefix}BUSINESS_SERVICE IF EXISTS;
+DROP TABLE ${prefix}BUSINESS_ENTITY IF EXISTS;
+DROP TABLE ${prefix}PUBLISHER IF EXISTS;
+DROP TABLE ${prefix}AUTH_TOKEN IF EXISTS;
\ No newline at end of file
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/hsqldb/import.sql
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/hsqldb/import.sql 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/hsqldb/import.sql 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,6 +1,6 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,CURDATE());
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/informix/import.sql
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/informix/import.sql 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/informix/import.sql 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,7 +1,7 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME)
VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category');
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/jdatastore/import.sql
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/jdatastore/import.sql 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/jdatastore/import.sql 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,5 +1,5 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,CURRENT_DATE);
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/mysql/import.sql
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/mysql/import.sql 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/mysql/import.sql 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,6 +1,6 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,NULL);
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/oracle/import.sql
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/oracle/import.sql 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/oracle/import.sql 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,6 +1,6 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,SYSDATE);
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/postgresql/import.sql
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/postgresql/import.sql 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/postgresql/import.sql 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,5 +1,5 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL)
VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL);
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/sybase/import.sql
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/sybase/import.sql 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/sybase/import.sql 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,7 +1,7 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,getDate());
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/totalxml/import.sql
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/totalxml/import.sql 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/install/jUDDI-registry/sql/totalxml/import.sql 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,7 +1,7 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,CURRENT_TIMESTAMP);
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/install/standalone/jbossesb-server-base.zip
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/lib/ext/jboss-messaging-client.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/lib/ext/jboss-remoting.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/lib/ext/juddi-1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -24,7 +24,6 @@
import java.io.UnsupportedEncodingException;
import java.net.PasswordAuthentication;
import java.net.URLDecoder;
-import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -201,7 +200,7 @@
ServiceBinding serviceBinding = blm.createServiceBinding();
serviceBinding.setDescription(blm.createInternationalString(eprDescription));
String xml = EPRHelper.toXMLString(epr);
- serviceBinding.setAccessURI(URLEncoder.encode(xml,"UTF-8"));
+ serviceBinding.setAccessURI(xml);
ArrayList<ServiceBinding> serviceBindings = new ArrayList<ServiceBinding>();
serviceBindings.add(serviceBinding);
@@ -216,8 +215,6 @@
saveRegistryObject(serviceBinding);
} catch (JAXRException je) {
throw new RegistryException(je.getLocalizedMessage(), je);
- } catch (UnsupportedEncodingException uee) {
- throw new RegistryException(uee.getLocalizedMessage(), uee);
} catch (MarshalException me) {
throw new RegistryException(me.getLocalizedMessage(), me);
} finally {
@@ -242,8 +239,21 @@
service.addServiceBindings(serviceBindings);
for (Iterator i=serviceBindings.iterator();i.hasNext();){
ServiceBinding serviceBinding = (ServiceBinding) i.next();
- String xml = URLDecoder.decode(serviceBinding.getAccessURI(), "UTF-8");
- if (xml.equals(EPRHelper.toXMLString(toBeDeletedEPR))) {
+ String eprXML = serviceBinding.getAccessURI().trim();
+ // for backwards compatibility still have the decoder if
+ // unmarchalling fails
+ try {
+ EPR epr = EPRHelper.fromXMLString(eprXML);
+ } catch (UnmarshalException unme) {
+ try {
+ eprXML = URLDecoder.decode(eprXML, "UTF-8").trim();
+ } catch (UnsupportedEncodingException ue) {
+ logger.error(unme.getMessage(), unme);
+ logger.error(ue.getMessage(), ue);
+ }
+ }
+ String toBeDeletedEPRXml = EPRHelper.toXMLString(toBeDeletedEPR).trim();
+ if (eprXML.equals(toBeDeletedEPRXml)) {
RegistryService rs = connection.getRegistryService();
BusinessLifeCycleManager blm = rs.getBusinessLifeCycleManager();
Collection<Key> serviceBindingKeys = new ArrayList<Key>();
@@ -256,8 +266,6 @@
+ serviceName + " and EPR=" + toBeDeletedEPR);
} catch (JAXRException je) {
throw new RegistryException(je.getLocalizedMessage(), je);
- } catch (UnsupportedEncodingException uee) {
- throw new RegistryException(uee.getLocalizedMessage(), uee);
} catch (MarshalException me) {
throw new RegistryException(me.getLocalizedMessage(), me);
} finally {
@@ -323,14 +331,26 @@
for (Iterator i=serviceBindings.iterator();i.hasNext();) {
ServiceBinding serviceBinding = (ServiceBinding) i.next();
@SuppressWarnings("unused")
- String eprXML = URLDecoder.decode(serviceBinding.getAccessURI(),"UTF-8");
- EPR epr = EPRHelper.fromXMLString(eprXML);
- eprs.add(epr);
+ String eprXML = serviceBinding.getAccessURI();
+ EPR epr = null;
+ //for backwards compatibility still have the decoder if
+ //unmarchalling fails
+ try {
+ epr = EPRHelper.fromXMLString(eprXML);
+ eprs.add(epr);
+ } catch (UnmarshalException unme) {
+ try {
+ eprXML = URLDecoder.decode(eprXML, "UTF-8");
+ epr = EPRHelper.fromXMLString(eprXML);
+ eprs.add(epr);
+ } catch (UnsupportedEncodingException ue) {
+ logger.error(ue.getMessage(), ue);
+ throw new UnmarshalException(ue.getMessage(), ue);
+ }
+ }
}
} catch (JAXRException je) {
throw new RegistryException(je.getLocalizedMessage(), je);
- } catch (UnsupportedEncodingException uee) {
- throw new RegistryException(uee.getLocalizedMessage(), uee);
} catch (UnmarshalException me) {
throw new RegistryException(me.getLocalizedMessage(), me);
} finally {
@@ -356,13 +376,23 @@
Collection<ServiceBinding> serviceBindings = findServiceBindings(service);
if (serviceBindings.iterator().hasNext()) {
ServiceBinding serviceBinding = (ServiceBinding) serviceBindings.iterator().next();
- String eprXML = URLDecoder.decode(serviceBinding.getAccessURI(),"UTF-8");
- epr = EPRHelper.fromXMLString(eprXML);
+ String eprXML = serviceBinding.getAccessURI();
+ // for backwards compatibility still have the decoder if
+ // unmarchalling fails
+ try {
+ epr = EPRHelper.fromXMLString(eprXML);
+ } catch (UnmarshalException unme) {
+ try {
+ eprXML = URLDecoder.decode(eprXML, "UTF-8");
+ epr = EPRHelper.fromXMLString(eprXML);
+ } catch (UnsupportedEncodingException ue) {
+ logger.error(ue.getMessage(), ue);
+ throw new UnmarshalException(ue.getMessage(), ue);
+ }
+ }
}
} catch (JAXRException je) {
throw new RegistryException(je.getLocalizedMessage(), je);
- } catch (UnsupportedEncodingException uee) {
- throw new RegistryException(uee.getLocalizedMessage(), uee);
} catch (UnmarshalException me) {
throw new RegistryException(me.getLocalizedMessage(), me);
} finally {
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -216,6 +216,7 @@
* @param messageMap
* @return the aggregated message
*/
+ @SuppressWarnings("unchecked")
private Message createAggregateMessage(String uuId, ConcurrentHashMap<String, Message> messageMap)
{
//Create an aggregated message
@@ -225,7 +226,7 @@
//Push additional AggregatorTags onto the new message, so we can aggregate in case of nested splits.
//Only need to get it from the first message, should be the same for the others.
if (isFirstTime) {
- ArrayList aggregatorTags = (ArrayList) message.getProperties().getProperty(Aggregator.AGGEGRATOR_TAG);
+ ArrayList<String> aggregatorTags = (ArrayList<String>) message.getProperties().getProperty(Aggregator.AGGEGRATOR_TAG);
if (aggregatorTags!=null && aggregatorTags.size()>0) {
aggregatedMessage.getProperties().setProperty(Aggregator.AGGEGRATOR_TAG, aggregatorTags);
}
@@ -280,6 +281,7 @@
private final Condition terminateCondition = terminateLock.newCondition() ;
private boolean terminated ;
+ @SuppressWarnings("unchecked")
public void run() {
boolean running = true ;
while(running) {
@@ -291,9 +293,8 @@
if (isTimedOut(message)) {
//We found a timed-out message. Let's go notify ourselves about by resending a message,
//it if we haven't done so already
- String aggregatorTag = (String) message.getProperties().getProperty(Aggregator.AGGEGRATOR_TAG);
- String[] tag = aggregatorTag.split(":");
- String uuId = tag[0];
+ ArrayList<String> aggregatorTag = (ArrayList<String>) message.getProperties().getProperty(Aggregator.AGGEGRATOR_TAG);
+ String uuId = aggregatorTag.get(0);
if (!_notified.contains(uuId)) {
_notified.add(uuId);
logger.debug("Found timeout message.");
Copied: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/StoreMessageToFile.java (from rev 15793, labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/StoreMessageToFile.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/StoreMessageToFile.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/StoreMessageToFile.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,260 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006
+ */
+package org.jboss.soa.esb.actions;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.listeners.message.ActionProcessingPipeline;
+import org.jboss.soa.esb.message.Body;
+import org.jboss.soa.esb.message.Message;
+
+/**
+ * Simple action that checks to see if the message should be stored into a file.
+ * This action is primarily used for testing the quickstarts.
+ *
+ * @author Kevin Conner
+ */
+public class StoreMessageToFile extends AbstractActionPipelineProcessor
+{
+ /**
+ * The logger for this class.
+ */
+ private static final Logger LOG = Logger.getLogger(StoreMessageToFile.class) ;
+
+ /**
+ * The newline string.
+ */
+ private static final String NEWLINE = System.getProperty("line.separator") ;
+
+ /**
+ * The lock protecting file write access.
+ */
+ private static final Lock globalLock = new ReentrantLock() ;
+
+ /**
+ * The filename parameter.
+ */
+ public static final String FILENAME = "filename" ;
+ /**
+ * The message content location.
+ */
+ public static final String LOCATION = "location" ;
+ /**
+ * Whether it is raw or not.
+ */
+ public static final String RAW = "raw" ;
+
+ /**
+ * The name of the filename when stored in a message property.
+ */
+ public static final String PROPERTY_JBESB_FILENAME = "jbesbfilename" ;
+ /**
+ * The start of the filename when it is embedded in the contents.
+ */
+ public static final String MESSAGE_CONTENT_FILENAME_START = "[jbesb-filename]" ;
+ /**
+ * The end of the filename when it is embedded in the contents.
+ */
+ public static final String MESSAGE_CONTENT_FILENAME_END = "[/jbesb-filename]" ;
+
+ /**
+ * Create the action with the specified configuration.
+ *
+ * @param config The action configuration.
+ */
+ public StoreMessageToFile(final ConfigTree config)
+ {
+ filename = config.getAttribute(FILENAME) ;
+ location = config.getAttribute(LOCATION) ;
+ raw = Boolean.parseBoolean(config.getAttribute(RAW, "false")) ;
+ }
+
+ /**
+ * Process the message.
+ *
+ * @param message The current message.
+ * @throws ActionProcessingPipeline for errors in processing.
+ */
+ public Message process(final Message message)
+ throws ActionProcessingException
+ {
+ final Body body = message.getBody() ;
+ final Object contents ;
+ if (location == null)
+ {
+ contents = body.get() ;
+ }
+ else
+ {
+ contents = body.get(location) ;
+ }
+
+ if (contents == null)
+ {
+ LOG.debug("Message contents null") ;
+ }
+ else
+ {
+ final String messageVal ;
+ if (contents instanceof byte[])
+ {
+ messageVal = new String((byte[])contents) ;
+ }
+ else
+ {
+ messageVal = contents.toString() ;
+ }
+
+ if (LOG.isDebugEnabled())
+ {
+ LOG.debug("Message value: " + messageVal) ;
+ }
+
+ final String storeFilename ;
+ if (filename != null)
+ {
+ storeFilename = filename ;
+ }
+ else
+ {
+ final Object jbesbfilename = message.getProperties().getProperty(PROPERTY_JBESB_FILENAME) ;
+ if (jbesbfilename != null)
+ {
+ storeFilename = jbesbfilename.toString() ;
+ }
+ else
+ {
+ final int startIndex = messageVal.indexOf(MESSAGE_CONTENT_FILENAME_START) ;
+ if (startIndex != -1)
+ {
+ final int endIndex = messageVal.indexOf(MESSAGE_CONTENT_FILENAME_END) ;
+ if ((endIndex != -1) && (endIndex > startIndex))
+ {
+ storeFilename = messageVal.substring(startIndex + MESSAGE_CONTENT_FILENAME_START.length(), endIndex) ;
+ }
+ else
+ {
+ storeFilename = null ;
+ }
+ }
+ else
+ {
+ storeFilename = null ;
+ }
+ }
+ }
+
+ if (storeFilename == null)
+ {
+ LOG.debug("Store filename is null") ;
+ }
+ else
+ {
+ final File outputFile ;
+ final File storeFile = new File(storeFilename) ;
+ if (storeFile.isAbsolute())
+ {
+ outputFile = storeFile ;
+ }
+ else
+ {
+ final String tmpDir = System.getProperty("java.io.tmpdir") ;
+ outputFile = new File(tmpDir, storeFilename) ;
+ }
+ try
+ {
+ if (LOG.isDebugEnabled())
+ {
+ LOG.debug("Storing message in filename: " + outputFile.getCanonicalPath()) ;
+ }
+
+ globalLock.lock() ;
+ try
+ {
+ final FileWriter fw = new FileWriter(outputFile, true) ;
+ try
+ {
+ if (raw)
+ {
+ fw.write(messageVal) ;
+ }
+ else
+ {
+ // We put everything on one line due to the limitations of the test helper class
+ final StringReader sr = new StringReader(messageVal) ;
+ final BufferedReader br = new BufferedReader(sr) ;
+ while(true)
+ {
+ final String line = br.readLine();
+ if (line == null)
+ {
+ break ;
+ }
+ fw.write(line) ;
+ }
+ fw.write(NEWLINE) ;
+ }
+ fw.flush();
+ }
+ finally
+ {
+ try
+ {
+ fw.close() ;
+ }
+ catch(final Throwable th) {} // ignore
+ }
+ }
+ finally
+ {
+ globalLock.unlock() ;
+ }
+ }
+ catch (final IOException ioe)
+ {
+ LOG.warn("Error accessing file", ioe) ;
+ }
+ }
+ }
+
+ return message;
+ }
+
+ /**
+ * The filename to create.
+ */
+ private final String filename ;
+ /**
+ * The location of the message.
+ */
+ private final String location ;
+ /**
+ * True if we output the raw contents.
+ */
+ private final boolean raw ;
+}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/SystemPrintln.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/SystemPrintln.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/SystemPrintln.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -39,7 +39,6 @@
public static final String PRE_MESSAGE = "message";
public static final String FULL_MESSAGE = "printfull";
public static final String PRINT_STREAM = "outputstream";
- public static final String TMP_FILE = "tmpFile";
public static final String DEFAULT_PRE_MESSAGE = "Message structure";
private Logger log = Logger.getLogger(this.getClass());
@@ -112,34 +111,6 @@
}
}
}
-
- String filename = null;
- //write the file out to a tmp dir
- if (messageStr!=null && messageStr.contains("[jbesb-filename]")) {
- int start = messageStr.indexOf("[jbesb-filename]") + 16;
- int end = messageStr.indexOf("[/jbesb-filename]");
- filename = messageStr.substring(start, end);
-
- } else if (messageStr != null && message.getProperties().getProperty("jbesbfilename") != null) {
- filename = (String) message.getProperties().getProperty("jbesbfilename");
- }
-
- if (filename != null) {
- String tmpDir="";
- if (!filename.startsWith(File.separator)) {
- tmpDir = System.getProperty("java.io.tmpdir") + File.separator;
- }
- stream.println("Writing " + tmpDir + filename);
- File file = new File(tmpDir + filename);
- try {
- FileOutputStream outputStream = new FileOutputStream(file, true);
- outputStream.write(messageStr.getBytes());
- outputStream.close();
- } catch (Exception e) {
- log.error("Can not write to file " + file.getPath());
- log.error(e.getMessage(), e);
- }
- }
return message;
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/converters/XStreamToObject.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/converters/XStreamToObject.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/converters/XStreamToObject.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -107,7 +107,7 @@
try {
Object toObject = incomingType.newInstance();
- fromXmlToObject( object.toString(), toObject );
+ toObject = fromXmlToObject( object.toString(), toObject );
message.getBody().add(ActionUtils.POST_ACTION_DATA, toObject);
} catch (InstantiationException e) {
@@ -177,7 +177,7 @@
* @throws IOException
* @throws SAXException
*/
- protected void fromXmlToObject(String xml, Object root ) throws ActionProcessingException
+ protected Object fromXmlToObject(String xml, Object root ) throws ActionProcessingException
{
HierarchicalStreamReader reader = null;
try
@@ -188,9 +188,7 @@
xstream.alias(getAlias(incomingType), incomingType);
addAliases( aliases, xstream );
-
- xstream.unmarshal( reader, root );
-
+ return xstream.unmarshal( reader, root );
}
finally
{
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/couriers/CourierFactory.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/couriers/CourierFactory.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/couriers/CourierFactory.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -157,7 +157,7 @@
}
catch (final LifecycleResourceException lre)
{
- throw new CourierException("Unexpected lifecycle resource exception whiel registering courier", lre) ;
+ throw new CourierException("Unexpected lifecycle resource exception while registering courier", lre) ;
}
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResource.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResource.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResource.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -133,7 +133,7 @@
/**
* Cleanup the specified resource.
- * @param identity The identiy of the resource.
+ * @param identity The identity of the resource.
*/
void cleanupResource(final String identity)
{
@@ -149,8 +149,10 @@
{
writeLock.unlock() ;
}
-
- cleanupLifecycleResource(factory, resource, identity) ;
+ if (resource != null)
+ {
+ cleanupLifecycleResource(factory, resource, identity) ;
+ }
}
/**
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResourceManager.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResourceManager.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResourceManager.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -203,7 +203,18 @@
readLock.lock() ;
try
{
- identity = identities.get(Thread.currentThread().getContextClassLoader()) ;
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader() ;
+ String currentIdentity = null ;
+ while(classLoader != null)
+ {
+ currentIdentity = identities.get(classLoader) ;
+ if (currentIdentity != null)
+ {
+ break ;
+ }
+ classLoader = classLoader.getParent() ;
+ }
+ identity = currentIdentity ;
}
finally
{
@@ -267,7 +278,23 @@
resource.cleanupResource(identity) ;
}
}
-
+ }
+ finally
+ {
+ resourceLock.unlock() ;
+ }
+ // Not touching this yet, needs reworking
+ NamingContext.closeAllContexts() ;
+ }
+
+ /**
+ * Destroy the class loader resources.
+ */
+ public void destroyResources()
+ {
+ resourceLock.lock();
+ try
+ {
// destroy all resources associated with the class loader.
final ClassLoader classLoader = Thread.currentThread().getContextClassLoader() ;
final Map<Integer, Set<LifecycleResource<?>>> classLoaderMap = classLoaderResourceMap.remove(classLoader) ;
@@ -300,8 +327,6 @@
{
resourceLock.unlock() ;
}
- // Not touching this yet, needs reworking
- NamingContext.closeAllContexts() ;
}
/**
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -102,6 +102,7 @@
finally
{
LifecycleResourceManager.getSingleton().disassociateDeployment(deploymentName) ;
+ LifecycleResourceManager.getSingleton().destroyResources() ;
Thread.currentThread().setContextClassLoader(old);
}
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -31,6 +31,7 @@
import org.jboss.soa.esb.actions.ActionPipelineProcessor;
import org.jboss.soa.esb.actions.ActionProcessingFaultException;
import org.jboss.soa.esb.actions.BeanConfiguredAction;
+import org.jboss.soa.esb.addressing.Call;
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.addressing.MalformedEPRException;
import org.jboss.soa.esb.addressing.util.DefaultFaultTo;
@@ -240,6 +241,7 @@
final EPR faultToAddress = DefaultFaultTo.getFaultToAddress(message);
long start = System.nanoTime();
serviceMessageCounter.incrementTotalCount();
+ final EPR fromAddress = message.getHeader().getCall().getTo() ;
if (active.get())
{
@@ -290,14 +292,14 @@
if (fault.getFaultMessage() == null)
{
- faultTo(faultToAddress, Factory.createErrorMessage(Factory.PROCESSING_ERROR, message, ex));
+ faultTo(fromAddress, faultToAddress, Factory.createErrorMessage(Factory.PROCESSING_ERROR, message, ex));
}
else
- faultTo(faultToAddress, fault.getFaultMessage());
+ faultTo(fromAddress, faultToAddress, fault.getFaultMessage());
}
else
{
- faultTo(faultToAddress, Factory.createErrorMessage(Factory.UNEXPECTED_ERROR, message, ex));
+ faultTo(fromAddress, faultToAddress, Factory.createErrorMessage(Factory.UNEXPECTED_ERROR, message, ex));
}
long procTime = System.nanoTime() - start;
@@ -315,7 +317,7 @@
// Reply...
if ((currentMessage != null) && (replyToAddress != null))
{
- replyTo(replyToAddress, currentMessage);
+ replyTo(fromAddress, replyToAddress, currentMessage);
}
notifySuccess(messages);
@@ -328,7 +330,7 @@
{
LOGGER.debug("pipeline process disabled for message: "+message.getHeader());
- faultTo(faultToAddress, Factory.createErrorMessage(Factory.NOT_ENABLED, message, null));
+ faultTo(fromAddress, faultToAddress, Factory.createErrorMessage(Factory.NOT_ENABLED, message, null));
long procTime = System.nanoTime() - start;
DeliveryObservableLogger.getInstance().logMessage(new MessageStatusBean(procTime, message,
MessageStatusBean.MESSAGE_FAILED));
@@ -340,13 +342,15 @@
/**
* Send the reply.
*
+ * @param fromAddress
+ * the EPR to which the original message was sent.
* @param replyToAddress
* the EPR to target if one is not defined in the message.
* @param message
* the message.
*/
- private void replyTo(EPR replyToAddress, Message message)
+ private void replyTo(EPR fromAddress, EPR replyToAddress, Message message)
{
Courier courier = null;
EPR replyToEPR = DefaultReplyTo.getReplyToAddress(message);
@@ -360,6 +364,10 @@
}
else
{
+ final Call call = message.getHeader().getCall() ;
+ call.setFrom(fromAddress) ;
+ call.setReplyTo(null) ;
+ call.setFaultTo(null) ;
try
{
courier = CourierFactory.getCourier(replyToAddress);
@@ -393,13 +401,15 @@
/**
* Send the fault message to the EPR.
*
+ * @param fromAddress
+ * the EPR to which the original message was sent.
* @param faultToAddress
* the EPR to target if one is not set in the message.
* @param message
* the message.
*/
- private void faultTo(EPR faultToAddress, Message message)
+ private void faultTo(EPR fromAddress, EPR faultToAddress, Message message)
{
Courier courier = null;
EPR faultToEPR = DefaultFaultTo.getFaultToAddress(message);
@@ -413,6 +423,10 @@
}
else
{
+ final Call call = message.getHeader().getCall() ;
+ call.setFrom(fromAddress) ;
+ call.setReplyTo(null) ;
+ call.setFaultTo(null) ;
try
{
courier = CourierFactory.getCourier(faultToAddress);
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -38,7 +38,6 @@
/**
- /**
* Get the implementation-specific message URI generator.
* @return the generator
*/
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/util/Util.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/util/Util.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/util/Util.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -250,16 +250,13 @@
if (sa.length == 2)
{
- if (sa[1].charAt(0) != '\''
- || sa[1].charAt(-1 + sa[1].length()) != '\'')
+ attr = sa[0].trim();
+ value= sa[1].trim();
+ if (value.charAt(0) != '\''
+ || value.charAt(value.length() - 1) != '\'')
{
fail = true;
}
- else
- {
- attr = sa[0].trim();
- value = sa[1].trim();
- }
}
else
fail = true;
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -26,7 +26,6 @@
import java.io.File;
import java.io.InputStream;
-import java.net.URLDecoder;
import java.sql.DriverManager;
import java.sql.Statement;
import java.util.ArrayList;
@@ -170,9 +169,9 @@
for (Iterator serviceBindingIter = serviceBindings.iterator();serviceBindingIter.hasNext();){
ServiceBinding serviceBinding = (ServiceBinding) serviceBindingIter.next();
logger.debug(" ServiceBinding Description: " + serviceBinding.getDescription().getValue());
- String xml = URLDecoder.decode(serviceBinding.getAccessURI(),"UTF-8");
+ String xml = serviceBinding.getAccessURI();
logger.debug(" ServiceBinding URI: " + xml);
- assertEquals(EPRHelper.toXMLString(new EPR()),xml);
+ assertEquals(EPRHelper.toXMLString(new EPR()).trim(),xml.trim());
}
}
logger.debug("-------------------------------------------------");
@@ -245,12 +244,11 @@
//Get the registry-schema create scripts
String sqlDir = TestEnvironmentUtil.getUserDir() + "install/jUDDI-registry/sql/" + database + "/";
//Drop what is there now, if exists. We want to start fresh.
- String sqlDropCmd = FileUtil.readTextFile(new File(sqlDir + "drop_database.sql"));
- //ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ String sqlDropCmd = FileUtil.readTextFile(new File(sqlDir + "drop_database.sql")).replaceAll("\\$\\{prefix}", "");
String resource = "juddi-sql/" + database + "/create_database.sql";
InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
- String sqlCreateCmd = FileUtil.readStream(is);
- String sqlInsertPubCmd = FileUtil.readTextFile(new File(sqlDir + "import.sql"));
+ String sqlCreateCmd = FileUtil.readStream(is).trim().replaceAll("\\$\\{prefix}", "");
+ String sqlInsertPubCmd = FileUtil.readTextFile(new File(sqlDir + "import.sql")).trim().replaceAll("\\$\\{prefix}", "");
try {
Class.forName(mDbDriver);
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/XStreamToObjectUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/XStreamToObjectUnitTest.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/XStreamToObjectUnitTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -32,6 +32,7 @@
import junit.framework.JUnit4TestAdapter;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.actions.ActionProcessingException;
import org.jboss.soa.esb.actions.ActionUtils;
import org.jboss.soa.esb.actions.TestBean;
@@ -39,6 +40,7 @@
import org.jboss.soa.esb.helpers.KeyValuePair;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.format.MessageFactory;
+import org.junit.Ignore;
import org.junit.Test;
import com.thoughtworks.xstream.XStream;
@@ -51,6 +53,8 @@
*/
public class XStreamToObjectUnitTest {
+ private Logger log = Logger.getLogger( XStreamToObjectUnitTest.class );
+
@Test
public void test_default() throws ActionProcessingException {
List<KeyValuePair> properties = new ArrayList<KeyValuePair>();
@@ -116,7 +120,7 @@
assertEquals("Tom", bean.getName());
assertEquals("1234", bean.getPhone());
}
-
+
@Test
public void getAliases()
{
@@ -221,6 +225,27 @@
assertTrue( obj instanceof TestBean2 );
assertEquals("Bevenius", ((TestBean2)obj).getName());
}
+
+ @Test
+ public void fromXmlToObject_with_collection() throws ActionProcessingException
+ {
+ String rootNodeName = "/someNode/list";
+ ConfigTree configTree = getConfigTree( "list", true, ArrayList.class, rootNodeName);
+ ConfigTree alias1 = new ConfigTree( "alias", configTree);
+ alias1.setAttribute( "name", "TomsClass");
+ alias1.setAttribute( "class", TestBean.class.getName());
+ XStreamToObject xstreamToObject = new XStreamToObject( configTree );
+
+ String xml = "<someNode><list><TomsClass><name>Tom</name></TomsClass><TomsClass><name>Daniel</name></TomsClass></list></someNode>";
+
+ Object obj = new ArrayList<TestBean>();
+ obj = xstreamToObject.fromXmlToObject( xml, obj );
+
+ assertTrue( "Object was not an instance of ArrayList", obj instanceof ArrayList );
+ ArrayList<TestBean> nodes = (ArrayList<TestBean>) obj;
+ assertEquals( 2, nodes.size() );
+
+ }
private XStreamToObject createXStreamObject( String classAlias, boolean exludePackage, Class incomingType, String rootNodeName)
{
@@ -259,11 +284,16 @@
return configTree;
}
+
+ /**
+ * An abstract class for testing
+ */
+ private static abstract class AbstractTestBean { }
/**
* Just a bean for testing
*/
- private static class TestBean2 {
+ private static class TestBean2 extends AbstractTestBean {
private String name;
public String getName()
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -176,12 +176,12 @@
+ "/install/jUDDI-registry/sql/" + database + "/";
// Drop what is there now, if exists. We want to start fresh.
String sqlDropCmd = FileUtil.readTextFile(new File(sqlDir
- + "drop_database.sql"));
+ + "drop_database.sql")).replaceAll("\\$\\{prefix}", "");
String resource = "juddi-sql/" + database + "/create_database.sql";
InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
- String sqlCreateCmd = FileUtil.readStream(is);
+ String sqlCreateCmd = FileUtil.readStream(is).trim().replaceAll("\\$\\{prefix}", "");
String sqlInsertPubCmd = FileUtil.readTextFile(new File(sqlDir
- + "import.sql"));
+ + "import.sql")).trim().replaceAll("\\$\\{prefix}", "");
try
{
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ServiceInvokerUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ServiceInvokerUnitTest.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ServiceInvokerUnitTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -89,12 +89,12 @@
+ "/install/jUDDI-registry/sql/" + database + "/";
// Drop what is there now, if exists. We want to start fresh.
String sqlDropCmd = FileUtil.readTextFile(new File(sqlDir
- + "drop_database.sql"));
+ + "drop_database.sql")).replaceAll("\\$\\{prefix}", "");
String resource = "juddi-sql/" + database + "/create_database.sql";
InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
- String sqlCreateCmd = FileUtil.readStream(is);
+ String sqlCreateCmd = FileUtil.readStream(is).trim().replaceAll("\\$\\{prefix}", "");
String sqlInsertPubCmd = FileUtil.readTextFile(new File(sqlDir
- + "import.sql"));
+ + "import.sql")).trim().replaceAll("\\$\\{prefix}", "");
try
{
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GatewayListenerControllerBaseTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GatewayListenerControllerBaseTest.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GatewayListenerControllerBaseTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -92,12 +92,12 @@
+ "/install/jUDDI-registry/sql/" + database + "/";
// Drop what is there now, if exists. We want to start fresh.
String sqlDropCmd = FileUtil.readTextFile(new File(sqlDir
- + "drop_database.sql"));
+ + "drop_database.sql")).replaceAll("\\$\\{prefix}", "");
String resource = "juddi-sql/" + database + "/create_database.sql";
InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
- String sqlCreateCmd = FileUtil.readStream(is);
+ String sqlCreateCmd = FileUtil.readStream(is).trim().replaceAll("\\$\\{prefix}", "");
String sqlInsertPubCmd = FileUtil.readTextFile(new File(sqlDir
- + "import.sql"));
+ + "import.sql")).trim().replaceAll("\\$\\{prefix}", "");
try
{
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -187,11 +187,11 @@
//Get the registry-schema create scripts
String sqlDir = TestEnvironmentUtil.getUserDir() + "install/jUDDI-registry/sql/" + database + "/";
//Drop what is there now, if exists. We want to start fresh.
- String sqlDropCmd = FileUtil.readTextFile(new File(sqlDir + "drop_database.sql"));
+ String sqlDropCmd = FileUtil.readTextFile(new File(sqlDir + "drop_database.sql")).replaceAll("\\$\\{prefix}", "");
String resource = "juddi-sql/" + database + "/create_database.sql";
InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
- String sqlCreateCmd = FileUtil.readStream(is);
- String sqlInsertPubCmd = FileUtil.readTextFile(new File(sqlDir + "import.sql"));
+ String sqlCreateCmd = FileUtil.readStream(is).trim().replaceAll("\\$\\{prefix}", "");
+ String sqlInsertPubCmd = FileUtil.readTextFile(new File(sqlDir + "import.sql")).trim().replaceAll("\\$\\{prefix}", "");
try {
Class.forName(mDbDriver);
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld/jboss-esb.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld/jboss-esb.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -46,6 +46,8 @@
<action name="action2" class="org.jboss.soa.esb.actions.SystemPrintln">
<property name="printfull" value="true"/>
</action>
+ <!-- The next action is for Continuous Integration testing -->
+ <action name="testStore" class="org.jboss.soa.esb.actions.StoreMessageToFile"/>
</actions>
</service>
</services>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/MyJMSListenerAction.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/MyJMSListenerAction.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/MyJMSListenerAction.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -35,7 +35,7 @@
public Message displayMessage(Message message) throws Exception{
System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
- System.out.println("Body: " + new String(message.getBody().getByteArray()));
+ System.out.println("Body: " + message.getBody().get().toString()) ;
System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
return message;
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld_action/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld_action/jboss-esb.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld_action/jboss-esb.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -51,6 +51,8 @@
<property name="exceptionMethod" value="exceptionHandler"/>
</action>
+ <!-- The next action is for Continuous Integration testing -->
+ <action name="testStore" class="org.jboss.soa.esb.actions.StoreMessageToFile"/>
<action name="notificationAction"
class="org.jboss.soa.esb.actions.Notifier">
<property name="okMethod" value="notifyOK" />
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld_action/src/org/jboss/soa/esb/samples/quickstart/helloworldaction/MyJMSListenerAction.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld_action/src/org/jboss/soa/esb/samples/quickstart/helloworldaction/MyJMSListenerAction.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld_action/src/org/jboss/soa/esb/samples/quickstart/helloworldaction/MyJMSListenerAction.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -36,7 +36,7 @@
public Message displayMessage(Message message) throws Exception{
logHeader();
- System.out.println("Body: " + new String(message.getBody().getByteArray()));
+ System.out.println("Body: " + message.getBody().get().toString());
logFooter();
return message;
}
@@ -46,12 +46,12 @@
Body msgBody = message.getBody();
// Call theCall = msgHeader.getCall();
// EPR theEpr = theCall.getFrom();
- String contents = new String(msgBody.getByteArray());
+ String contents = msgBody.get().toString();
StringBuffer sb = new StringBuffer();
sb.append("\nBEFORE**\n");
sb.append(contents);
sb.append("\nAFTER**\n");
- msgBody.setByteArray(sb.toString().getBytes());
+ msgBody.add(sb.toString());
return message;
}
@@ -60,7 +60,7 @@
System.out.println("!ERROR!");
System.out.println(exception.getMessage());
System.out.println("For Message: ");
- System.out.println(message.getBody().getByteArray());
+ System.out.println(message.getBody().get());
logFooter();
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld_file_action/jboss-esb-unfiltered.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld_file_action/jboss-esb-unfiltered.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld_file_action/jboss-esb-unfiltered.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -61,6 +61,10 @@
<action name="dump" class="org.jboss.soa.esb.actions.SystemPrintln">
<property name="printfull" value="true"/>
</action>
+ <!-- The next action is for Continuous Integration testing -->
+ <action name="testStore" class="org.jboss.soa.esb.actions.StoreMessageToFile">
+ <property name="location" value="org.jboss.soa.esb.message.content.bytes"/>
+ </action>
</actions>
</service>
</services>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/scripting_groovy/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/scripting_groovy/jboss-esb.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/scripting_groovy/jboss-esb.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -50,6 +50,8 @@
<action name="groovyMessagePlay" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
<property name="script" value="/scripts/messagePlay.groovy" />
</action>
+ <!-- The next action is for Continuous Integration testing -->
+ <action name="testStore" class="org.jboss.soa.esb.actions.StoreMessageToFile"/>
</actions>
</service>
</services>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_CSV2XML/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_CSV2XML/jboss-esb.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_CSV2XML/jboss-esb.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -63,6 +63,10 @@
<action name="print-after-xml-transform" class="org.jboss.soa.esb.actions.SystemPrintln">
<property name="message" value=">>>> Message after Smooks intermediate xml -> target xml : " />
</action>
+ <!-- The next action is for Continuous Integration testing -->
+ <action name="testStore" class="org.jboss.soa.esb.actions.StoreMessageToFile">
+ <property name="raw" value="true"/>
+ </action>
</actions>
</service>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jboss-esb.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jboss-esb.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -36,6 +36,10 @@
<action name="print-after" class="org.jboss.soa.esb.actions.SystemPrintln">
<property name="message" value="[transform_EDI2XML_Groovy_XSLT] Message after transformation" />
</action>
+ <!-- The next action is for Continuous Integration testing -->
+ <action name="testStore" class="org.jboss.soa.esb.actions.StoreMessageToFile">
+ <property name="raw" value="true"/>
+ </action>
</actions>
</service>
</services>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2POJO/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2POJO/jboss-esb.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2POJO/jboss-esb.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -55,6 +55,10 @@
<action name="println-xml2pojo" class="org.jboss.soa.esb.actions.SystemPrintln">
<property name="message" value=">>>> Message after Smooks intermediate xml -> target xml : " />
</action>
+ <!-- The next action is for Continuous Integration testing -->
+ <action name="testStore" class="org.jboss.soa.esb.actions.StoreMessageToFile">
+ <property name="raw" value="true"/>
+ </action>
</actions>
</service>
</services>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2XML_date_manipulation/SampleOrder.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2XML_date_manipulation/SampleOrder.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2XML_date_manipulation/SampleOrder.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,4 +1,4 @@
-<Order orderId="1" orderDate="Wed Nov 15 13:45:28 EST 2006" statusCode="0" netAmount="59.97" totalAmount="64.92" tax="4.95">
+<Order orderId="1" orderDate="Wed Nov 15 13:45:28 2006" statusCode="0" netAmount="59.97" totalAmount="64.92" tax="4.95">
<Customer userName="user1" firstName="Harry" lastName="Fletcher" state="SD"/>
<OrderLines>
<OrderLine position="1" quantity="1">
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2XML_date_manipulation/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2XML_date_manipulation/jboss-esb.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2XML_date_manipulation/jboss-esb.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -38,6 +38,10 @@
<property name="message"
value="[transform_XML2XML_date_manipulation] Message after transformation"/>
</action>
+ <!-- The next action is for Continuous Integration testing -->
+ <action name="testStore" class="org.jboss.soa.esb.actions.StoreMessageToFile">
+ <property name="raw" value="true"/>
+ </action>
</actions>
</service>
</services>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2XML_date_manipulation/smooks-res.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2XML_date_manipulation/smooks-res.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2XML_date_manipulation/smooks-res.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -16,7 +16,7 @@
<resource-config selector="decoder:LongDate">
<resource>org.milyn.javabean.decoders.DateDecoder</resource>
- <param name="format">EEE MMM dd HH:mm:ss z yyyy</param>
+ <param name="format">EEE MMM dd HH:mm:ss yyyy</param>
</resource-config>
<!--
@@ -27,7 +27,6 @@
<resource type="xsl"><![CDATA[<OrderDate>
<day><smooks-bean:select ognl="orderDate.day"/></day>
<time><smooks-bean:select ognl="orderDate.time"/></time>
- <zone><smooks-bean:select ognl="orderDate.zone"/></zone>
<month><smooks-bean:select ognl="orderDate.month"/></month>
<year><smooks-bean:select ognl="orderDate.year"/></year>
</OrderDate>]]></resource>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2XML_date_manipulation/src/org/jboss/soa/esb/samples/quickstart/transformxml2xmldatemanipulation/test/OrderDate.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2XML_date_manipulation/src/org/jboss/soa/esb/samples/quickstart/transformxml2xmldatemanipulation/test/OrderDate.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2XML_date_manipulation/src/org/jboss/soa/esb/samples/quickstart/transformxml2xmldatemanipulation/test/OrderDate.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -36,12 +36,14 @@
/**
* Formatters for encoding the date in the transformation.
+ * N.B. These are not thread safe.
+ *
+ * TimeZone information has been removed to allow for consistent testing.
*/
private static SimpleDateFormat dayFormat = new SimpleDateFormat("dd");
private static SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm");
private static SimpleDateFormat monthFormat = new SimpleDateFormat("MM");
private static SimpleDateFormat yearFormat = new SimpleDateFormat("yy");
- private static SimpleDateFormat timezoneFormat = new SimpleDateFormat("Z");
public void setOrderDate(Date orderDate) {
this.orderDate = orderDate;
@@ -61,7 +63,4 @@
public String getYear() {
return yearFormat.format(orderDate.getTime());
}
- public String getZone() {
- return timezoneFormat.format(orderDate.getTime());
- }
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2XML_simple/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2XML_simple/jboss-esb.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2XML_simple/jboss-esb.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -36,6 +36,10 @@
<action name="print-after" class="org.jboss.soa.esb.actions.SystemPrintln">
<property name="message" value="[transform_XML2XML_simple] Message after transformation" />
</action>
+ <!-- The next action is for Continuous Integration testing -->
+ <action name="testStore" class="org.jboss.soa.esb.actions.StoreMessageToFile">
+ <property name="raw" value="true"/>
+ </action>
</actions>
</service>
</services>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/jboss-esb.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/jboss-esb.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -25,7 +25,7 @@
<actions>
<action name="request-mapper"
class="org.jboss.soa.esb.samples.quickstart.webservice_consumer2.MyRequestAction"
- process="option2">
+ process="option1">
</action>
<action name="soapui-client-action"
class="org.jboss.soa.esb.actions.soap.SOAPClient">
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer2/MyRequestAction.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer2/MyRequestAction.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer2/MyRequestAction.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -69,8 +69,10 @@
order.setLineItems(lineItems);
- //requestMap.put("processOrder.order", order);
- requestMap.put("order", order);
+ ProcessOrderRequest requestObject = new ProcessOrderRequest();
+ requestObject.setOrder(order);
+ requestMap.put("processOrder", requestObject);
+ //requestMap.put("order", order);
message.getBody().add("request-params", requestMap);
System.out.println("Request map is: " + requestMap.toString());
Copied: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer2/ProcessOrderRequest.java (from rev 15793, labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer2/ProcessOrderRequest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer2/ProcessOrderRequest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer2/ProcessOrderRequest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,38 @@
+/*
+ * 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.samples.quickstart.webservice_consumer2;
+
+import java.io.Serializable;
+
+/**
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class ProcessOrderRequest implements Serializable {
+
+ private Order order;
+
+ public Order getOrder() {
+ return order;
+ }
+
+ public void setOrder(Order order) {
+ this.order = order;
+ }
+}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/wiretap/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/wiretap/jboss-esb.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/wiretap/jboss-esb.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -79,6 +79,8 @@
</NotificationList>
</property>
</action>
+ <!-- The next action is for Continuous Integration testing -->
+ <action name="testStore" class="org.jboss.soa.esb.actions.StoreMessageToFile" />
</actions>
</service>
@@ -101,6 +103,7 @@
</NotificationList>
</property>
</action>
+ <action name="testStore" class="org.jboss.soa.esb.actions.StoreMessageToFile" />
</actions>
</service>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/build.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/build.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -38,9 +38,9 @@
<property environment="env" />
- <property name="esb.lib.file" value="jbossesb-rosetta.jar"/>
- <property name="soa.esb.lib.dist.dir" value="${esb.home.dir}/lib"/>
- <property name="soa.esb.lib.src.dir" value="../../build/jbossesb/lib"/>
+ <property name="esb.lib.file" value="jbossesb-rosetta.jar"/>
+ <property name="soa.esb.lib.dist.dir" value="${esb.home.dir}/lib"/>
+ <property name="soa.esb.lib.src.dir" value="../../build/jbossesb/lib"/>
<available file="${esb.lib.file}"
filepath="${soa.esb.lib.dist.dir}"
@@ -54,13 +54,6 @@
<property name="soa.esb.lib.ext.dir" value="${soa.esb.lib.dir}/ext"/>
- <!-- wstools classpath -->
- <path id="wstools.classpath">
- <fileset dir="${client.dir}/lib/ext/jboss-jaxws.jar"/>
- <fileset dir="${client.dir}/lib/ext/jbossws-client.jar"/>
- <fileset dir="${esb.samples.trailblazer.client.lib.dir}" includes="*.jar"/>
- </path>
-
<!-- classpath -->
<path id="esb.samples.trailblazer.esb.classpath">
<fileset dir="${soa.esb.lib.dir}/ext" includes="*.jar"/>
@@ -88,6 +81,7 @@
<fileset dir="${soa.esb.lib.ext.dir}"/>
<fileset dir="${esb.lib.dir}/ext" includes="*.jar"/>
<fileset dir="${org.jboss.esb.server.home}/client" includes="jboss-jaxrpc.jar jbossall-client.jar jbossws-client.jar mail.jar"/>
+ <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossws.sar" includes="jboss-jaxrpc.jar"/>
<fileset dir="${soa.esb.lib.dir}" includes="*.jar"/>
<fileset dir="${esb.samples.trailblazer.client.lib.dir}/ext" includes="*.jar"/>
<fileset dir="${esb.dest}/dist" includes="trailblazer-esb.jar"/>
@@ -99,28 +93,35 @@
<delete dir="${esb.samples.trailblazer.client.dest}"/>
</target>
- <!-- =================================================================== -->
- <!-- wstools is not currently used, but is useful for producing WS -->
- <!-- deployment files. -->
- <!-- =================================================================== -->
- <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
- <classpath>
- <pathelement location="client/lib/ext/jboss-jaxws.jar"/>
- <pathelement location="client/lib/ext/jbossws-core.jar"/>
- <pathelement location="${esb.home.dir}/lib/ext/activation.jar"/>
- <pathelement location="${esb.home.dir}/lib/ext/jbossall-client.jar"/>
- <pathelement location="${esb.home.dir}/lib/ext/mail.jar"/>
- <pathelement path="${esb.samples.trailblazer.client.classes.dir}"/>
- </classpath>
- </taskdef>
+ <target name="messaging-config">
+ <property name="org.jboss.esb.server.deploy.dir"
+ value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
+ <condition property="messaging.present">
+ <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging"/>
+ </condition>
+ <condition property="messaging.present">
+ <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging.sar"/>
+ </condition>
- <target name="wstools">
- <wstools
- dest="client/WEB-INF"
- config="client/resources/wstools-config.xml"
- />
- </target>
+ <condition property="jbossmq.present">
+ <not>
+ <isset property="messaging.present"/>
+ </not>
+ </condition>
+ </target>
+
+ <!-- dependencies specific to JBoss Messaging -->
+ <target name="messaging-dependencies" if="messaging.present">
+ <property name="jms.service.file" value="jbm-queue-service.xml"/>
+ <property name="jms.description" value="JBoss Messaging"/>
+ </target>
+ <!-- dependencies specific to JBoss MQ -->
+ <target name="jbossmq-dependencies" if="jbossmq.present">
+ <property name="jms.service.file" value="jbmq-queue-service.xml"/>
+ <property name="jms.description" value="JBoss MQ"/>
+ </target>
+
<!-- =================================================================== -->
<!-- Prepares the directory structure -->
<!-- =================================================================== -->
@@ -166,9 +167,11 @@
</target>
<!-- JAR/WAR targets -->
- <target name="esb.jar" depends="compile" >
+ <target name="esb.jar" depends="messaging-config, messaging-dependencies, jbossmq-dependencies, compile" >
<property name="esb.build.dir" value="${esb.dest}" />
+ <echo>${jms.service.file}</echo>
+
<!-- ESB Client JAR -->
<echo message="Building Trailblazer ESB archives"/>
<jar destfile="${esb.build.dir}/dist/trailblazer-esb.jar"
@@ -182,7 +185,7 @@
<jar destfile="${esb.build.dir}/dist/trailblazer.esb">
<fileset dir="${classes.dir}" excludes="**/web/*.class" />
<fileset dir="${esb.build.dir}" includes="META-INF/**" />
- <fileset dir="esb/conf" includes="jbmq-service.xml"/>
+ <fileset dir="${basedir}/esb/conf" includes="${jms.service.file}"/>
<fileset dir="${basedir}" includes="trailblazer.properties,template/**" />
</jar>
</target>
@@ -200,8 +203,6 @@
<include name="trailblazer.properties"/>
</classes>
<webinf dir="${basedir}/client/resources">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
<include name="wsdl/*"/>
</webinf>
<lib dir="${esb.dest}/dist">
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/resources/web.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/resources/web.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/resources/web.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -3,19 +3,10 @@
<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
<servlet>
<servlet-name>LoanBroker</servlet-name>
- <servlet-class>org.jboss.soa.esb.samples.trailblazer.web.LoanBrokerWS</servlet-class>
+ <servlet-class>org.jboss.soa.esb.samples.trailblazer.web.LoanBrokerBean</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>LoanBroker</servlet-name>
<url-pattern>/LoanBroker</url-pattern>
</servlet-mapping>
- <service-ref>
- <service-ref-name>service/LoanBrokerService</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>WEB-INF/wsdl/LoanBrokerService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.soa.esb.samples.trailblazer.web.LoanBrokerWS</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
</web-app>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/resources/wsdl/LoanBrokerService.wsdl
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/resources/wsdl/LoanBrokerService.wsdl 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/resources/wsdl/LoanBrokerService.wsdl 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,29 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='LoanBrokerService' targetNamespace='http://org.jboss.ws/samples/rpcstyle' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.ws/samples/rpcstyle/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/samples/rpcstyle' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+<definitions name='LoanBrokerService' targetNamespace='http://localhost/trailblazer' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://localhost/trailblazer' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
<types>
- <schema targetNamespace='http://org.jboss.ws/samples/rpcstyle/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.ws/samples/rpcstyle/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name='WebCustomer'>
- <sequence>
- <element name='address' nillable='true' type='string'/>
- <element name='email' nillable='true' type='string'/>
- <element name='employerName' nillable='true' type='string'/>
- <element name='loanAmount' type='double'/>
- <element name='loanDuration' type='int'/>
- <element name='name' nillable='true' type='string'/>
- <element name='salary' type='double'/>
- <element name='ssn' type='int'/>
- </sequence>
- </complexType>
- </schema>
+ <xs:schema targetNamespace='http://localhost/trailblazer' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+ <xs:complexType name='webCustomer'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='address' type='xs:string'/>
+ <xs:element minOccurs='0' name='email' type='xs:string'/>
+ <xs:element minOccurs='0' name='employerName' type='xs:string'/>
+ <xs:element name='loanAmount' type='xs:double'/>
+ <xs:element name='loanDuration' type='xs:int'/>
+ <xs:element minOccurs='0' name='name' type='xs:string'/>
+ <xs:element name='salary' type='xs:double'/>
+ <xs:element name='ssn' type='xs:int'/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
</types>
- <message name='LoanBrokerInterface_RequestLoan' xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <part name='WebCustomer_1' type='ns1:WebCustomer'/>
+ <message name='LoanBrokerInterface_RequestLoan'>
+ <part name='webCustomer_1' type='tns:webCustomer'></part>
</message>
- <message name='LoanBrokerInterface_RequestLoanResponse'/>
+ <message name='LoanBrokerInterface_RequestLoanResponse'></message>
<portType name='LoanBrokerInterface'>
- <operation name='RequestLoan' parameterOrder='WebCustomer_1'>
- <input message='tns:LoanBrokerInterface_RequestLoan'/>
- <output message='tns:LoanBrokerInterface_RequestLoanResponse'/>
+ <operation name='RequestLoan' parameterOrder='webCustomer_1'>
+ <input message='tns:LoanBrokerInterface_RequestLoan'></input>
+ <output message='tns:LoanBrokerInterface_RequestLoanResponse'></output>
</operation>
</portType>
<binding name='LoanBrokerInterfaceBinding' type='tns:LoanBrokerInterface'>
@@ -31,16 +30,16 @@
<operation name='RequestLoan'>
<soap:operation soapAction=''/>
<input>
- <soap:body namespace='http://org.jboss.ws/samples/rpcstyle' use='literal'/>
+ <soap:body namespace='http://localhost/trailblazer' use='literal'/>
</input>
<output>
- <soap:body namespace='http://org.jboss.ws/samples/rpcstyle' use='literal'/>
+ <soap:body namespace='http://localhost/trailblazer' use='literal'/>
</output>
</operation>
</binding>
<service name='LoanBrokerService'>
<port binding='tns:LoanBrokerInterfaceBinding' name='LoanBrokerInterfacePort'>
- <soap:address location='http://localhost:8080/trailblazer/LoanBroker'/>
+ <soap:address location='http://127.0.0.1:8080/trailblazer/LoanBroker'/>
</port>
</service>
</definitions>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanRequester.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanRequester.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanRequester.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,8 +1,9 @@
package org.jboss.soa.esb.samples.trailblazer.loanbroker;
import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
-
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import java.net.URL;
import org.jboss.soa.esb.samples.trailblazer.web.*;
/**
@@ -19,8 +20,12 @@
public static void request(WebCustomer customer) {
try {
InitialContext iniCtx = new InitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/LoanBrokerService");
- LoanBrokerInterface port = (LoanBrokerInterface)service.getPort(LoanBrokerInterface.class);
+ //Service service = (Service)iniCtx.lookup("java:comp/env/service/LoanBrokerService");
+ //LoanBrokerInterface port = (LoanBrokerInterface)service.getPort(LoanBrokerInterface.class);
+ Service service = Service.create(
+ new URL("http://localhost:8080/trailblazer/LoanBroker?wsdl"),
+ new QName("http://localhost/trailblazer","LoanBrokerService") );
+ LoanBrokerInterface port = (LoanBrokerInterface)service.getPort(LoanBrokerInterface.class );
port.RequestLoan(customer);
} catch (Exception e) {
e.printStackTrace();
Copied: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerBean.java (from rev 15793, labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerBean.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerBean.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerBean.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,25 @@
+package org.jboss.soa.esb.samples.trailblazer.web;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.samples.trailblazer.loanbroker.LoanBroker;
+
+ at WebService(name = "LoanBrokerInterface", targetNamespace = "http://localhost/trailblazer", serviceName = "LoanBrokerService")
+ at SOAPBinding(style = SOAPBinding.Style.RPC)
+public class LoanBrokerBean {
+ private static Logger logger = Logger.getLogger(LoanBrokerBean.class);
+
+ @WebMethod
+ public void RequestLoan(@WebParam(name="webCustomer_1") WebCustomer webCustomer_1)
+ {
+ logger.info("WebCustomer received: \n" + webCustomer_1);
+
+ LoanBroker broker = new LoanBroker();
+ broker.processLoanRequest(webCustomer_1);
+ }
+}
\ No newline at end of file
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerInterface.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerInterface.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerInterface.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,10 +1,17 @@
package org.jboss.soa.esb.samples.trailblazer.web;
-import java.rmi.Remote;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
-/**
- * The Loan broker web interface, which will handle a loan request.
- */
-public interface LoanBrokerInterface extends Remote {
- public void RequestLoan(WebCustomer webCustomer_1) throws java.rmi.RemoteException;
+ at WebService(name = "LoanBrokerInterface", targetNamespace = "http://localhost/trailblazer")
+ at SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface LoanBrokerInterface {
+ @WebMethod
+ public void RequestLoan(
+ @WebParam(name = "webCustomer_1", partName = "webCustomer_1")
+ WebCustomer webCustomer_1);
+
}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerWS.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerWS.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerWS.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
- */
-package org.jboss.soa.esb.samples.trailblazer.web;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.apache.log4j.Logger;
-import org.jboss.soa.esb.samples.trailblazer.loanbroker.LoanBroker;
-
-/**
- * The Loan broker web service, which will handle a loan request.
- */
- at WebService(name = "LoanBrokerWS",
- targetNamespace = "http://localhost/trailblazer")
- at SOAPBinding(style = SOAPBinding.Style.RPC)
-public class LoanBrokerWS implements LoanBrokerInterface {
- private static final long serialVersionUID = 1L;
- private static Logger logger = Logger.getLogger(LoanBrokerWS.class);
-
- @WebMethod
- public void RequestLoan(WebCustomer customer) {
- logger.info("WebCustomer received: \n" + customer);
-
- LoanBroker broker = new LoanBroker();
- broker.processLoanRequest(customer);
- }
-}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerWSService.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerWSService.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerWSService.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,59 +0,0 @@
-
-package org.jboss.soa.esb.samples.trailblazer.web;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-
-
-/**
- * JBossWS Generated Source
- *
- * Generation Date: Thu May 24 11:21:38 EDT 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- *
- * JAX-WS Version: 2.0
- *
- */
- at WebServiceClient(name = "LoanBrokerWSService", targetNamespace = "http://localhost/trailblazer", wsdlLocation = "http://localhost:8080/trailblazer/LoanBroker?wsdl")
-public class LoanBrokerWSService
- extends Service
-{
-
- private final static URL LOANBROKERWSSERVICE_WSDL_LOCATION;
-
- static {
- URL url = null;
- try {
- url = new URL("http://localhost:8080/trailblazer/LoanBroker?wsdl");
- } catch (MalformedURLException e) {
- e.printStackTrace();
- }
- LOANBROKERWSSERVICE_WSDL_LOCATION = url;
- }
-
- public LoanBrokerWSService(URL wsdlLocation, QName serviceName) {
- super(wsdlLocation, serviceName);
- }
-
- public LoanBrokerWSService() {
- super(LOANBROKERWSSERVICE_WSDL_LOCATION, new QName("http://localhost/trailblazer", "LoanBrokerWSService"));
- }
-
- /**
- *
- * @return
- * returns LoanBrokerWS
- */
- @WebEndpoint(name = "LoanBrokerWSPort")
- public LoanBrokerWS getLoanBrokerWSPort() {
- return (LoanBrokerWS)super.getPort(new QName("http://localhost/trailblazer", "LoanBrokerWSPort"), LoanBrokerWS.class);
- }
-
-}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/esb/conf/deployment.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/esb/conf/deployment.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/esb/conf/deployment.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,7 +1,7 @@
<jbossesb-deployment>
- <depends>jboss.mq.destination:service=Queue,name=esb-tb-creditAgencyQueue</depends>
- <depends>jboss.mq.destination:service=Queue,name=esb-tb-creditAgencyQueue_reply</depends>
- <depends>jboss.mq.destination:service=Queue,name=esb-tb-bankRequestQueue</depends>
- <depends>jboss.mq.destination:service=Queue,name=esb-tb-bankResponseQueue</depends>
- <depends>jboss.mq.destination:service=Queue,name=esb-tb-bankGatewayResponseQueue</depends>
+ <depends>jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-creditAgencyQueue</depends>
+ <depends>jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-creditAgencyQueue_reply</depends>
+ <depends>jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-bankRequestQueue</depends>
+ <depends>jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-bankResponseQueue</depends>
+ <depends>jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-bankGatewayResponseQueue</depends>
</jbossesb-deployment>
Copied: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/esb/conf/jbm-queue-service.xml (from rev 15793, labs/jbossesb/trunk/product/samples/trailblazer/esb/conf/jbm-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/esb/conf/jbm-queue-service.xml (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/esb/conf/jbm-queue-service.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-creditAgencyQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-creditAgencyQueue_reply"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-bankRequestQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-bankResponseQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-bankGatewayResponseQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+</server>
Copied: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/esb/conf/jbmq-queue-service.xml (from rev 15793, labs/jbossesb/trunk/product/samples/trailblazer/esb/conf/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/esb/conf/jbmq-queue-service.xml (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/esb/conf/jbmq-queue-service.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+<mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-creditAgencyQueue">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+</mbean>
+
+<mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-creditAgencyQueue_reply">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+</mbean>
+
+<mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-bankRequestQueue">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+</mbean>
+
+<mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-bankResponseQueue">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+</mbean>
+
+<mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-bankGatewayResponseQueue">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+</mbean>
+
+
+</server>
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/esb/conf/jbmq-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/esb/conf/jbmq-service.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/esb/conf/jbmq-service.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-
-<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=esb-tb-creditAgencyQueue">
- <depends optional-attribute-name="DestinationManager">
- jboss.mq:service=DestinationManager
- </depends>
-</mbean>
-
-<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=esb-tb-creditAgencyQueue_reply">
- <depends optional-attribute-name="DestinationManager">
- jboss.mq:service=DestinationManager
- </depends>
-</mbean>
-
-<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=esb-tb-bankRequestQueue">
- <depends optional-attribute-name="DestinationManager">
- jboss.mq:service=DestinationManager
- </depends>
-</mbean>
-
-<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=esb-tb-bankResponseQueue">
- <depends optional-attribute-name="DestinationManager">
- jboss.mq:service=DestinationManager
- </depends>
-</mbean>
-
-<mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=esb-tb-bankGatewayResponseQueue">
- <depends optional-attribute-name="DestinationManager">
- jboss.mq:service=DestinationManager
- </depends>
-</mbean>
-
-
-</server>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/util/TbBootStrapper.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/util/TbBootStrapper.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/util/TbBootStrapper.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -132,15 +132,15 @@
//registry DB
sqlDir = productDir + "install/jUDDI-registry/sql/" + database + "/";
System.out.println("Dropping the registry schema if exists...");
- sqlDropCmd = TestEnvironmentUtil.readTextFile(new File(sqlDir + "drop_database.sql"));
+ sqlDropCmd = TestEnvironmentUtil.readTextFile(new File(sqlDir + "drop_database.sql")).replaceAll("\\$\\{prefix}", "");
stmnt.execute(sqlDropCmd);
System.out.println("creating the registry schema...");
String resource = "juddi-sql/" + database + "/create_database.sql";
InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
- String sqlCreateCmd = FileUtil.readStream(is);
+ sqlCreateCmd = FileUtil.readStream(is).trim().replaceAll("\\$\\{prefix}", "");
stmnt.execute(sqlCreateCmd);
System.out.println("inserting registry publishers...");
- String sqlInsertPubCmd = TestEnvironmentUtil.readTextFile(new File(sqlDir + "import.sql"));
+ String sqlInsertPubCmd = TestEnvironmentUtil.readTextFile(new File(sqlDir + "import.sql")).trim().replaceAll("\\$\\{prefix}", "");
stmnt.execute(sqlInsertPubCmd);
stmnt.close();
con.close();
Copied: labs/jbossesb/workspace/dbevenius/redeliver/product/services/jbossesb/src/main/resources/message-store-sql/oracle (from rev 15793, labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/oracle)
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/product/services/jbossesb/src/main/resources/message-store-sql/oracle/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/oracle/create_database.sql 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/services/jbossesb/src/main/resources/message-store-sql/oracle/create_database.sql 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,10 +0,0 @@
-
-CREATE TABLE message
-(
- uuid varchar2(128) NOT NULL,
- type varchar2(128) NOT NULL,
- message varchar2(4000) NOT NULL,
- delivered varchar2(10) NOT NULL,
- classification varchar2(10),
- PRIMARY KEY (uuid)
-);
Copied: labs/jbossesb/workspace/dbevenius/redeliver/product/services/jbossesb/src/main/resources/message-store-sql/oracle/create_database.sql (from rev 15793, labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/oracle/create_database.sql)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/services/jbossesb/src/main/resources/message-store-sql/oracle/create_database.sql (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/services/jbossesb/src/main/resources/message-store-sql/oracle/create_database.sql 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,10 @@
+
+CREATE TABLE message
+(
+ uuid varchar2(128) NOT NULL,
+ type varchar2(128) NOT NULL,
+ message varchar2(4000) NOT NULL,
+ delivered varchar2(10) NOT NULL,
+ classification varchar2(10),
+ PRIMARY KEY (uuid)
+);
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/product/services/jbossesb/src/main/resources/message-store-sql/oracle/drop_database.sql
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/oracle/drop_database.sql 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/services/jbossesb/src/main/resources/message-store-sql/oracle/drop_database.sql 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1 +0,0 @@
-DROP TABLE IF EXISTS message;
Copied: labs/jbossesb/workspace/dbevenius/redeliver/product/services/jbossesb/src/main/resources/message-store-sql/oracle/drop_database.sql (from rev 15793, labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/oracle/drop_database.sql)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/services/jbossesb/src/main/resources/message-store-sql/oracle/drop_database.sql (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/services/jbossesb/src/main/resources/message-store-sql/oracle/drop_database.sql 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS message;
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -20,12 +20,10 @@
package org.jboss.soa.esb.actions.converters;
import java.io.ByteArrayInputStream;
-import java.io.InputStream;
import java.util.*;
import org.apache.log4j.Logger;
import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.util.ClassUtil;
import org.jboss.soa.esb.actions.ActionLifecycleException;
import org.jboss.soa.esb.actions.ActionPipelineProcessor;
import org.jboss.soa.esb.actions.ActionProcessingException;
@@ -37,9 +35,11 @@
import org.jboss.soa.esb.message.body.content.BytesBody;
import org.jboss.soa.esb.services.transform.TransformationException;
import org.jboss.soa.esb.services.transform.TransformationService;
+import org.jboss.internal.soa.esb.assertion.AssertArgument;
import org.milyn.Smooks;
import org.milyn.SmooksUtil;
import org.milyn.container.standalone.StandaloneExecutionContext;
+import org.milyn.container.ExecutionContext;
import org.milyn.javabean.BeanAccessor;
import org.milyn.profile.DefaultProfileSet;
import org.milyn.profile.ProfileStore;
@@ -50,10 +50,13 @@
* Smooks Transformer.
* <p/>
* This processor hooks the <a href="http://milyn.codehaus.org/Smooks">Milyn Smooks</a>
- * XML Transformation/Processing Engine into a message processing pipeline to support
- * non binary message transformations.
+ * Data Transformation/Processing Engine into a message processing pipeline.
+ *
+ * <p/>
+ * A wide range of source (XML, CSV, EDI etc) and target (XML, Java, CSV, EDI etc) formats
+ * are supported.
*
- * <h3>Action Transformation Configuration</h3>
+ * <h3>Transformation Configuration</h3>
* This action works in one of 2 ways:
* <ol>
* <li>Out of a Smooks resource configuration whose URL is specified directly on the action via the
@@ -83,25 +86,7 @@
* </action>
* </pre>
*
- * <h3>Configuartion Loading & Administration Console Integration</h3>
- * This class picks up its list of transformation resource configurations from a list file
- * specified in the "configuration.list.file.uri" parameter of the "transformation"
- * section of the ESB configuration file. This configuration
- * should specify a URI to this list file and is loaded using the {@link URIResourceLocator}.
- * The default list file is "classpath:/smooks-cdr.lst" (note classpath based URIs are supported).
- * <p/>
- * This file contains a list of URIs that reference
- * <a href="http://milyn.codehaus.org/Smooks">Smooks</a> resource configurations files.
- * Again, {@link URIResourceLocator} is used to load these configurations. "classpath:/"
- * is the default if no scheme is specified. This is also where the Administration Console
- * is integrated with this class. The list file needs to specify the following a HTTP based
- * URI for accessing the configurations under management by the Administration console:
- * <pre>
- * http://localhost:8080/jboss-esb-console/transform/smooks-config.jsp
- * </pre>
- * ... where the host and port values need to be modified appropriately.
- *
- * <h3>Action Transformation Input/Output Configuration</h3>
+ * <h3>Transformation Input/Output Configuration</h3>
* This action gets the transformation input, and sets the transformation output
* based on the "input-location" and "output-location" configuration properties.
* These properties name the {@link Body Message.Body} location where the transformation input
@@ -113,13 +98,23 @@
* {@link Body Message.Body} location named "{@link Body#DEFAULT_LOCATION defaultEntry}". If the "output-location"
* is not configured on the action, the action will set the transformation result/output
* in the {@link Body Message.Body} location named "{@link Body#DEFAULT_LOCATION defaultEntry}".
+ *
+ * <h3>Java Transformation Input/Output Configuration</h3>
+ * This action supports source (XML, CSV, EDI etc) to Java object transformation/binding. See the
+ * "Transform_*" quickstarts for examples of this and also check out the
+ * <a href="http://milyn.codehaus.org/Tutorials">Smooks Tutorials</a>.
* <p/>
- * From a Java code perspective, setting and getting on the "{@link Body#DEFAULT_LOCATION defaultEntry}"
- * is done simply by calling the no-name-arg {@link Body#add(Object)} and {@link Body#get()} methods.
+ * The constructed Java object model can be used as part of a
+ * <a href="http://milyn.codehaus.org/Model+Driven+Transformation">model driven transform</a>, or can
+ * simply be used by other ESB action instances that follow the SmooksTransformer in an action
+ * pipeline.
* <p/>
- * Smooks transforms may also be designed to populate Java objects from the input message (bind to
- * java objects). These Java objects are bound (a {@link Map}) to the message under the key
- * "<<i>output-location</i>><b>-java</b>".
+ * Such Java object graphs are available to subsequent pipeline action instances because they are
+ * attached to the ESB Message output by this action and input to the following action(s). They are bound
+ * to the Message instance Body
+ * ({@link Body#add(String, Object) Message.getBody().add(String key, Object object)}) under a key based
+ * directly on the objects "beanId"
+ * <a href="http://milyn.codehaus.org/javadoc/smooks-cartridges/javabean/org/milyn/javabean/BeanPopulator.html">as defined in the Smooks Javabean config</a>.
*
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
* @since Version 4.0
@@ -134,6 +129,8 @@
/**
* Key for storing/accessing any potential message Body bean HashMaps as populated
* by the Smooks Javabean Cartridge.
+ * @deprecated The Smooks {@link org.milyn.container.ExecutionContext} is
+ * attached to the message and can be accessed through the {@link }
*/
public static final String EXTRACTED_BEANS_HASH = "EXTRACTED_BEANS_HASH";
/**
@@ -148,6 +145,11 @@
* Config key for the message body location on which the output message is attached.
*/
public static final String OUTPUT_LOCATION = "output-location";
+ /**
+ * Config key for the name of the Smooks Execution context object to be
+ * output to the "output-location".
+ */
+ public static final String JAVA_OUTPUT = "java-output-location";
public static final String FROM = "from";
public static final String FROM_TYPE = "from-type";
@@ -155,11 +157,15 @@
public static final String TO_TYPE = "to-type";
public static final String SMOOKS_CDRL_FILE="smooks-cdrl-file";
public static final String UPDATE_TOPIC="update-topic";
-
+
+ private static final String BEANS_SPEC = "beans:";
+ private static final String BEANS_SPEC_ALL = BEANS_SPEC + "*";
+
private static Logger logger = Logger.getLogger(SmooksTransformer.class);
private SmooksInstanceManager smooksInstanceManager;
private String inputLocation;
private String outputLocation;
+ private String javaOutputLocation;
private String defaultMessageFromType;
private String defaultMessageFrom;
private String defaultMessageToType;
@@ -179,6 +185,10 @@
inputLocation = KeyValuePair.getValue(INPUT_LOCATION, properties, Body.DEFAULT_LOCATION);
// if no output location given, then assume default location in message body.
outputLocation = KeyValuePair.getValue(OUTPUT_LOCATION, properties, Body.DEFAULT_LOCATION);
+ javaOutputLocation = KeyValuePair.getValue(JAVA_OUTPUT, properties);
+ if(javaOutputLocation != null) {
+ javaOutputLocation = javaOutputLocation.trim();
+ }
// Get the default message flow properties (can be overriden by the message properties)...
defaultMessageFromType = KeyValuePair.getValue(FROM_TYPE, properties);
@@ -302,15 +312,11 @@
}
transformedMessage = SmooksUtil.filterAndSerialize(executionContext, new ByteArrayInputStream( messageBytes), smooks);
- // Javabean cartridge resources may have extract data from the message and populated some beans.
- // Get them and stick them on the message - so they can be accessed by downstream actions...
- HashMap beanHash = BeanAccessor.getBeans(executionContext);
+ HashMap beanHash = BeanAccessor.getBeans(executionContext); // Backward compatibility.
if(beanHash != null) {
message.getBody().add(EXTRACTED_BEANS_HASH, beanHash); // Backward compatibility.
- message.getBody().add(outputLocation + "-java", beanHash);
} else {
message.getBody().remove(EXTRACTED_BEANS_HASH); // Backward compatibility.
- message.getBody().remove(outputLocation + "-java");
}
if(logger.isDebugEnabled()) {
@@ -319,8 +325,7 @@
+ timeTaken + ". Message in:\n[" + payload.toString()+ "]. \nMessage out:\n[" + transformedMessage + "].");
}
- message.getBody().add(ActionUtils.POST_ACTION_DATA, transformedMessage);
- message.getBody().add(outputLocation, transformedMessage);
+ setTransformationOutput(message, transformedMessage, executionContext);
} else {
logger.warn("Only java.lang.String payload types supported. Input message was of type [" + payload.getClass().getName() + "]. Returning message untransformed.");
}
@@ -344,6 +349,44 @@
return message;
}
+ private void setTransformationOutput(Message message, String transformedMessage, StandaloneExecutionContext executionContext) {
+ // Set the transformation text output...
+ message.getBody().add(ActionUtils.POST_ACTION_DATA, transformedMessage);
+ message.getBody().add(outputLocation, transformedMessage);
+
+ // Set the transformation Java output. Will be the individual
+ // java objects directly on the message and (optionally) the map itself...
+ Map beanMap = BeanAccessor.getBeans(executionContext);
+ if(beanMap != null) {
+ Iterator<Map.Entry> beans = beanMap.entrySet().iterator();
+ while (beans.hasNext()) {
+ Map.Entry entry = beans.next();
+ String key = (String) entry.getKey();
+
+ if(message.getBody().get(key) != null) {
+ logger.debug("Outputting Java object to '" + key + "'. Overwritting existing value.");
+ }
+ message.getBody().add(key, entry.getValue());
+ }
+ }
+
+ // Now the map itself, if configured for output....
+ if(javaOutputLocation != null) {
+ if(beanMap != null) {
+ String location = javaOutputLocation;
+ if(location.equals("$default")) {
+ location = Body.DEFAULT_LOCATION;
+ }
+ if(message.getBody().get(location) != null) {
+ logger.debug("Outputting Java object Map to '" + location + "'. Overwritting existing value.");
+ }
+ message.getBody().add(location, beanMap);
+ } else {
+ logger.debug("Transformation Javabean spec '" + javaOutputLocation + "' doesn't evaluate to any bean map for the current message.");
+ }
+ }
+ }
+
/**
* Register the Message Exchange as a profile within Smooks.
* @param message The message.
@@ -423,7 +466,7 @@
return profileArray;
}
- /**
+ /**
* Construct the Smooks profile string based on the supplied message flow properties.
* @param messageFromType The type string for the message source.
* @param messageFrom The EPR string for the message source.
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/test/java/org/jboss/soa/esb/actions/converters/SmooksTransformerUnitTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -24,6 +24,7 @@
import java.net.URISyntaxException;
+import java.util.Map;
import junit.framework.TestCase;
@@ -82,6 +83,7 @@
Message message;
properties.setAttribute(SmooksTransformer.RESOURCE_CONFIG, "/org/jboss/soa/esb/actions/converters/smooks-conf.xml");
+ properties.setAttribute(SmooksTransformer.JAVA_OUTPUT, "ObjectMap");
transformer = new SmooksTransformer(properties);
transformer.initialise();
@@ -89,9 +91,12 @@
message = MessageFactory.getInstance().getMessage();
message.getBody().add("<x xprop='xval' />");
- assertNull(message.getBody().get(Body.DEFAULT_LOCATION + "-java"));
+ assertNull(message.getBody().get("orderHeader"));
message = transformer.process(message);
- assertNotNull(message.getBody().get(Body.DEFAULT_LOCATION + "-java"));
+ assertNotNull(message.getBody().get("orderHeader"));
+ assertTrue(message.getBody().get("orderHeader") instanceof XClass);
+ assertNotNull(message.getBody().get("ObjectMap"));
+ assertTrue(message.getBody().get("ObjectMap") instanceof Map);
}
private String transform(String stringMessage, String fromType, String from, String to, String toType) throws ActionProcessingException, ConfigurationException, URISyntaxException, ActionLifecycleException {
@@ -103,7 +108,6 @@
// Perform the transformation by setting the payload on the task object...
message = MessageFactory.getInstance().getMessage();
- message = MessageFactory.getInstance().getMessage();
message.getBody().add(ActionUtils.POST_ACTION_DATA, stringMessage);
message = transformer.process(message);
String resultThroughTaskObj = (String) message.getBody().get(ActionUtils.POST_ACTION_DATA);
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management/monitoring.cfg.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management/monitoring.cfg.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management/monitoring.cfg.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -7,7 +7,7 @@
<property name="hibernate.session_factory_name">SessionFactory</property>
<property name="connection.datasource">@connection.datasource@</property>
<property name="dialect">@db.dialect@</property>
- <property name="hibernate.session_factory_name">java:/comp/env/hibernate/MonitoringSessionFactory</property>
+ <property name="hibernate.session_factory_name">java:/hibernate/MonitoringSessionFactory</property>
<!-- Mapping files -->
<mapping resource="org/jboss/soa/esb/monitoring/monitoring-mappings.hbm.xml"/>
</session-factory>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/MonitoringSessionFactory.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/MonitoringSessionFactory.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/MonitoringSessionFactory.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -55,7 +55,7 @@
*
*/
public class MonitoringSessionFactory {
- public static final String HIBERNATE_JNDI = "java:comp/env/hibernate/MonitoringSessionFactory";
+ public static final String HIBERNATE_JNDI = "java:/hibernate/MonitoringSessionFactory";
private static final Logger m_Logger = Logger.getLogger(MonitoringSessionFactory.class);
private static SessionFactory sessionFactory;
@@ -78,6 +78,7 @@
private static void init() {
try {
sessionFactory = new Configuration().configure("monitoring.cfg.xml").buildSessionFactory();
+
} catch (Exception e) {
m_Logger.error("", e);
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/pojo/JMXData.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/pojo/JMXData.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/pojo/JMXData.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -184,7 +184,9 @@
* @see java.lang.Object#toString()
*/
public String toString() {
- return "id [" + id + "] time[" + statdate + "]";
+ return "id [" + id + "] time[" + statdate + "] server ["
+ + server + "] attribute [" + attribute.getId() + " " + attribute.getObjectname()
+ + "] count[" + countvalue + "] text [" + textvalue + "] timevalue [" + timevalue + "]";
}
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerJob.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerJob.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerJob.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -59,60 +59,69 @@
public void execute (JobExecutionContext jobExecutionContext)
throws JobExecutionException {
- DeliverOnlyCourier sender = null;
- logger.debug("Collect statistics from EPRs");
- List list;
- try {
- list = RegistryUtil.getEprs(FilerAction.INTERNAL_CATEGORY, FilerAction.DATA_COLLECTOR_SERVICE_ACTION_NAME);
- if (list != null) {
- for (int i = 0; i < list.size(); i++) {
- EPR epr = (EPR)list.get(i);
- // Send message requesting performance data
- Message esbMessage = MessageFactory.getInstance().getMessage();
- esbMessage.getProperties().setProperty(MessageBodyTypeNames.COMMAND_TYPE, MessageBodyTypeNames.STATISTICS_REQUEST);
- esbMessage.getBody().add(BytesBody.BYTES_LOCATION, "get statistics".getBytes());
-
- URI uri = new URI(UUID.randomUUID().toString());
- esbMessage.getHeader().getCall().setMessageID(uri);
-
- try {
- sender = CourierFactory.getCourier(epr);
- sender.deliver(esbMessage);
- } finally {
- CourierUtil.cleanCourier(sender);
- }
- }
- }
-
- list = RegistryUtil.getEprs(FilerAction.INTERNAL_CATEGORY, FilerAction.OPERATIONS_COLLECTOR_SERVICE_ACTION_NAME);
- if (list != null) {
- for (int i = 0; i < list.size(); i++) {
- EPR epr = (EPR)list.get(i);
- // Send message requesting operations data
- Message opMessage = MessageFactory.getInstance().getMessage();
- opMessage.getProperties().setProperty(MessageBodyTypeNames.COMMAND_TYPE, MessageBodyTypeNames.OPERATIONS_REQUEST);
- opMessage.getBody().add(BytesBody.BYTES_LOCATION, "get statistics".getBytes());
-
- URI opURI = new URI(UUID.randomUUID().toString());
- opMessage.getHeader().getCall().setMessageID(opURI);
- try{
- sender = CourierFactory.getCourier(epr);
- sender.deliver(opMessage);
- } finally {
- CourierUtil.cleanCourier(sender);
- }
- }
- }
- } catch (RegistryException e) {
- logger.error("", e);
- } catch (CourierException e) {
- logger.error("", e);
- } catch (MalformedEPRException e) {
- logger.error("", e);
- } catch (URISyntaxException e) {
- logger.error("", e);
- } catch (ServiceNotFoundException e) {
- logger.error("", e);
- }
+ final ClassLoader currentClassLoader = Thread.currentThread().getContextClassLoader() ;
+ try
+ {
+ Thread.currentThread().setContextClassLoader((ClassLoader)jobExecutionContext.getJobDetail().getJobDataMap().get(ClassLoader.class.getName())) ;
+ DeliverOnlyCourier sender = null;
+ logger.debug("Collect statistics from EPRs");
+ List list;
+ try {
+ list = RegistryUtil.getEprs(FilerAction.INTERNAL_CATEGORY, FilerAction.DATA_COLLECTOR_SERVICE_ACTION_NAME);
+ if (list != null) {
+ for (int i = 0; i < list.size(); i++) {
+ EPR epr = (EPR)list.get(i);
+ // Send message requesting performance data
+ Message esbMessage = MessageFactory.getInstance().getMessage();
+ esbMessage.getProperties().setProperty(MessageBodyTypeNames.COMMAND_TYPE, MessageBodyTypeNames.STATISTICS_REQUEST);
+ esbMessage.getBody().add(BytesBody.BYTES_LOCATION, "get statistics".getBytes());
+
+ URI uri = new URI(UUID.randomUUID().toString());
+ esbMessage.getHeader().getCall().setMessageID(uri);
+
+ try {
+ sender = CourierFactory.getCourier(epr);
+ sender.deliver(esbMessage);
+ } finally {
+ CourierUtil.cleanCourier(sender);
+ }
+ }
+ }
+
+ list = RegistryUtil.getEprs(FilerAction.INTERNAL_CATEGORY, FilerAction.OPERATIONS_COLLECTOR_SERVICE_ACTION_NAME);
+ if (list != null) {
+ for (int i = 0; i < list.size(); i++) {
+ EPR epr = (EPR)list.get(i);
+ // Send message requesting operations data
+ Message opMessage = MessageFactory.getInstance().getMessage();
+ opMessage.getProperties().setProperty(MessageBodyTypeNames.COMMAND_TYPE, MessageBodyTypeNames.OPERATIONS_REQUEST);
+ opMessage.getBody().add(BytesBody.BYTES_LOCATION, "get statistics".getBytes());
+
+ URI opURI = new URI(UUID.randomUUID().toString());
+ opMessage.getHeader().getCall().setMessageID(opURI);
+ try{
+ sender = CourierFactory.getCourier(epr);
+ sender.deliver(opMessage);
+ } finally {
+ CourierUtil.cleanCourier(sender);
+ }
+ }
+ }
+ } catch (RegistryException e) {
+ logger.error("", e);
+ } catch (CourierException e) {
+ logger.error("", e);
+ } catch (MalformedEPRException e) {
+ logger.error("", e);
+ } catch (URISyntaxException e) {
+ logger.error("", e);
+ } catch (ServiceNotFoundException e) {
+ logger.error("", e);
+ }
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(currentClassLoader) ;
+ }
}
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerScheduler.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerScheduler.java 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerScheduler.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -24,6 +24,7 @@
import java.util.Date;
import org.apache.log4j.Logger;
+import org.quartz.JobDataMap;
import org.quartz.JobDetail;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
@@ -60,8 +61,13 @@
scheduler.deleteJob(DataFilerJob.JOB_GROUP, DataFilerJob.JOB_NAME);
JobDetail jobDetail = new JobDetail(DataFilerJob.JOB_GROUP, DataFilerJob.JOB_NAME, DataFilerJob.class);
+
+ final JobDataMap datamap = new JobDataMap() ;
+ datamap.put(ClassLoader.class.getName(), Thread.currentThread().getContextClassLoader()) ;
+ jobDetail.setJobDataMap(datamap) ;
+
SimpleTrigger simpleTrigger = new SimpleTrigger(DataFilerJob.JOB_GROUP, DataFilerJob.JOB_NAME);
- simpleTrigger.setStartTime(new Date(ctime));
+ simpleTrigger.setStartTime(new Date(ctime + 10000));
simpleTrigger.setRepeatInterval(1000 * 60 * pollMinuteFrequency);
simpleTrigger.setRepeatCount(-1);
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management-esb/deployment.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management-esb/deployment.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management-esb/deployment.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,5 +1,7 @@
<jbossesb-deployment>
+ <depends>jboss.jca:service=DataSourceBinding,name=ManagementDS</depends>
<depends>jboss.esb.console.destination:service=Queue,name=DataFilerQueue</depends>
<depends>jboss.esb.console.destination:service=Queue,name=OperationsFilerQueue</depends>
<depends>jboss.esb.console.destination:service=Queue,name=InvokerFilerQueue</depends>
+ <depends>jboss.jca:service=DataSourceBinding,name=juddiDB</depends>
</jbossesb-deployment>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management-esb/src/main/resources/hsqldb/create_database.sql
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management-esb/src/main/resources/hsqldb/create_database.sql 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management-esb/src/main/resources/hsqldb/create_database.sql 2007-10-12 08:05:28 UTC (rev 15795)
@@ -7,7 +7,7 @@
);
CREATE TABLE JMXATTRIBUTE (
-STATID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,
+STATID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY,
OBJECTNAME VARCHAR(255) NOT NULL,
ATTRIBUTE VARCHAR(255) NOT NULL,
CONSTRAINT UNIQUE_ATTRID UNIQUE(STATID),
@@ -15,7 +15,7 @@
);
CREATE TABLE JMXOPERATION (
-OPID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,
+OPID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY,
OBJECTNAME VARCHAR(255) NOT NULL,
OPERATION VARCHAR(255) NOT NULL,
DESCRIPTION VARCHAR(255) NOT NULL,
@@ -27,7 +27,7 @@
);
CREATE TABLE JMXOPERATIONRESULT (
-ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,
+ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY,
OPID INTEGER,
SERVER VARCHAR(255),
STATDATE TIMESTAMP,
@@ -37,13 +37,12 @@
);
CREATE TABLE JMXDATA (
-ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,
+ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY,
STATID INTEGER,
SERVER VARCHAR(255),
STATDATE TIMESTAMP,
TIMEVALUE FLOAT,
COUNTVALUE INT,
TEXTVALUE VARCHAR(255),
-CONSTRAINT UNIQUE_DATA UNIQUE(STATID, SERVER, STATDATE),
CONSTRAINT FK_ATTRIBUTE FOREIGN KEY(STATID) REFERENCES JMXATTRIBUTE
);
Modified: labs/jbossesb/workspace/dbevenius/redeliver/qa/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/build.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/build.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -16,6 +16,7 @@
<property file="${org.jboss.esb.properties}"/>
<property file="test.properties" />
+ <property name="org.jboss.esb.test.quickstarts.dir" location="${product.dir}/build/jbossesb/samples/quickstarts"/>
<property name="junit.jar" location="lib/ext/junit-4.1.jar"/>
<macrodef name="runant">
@@ -57,26 +58,24 @@
<target name="test.junit" depends="esb.init" description="Run JUnit based QA tests.">
<ant dir="junit" target="test" />
+ <ant dir="quickstarts" target="all-test" />
</target>
<target name="ci-test.junit" depends="esb.init" description="Run JUnit based QA tests.">
- <ant dir="junit" target="ci-test" />
+ <ant dir="junit" target="ci-test" />
+ <ant dir="quickstarts" target="ci-test" />
</target>
<target name="clean" description="Clean the QA env">
<echo message="Cleaning..."/>
<delete dir="${basedir}/build" />
- <delete>
- <fileset dir="." includes="qatests.log unittest.log"/>
- </delete>
- <!-- hardcoded in at least one test -->
- <delete dir="${basedir}/product" />
+ <ant dir="quickstarts" target="ci-clean" />
</target>
<target name="start-server" depends="esb.setup-esb">
<echo>server ${org.jboss.esb.server.home} ${org.jboss.esb.test.server.config}</echo>
- <start-server serverHome="${org.jboss.esb.server.home}"
+ <start-server serverHome="${org.jboss.esb.server.home}"
serverConfig="${org.jboss.esb.test.server.config}"/>
<wait-on-server/>
</target>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/qa/junit/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/junit/build.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/junit/build.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -140,7 +140,6 @@
fork="true">
<sysproperty key="jbosstest.deploy.dir" value="${qa.build.lib}"/>
- <sysproperty key="build.testlog" value="${qa.build.testlog}"/>
<sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
<sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
<sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
@@ -221,7 +220,6 @@
<jvmarg value="-Xmx${qa.junit.memory}"/>
<sysproperty key="jbosstest.deploy.dir" value="${qa.build.lib}"/>
- <sysproperty key="build.testlog" value="${qa.build.testlog}"/>
<sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
<sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
<sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
@@ -235,10 +233,6 @@
<sysproperty key="org.jboss.soa.esb.jndi.server.url" value="${org.jboss.soa.esb.jndi.server.url}"/>
<!-- Sys Props from the deployment.properties file... -->
- <sysproperty key="org.jboss.esb.db.driver" value="${org.jboss.esb.db.driver}"/>
- <sysproperty key="org.jboss.esb.db.url" value="${org.jboss.esb.db.url}"/>
- <sysproperty key="org.jboss.esb.db.user" value="${org.jboss.esb.db.user}"/>
- <sysproperty key="org.jboss.esb.db.password" value="${org.jboss.esb.db.password}"/>
<sysproperty key="org.jboss.esb.test.ftp.hostname" value="${org.jboss.esb.test.ftp.hostname}"/>
<sysproperty key="org.jboss.esb.test.ftp.user" value="${org.jboss.esb.test.ftp.user}"/>
<sysproperty key="org.jboss.esb.test.ftp.pwd" value="${org.jboss.esb.test.ftp.pwd}"/>
@@ -246,11 +240,6 @@
</junit>
- <!-- Remove all "fixed-up" listener configuration files -->
- <delete>
- <fileset dir="${qa.junit.src}" includes="**/*.conftmp"/>
- </delete>
-
<!-- Report on the tests (format results) ... -->
<junitreport todir="${qa.junit.report}">
<fileset dir="${qa.junit.report}">
@@ -318,11 +307,6 @@
<sysproperty key="org.jboss.esb.db.password" value="${org.jboss.esb.db.password}"/>
</junit>
- <!-- Remove all "fixed-up" listener configuration files -->
- <delete>
- <fileset dir="${qa.junit.src}" includes="**/*.conftmp"/>
- </delete>
-
<!-- Report on the tests (format results) ... -->
<junitreport todir="${qa.junit.report}">
<fileset dir="${qa.junit.report}">
Modified: labs/jbossesb/workspace/dbevenius/redeliver/qa/lib/ext/jboss-messaging-client.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/redeliver/qa/log4j.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/log4j.xml 2007-10-12 07:46:28 UTC (rev 15794)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/log4j.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -37,7 +37,7 @@
<!-- 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="build/logs/qatests.log"/>
+ <param name="File" value="../build/logs/qatests.log"/>
<param name="Append" value="false"/>
<param name="MaxFileSize" value="500KB"/>
<param name="MaxBackupIndex" value="1"/>
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts (from rev 15793, labs/jbossesb/trunk/qa/quickstarts)
Property changes on: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts
___________________________________________________________________
Name: svn:ignore
+ output
build
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/build.xml
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/build.xml 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/build.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,391 +0,0 @@
-<?xml version="1.0"?>
-<project name="JUnit" default="test" basedir=".">
- <property file="quickstarts.properties"/>
-
- <property name="product.dir" location="../../product"/>
- <property name="product.build" location="${product.dir}/build"/>
- <property name="product.lib" location="${product.build}/jbossesb/lib"/>
- <property name="product.lib.ext" location="${product.lib}/ext"/>
- <property name="org.jboss.esb.test.quickstarts.dir" location="${product.build}/jbossesb/samples/quickstarts"/>
- <property name="coverage" location="${product.build}/tests/coverage"/>
- <property name="qa.dir" location=".."/>
- <property name="qa.build" location="${qa.dir}/build"/>
- <property name="qa.build.reports" location="${qa.build}/reports"/>
- <property name="qa.lib" location="${qa.dir}/lib"/>
- <property name="qa.build.stylesheets" location="${qa.build}/stylesheets"/>
- <property name="qa.source.stylesheets" location="${qa.dir}/stylesheets"/>
- <property name="qa.quickstarts.src" location="src"/>
- <property name="qa.quickstarts.build" location="${qa.build}/quickstarts"/>
- <property name="qa.quickstarts.build.lib" location="${qa.quickstarts.build}/lib"/>
- <property name="qa.quickstarts.classes" location="${qa.quickstarts.build}/classes"/>
- <property name="qa.junit.resources" location="resources"/>
- <property name="qa.quickstarts.report" location="${qa.quickstarts.build}/report"/>
- <property name="qa.quickstarts.memory" value="128m"/>
-
- <property name="qa.quickstarts.server.home" location="${org.jboss.esb.server.home}"/>
-
- <property name="org.jboss.soa.esb.paramsRepository.file.root" location="src"/>
-
- <property name="junit.jar" location="${product.lib.ext}/junit-4.1.jar"/>
- <macrodef name="runant">
- <attribute name="target"/>
- <attribute name="failonerror" default="true"/>
- <attribute name="resultproperty" default="product.java.resultproperty"/>
- <sequential>
- <java classname="org.apache.tools.ant.launch.Launcher"
- classpath="${ant.library.dir}/ant-launcher.jar"
- fork="true" failonerror="@{failonerror}"
- resultproperty="@{resultproperty}">
- <sysproperty key="ant.home" value="${ant.home}"/>
- <sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
- <sysproperty key="org.jboss.esb.properties" value="${org.jboss.esb.properties}"/>
- <arg value="-cp"/>
- <arg value="${junit.jar}"/>
- <arg value="-f"/>
- <arg value="${ant.file}"/>
- <arg value="@{target}"/>
- </java>
- </sequential>
- </macrodef>
-
- <path id="base.cp">
- <fileset dir="${qa.lib}/ext" includes="*.jar"/>
- <fileset dir="${product.lib}/ext" includes="*.jar"/>
- <pathelement location="${qa.dir}/"/>
- </path>
-
- <path id="qa.quickstarts.cp">
- <!-- include qs specific jars -->
- <fileset dir="${org.jboss.esb.test.quickstarts.dir}">
- <include name="bpm_orchestration1/lib/**/*.jar"/>
- <include name="dynamic_router/lib/**/*.jar"/>
- <include name="fun_cbr/lib/**/*.jar"/>
- <include name="helloworld/lib/**/*.jar"/>
- <include name="helloworld_action/lib/**/*.jar"/>
- <include name="helloworld_db_registration/lib/**/*.jar"/>
- <include name="helloworld_file_action/lib/**/*.jar"/>
- <include name="helloworld_sql_action/lib/**/*.jar"/>
- <include name="recipient_list/lib/**/*.jar"/>
- <include name="scripting_groovy/lib/**/*.jar"/>
- <include name="simple_cbr/lib/**/*.jar"/>
- <include name="static_router/lib/**/*.jar"/>
- <include name="transform_CSV2XML/lib/**/*.jar"/>
- <include name="transform_EDI2XML_Groovy_XSLT/lib/**/*.jar"/>
- <include name="transform_XML2POJO/lib/**/*.jar"/>
- <include name="transform_XML2XML_date_manipulation/lib/**/*.jar"/>
- <include name="transform_XML2XML_simple/lib/**/*.jar"/>
- <include name="wiretap/lib/**/*.jar"/>
- </fileset>
-
- <!-- include qs specific classes -->
- <dirset dir="${org.jboss.esb.test.quickstarts.dir}">
- <include name="bpm_orchestration1/build/classes"/>
- <include name="dynamic_router/build/classes"/>
- <include name="fun_cbr/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_sql_action/build/classes"/>
- <include name="recipient_list/build/classes"/>
- <include name="scripting_groovy/build/classes"/>
- <include name="simple_cbr/build/classes"/>
- <include name="static_router/build/classes"/>
- <include name="transform_CSV2XML/build/classes"/>
- <include name="transform_EDI2XML_Groovy_XSLT/build/classes"/>
- <include name="transform_XML2POJO/build/classes"/>
- <include name="transform_XML2XML_date_manipulation/build/classes"/>
- <include name="transform_XML2XML_simple/build/classes"/>
- <include name="wiretap/build/classes"/>
- </dirset>
-
- <fileset dir="${product.lib.ext}" includes="*.jar"/>
- <fileset dir="${product.lib}" includes="*.jar"/>
- <pathelement location="${qa.junit.resources}"/>
- <path refid="base.cp"/>
- </path>
-
- <path id="qa.quickstarts.emma.cp">
- <fileset dir="${coverage}/all" includes="jbossesb-instr-all.jar"/>
- <path refid="base.cp"/>
- </path>
-
- <macrodef name="exec-quickstart">
- <attribute name="quickstart"/>
- <attribute name="target"/>
- <sequential>
- <ant antfile="build.xml"
- dir="${org.jboss.esb.test.quickstarts.dir}/@{quickstart}"
- target="@{target}" inheritAll="false">
- <property name="quickstart.jbossesb.ftp.hostname" value="${org.jboss.esb.test.ftp.hostname}"/>
- <property name="quickstart.jbossesb.ftp.username" value="${org.jboss.esb.test.ftp.user}"/>
- <property name="quickstart.jbossesb.ftp.password" value="${org.jboss.esb.test.ftp.pwd}"/>
- <property name="quickstart.jbossesb.ftp.directory" value="${org.jboss.esb.test.ftp.dir}"/>
- <property name="org.jboss.esb.server.home" location="${qa.quickstarts.server.home}"/>
- <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
- </ant>
- </sequential>
- </macrodef>
-
- <target name="init">
- <available property="quickstarts.exist" type="dir"
- file="${org.jboss.esb.test.quickstarts.dir}"/>
- </target>
-
- <target name="clean" depends="init, clean-esb"/>
-
- <target name="one-test">
- <runant target="internal-one-test"/>
- </target>
-
- <target name="internal-one-test" depends="compile, prompt, execute"/>
-
- <target name="test">
- <runant target="ci-test"/>
- </target>
-
- <target name="ci-test" depends="compile, execute"/>
-
- <target name="ci-clean" depends="init, clean-esb"/>
-
- <target name="compile" depends="compile-esb">
- <echo message="Compiling JUnit based Quickstart tests..."/>
-
-
- <!-- Build the tests... -->
- <mkdir dir="${qa.quickstarts.classes}"/>
-
- <javac srcdir="${qa.quickstarts.src}" destdir="${qa.quickstarts.classes}" classpathref="qa.quickstarts.cp" debug="on"/>
-
- </target>
-
- <target name="clean-esb" if="quickstarts.exist">
- <exec-quickstart quickstart="bpm_orchestration1" target="clean"/>
- <exec-quickstart quickstart="dynamic_router" target="clean"/>
- <exec-quickstart quickstart="fun_cbr" 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_sql_action" target="clean"/>
- <exec-quickstart quickstart="recipient_list" target="clean"/>
- <exec-quickstart quickstart="scripting_groovy" target="clean"/>
- <exec-quickstart quickstart="simple_cbr" target="clean"/>
- <exec-quickstart quickstart="static_router" target="clean"/>
- <exec-quickstart quickstart="transform_CSV2XML" target="clean"/>
- <exec-quickstart quickstart="transform_EDI2XML_Groovy_XSLT" target="clean"/>
- <exec-quickstart quickstart="transform_XML2POJO" target="clean"/>
- <exec-quickstart quickstart="transform_XML2XML_date_manipulation" target="clean"/>
- <exec-quickstart quickstart="transform_XML2XML_simple" target="clean"/>
- <exec-quickstart quickstart="wiretap" target="clean"/>
- </target>
-
- <target name="compile-esb">
- <echo>Compile ESB Packages</echo>
- <exec-quickstart quickstart="bpm_orchestration1" target="prepare-deployment"/>
- <exec-quickstart quickstart="dynamic_router" target="prepare-deployment"/>
- <exec-quickstart quickstart="fun_cbr" 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_sql_action" target="prepare-deployment"/>
- <exec-quickstart quickstart="recipient_list" target="prepare-deployment"/>
- <exec-quickstart quickstart="scripting_groovy" target="prepare-deployment"/>
- <exec-quickstart quickstart="simple_cbr" target="prepare-deployment"/>
- <exec-quickstart quickstart="static_router" target="prepare-deployment"/>
- <exec-quickstart quickstart="transform_CSV2XML" target="prepare-deployment"/>
- <exec-quickstart quickstart="transform_EDI2XML_Groovy_XSLT" target="prepare-deployment"/>
- <exec-quickstart quickstart="transform_XML2POJO" target="prepare-deployment"/>
- <exec-quickstart quickstart="transform_XML2XML_date_manipulation" target="prepare-deployment"/>
- <exec-quickstart quickstart="transform_XML2XML_simple" target="prepare-deployment"/>
- <exec-quickstart quickstart="wiretap" target="prepare-deployment"/>
-
- <copy todir="${qa.quickstarts.build.lib}" flatten="true">
- <fileset dir="${org.jboss.esb.test.quickstarts.dir}">
- <include name="bpm_orchestration1/build/*.esb"/>
- <include name="dynamic_router/build/*.esb"/>
- <include name="fun_cbr/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_sql_action/build/*.esb"/>
- <include name="recipient_list/build/*.esb"/>
- <include name="scripting_groovy/build/*.esb"/>
- <include name="simple_cbr/build/*.esb"/>
- <include name="static_router/build/*.esb"/>
- <include name="transform_CSV2XML/build/*.esb"/>
- <include name="transform_EDI2XML_Groovy_XSLT/build/*.esb"/>
- <include name="transform_XML2POJO/build/*.esb"/>
- <include name="transform_XML2XML_date_manipulation/build/*.esb"/>
- <include name="transform_XML2XML_simple/build/*.esb"/>
- <include name="wiretap/build/*.esb"/>
- </fileset>
- </copy>
- </target>
-
- <target name="compile-stylesheets">
- <mkdir dir="${qa.build.stylesheets}"/>
- <copy todir="${qa.build.stylesheets}" filtering="yes">
- <fileset dir="${qa.source.stylesheets}">
- <include name="**/*"/>
- </fileset>
- </copy>
- </target>
-
-
- <target name="tests-report-html" depends="compile-stylesheets">
- <mkdir dir="${qa.build.reports}/html"/>
-
- <junitreport todir="${qa.build.reports}">
- <fileset dir="${qa.build.reports}">
- <include name="TEST-*.xml"/>
- </fileset>
- <report format="frames"
- todir="${qa.build.reports}/html"
- styledir="${qa.build.stylesheets}"
- />
- </junitreport>
- </target>
-
-
- <target name="execute">
- <!-- Run the tests... -->
- <property name="tests.filter" value="*"/>
- <mkdir dir="${qa.quickstarts.report}"/>
- <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="yes" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <batchtest todir="${qa.quickstarts.report}">
- <fileset dir="${qa.quickstarts.src}">
- <include name="**/${tests.filter}Test.java"/>
- <exclude name="${tests.exclude}"/>
- <exclude name="**/HelloWorldSQLActionTest.java"/>
- <exclude name="**/RecipientlistTest.java"/>
- <exclude name="**/FunCBRTest.java"/>
- <exclude name="**/BPMOrchestrationTest.java"/>
- <exclude name="**/SimpleCBRTest.java"/>
- <exclude name="**/DynamicRouterTest.java"/>
- <exclude name="**/StaticRouterTest.java"/>
- <exclude name="**/WebserviceAdapterTest.java"/>
- <exclude name="**/HelloWorldDBRegistrationTest.java"/>
- <exclude name="**/WebserviceBPELTest.java"/>
- </fileset>
- </batchtest>
- <classpath>
- <pathelement location="${qa.quickstarts.classes}"/>
- <path refid="qa.quickstarts.cp"/>
- <pathelement location="${qa.quickstarts.src}"/>
- </classpath>
- <jvmarg value="-Xmx${qa.quickstarts.memory}"/>
-
- <sysproperty key="jbosstest.deploy.dir" value="${qa.quickstarts.build.lib}"/>
- <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
- <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
- <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
-
-
- <!-- Listener Sys Props... -->
- <sysproperty key="org.jboss.soa.esb.paramsRepository.file.root"
- value="${org.jboss.soa.esb.paramsRepository.file.root}"/>
-
- <!-- Sys Props from the test.properties file... -->
- <sysproperty key="org.jboss.soa.esb.jndi.server.type" value="${org.jboss.soa.esb.jndi.server.type}"/>
- <sysproperty key="org.jboss.soa.esb.jndi.server.url" value="${org.jboss.soa.esb.jndi.server.url}"/>
-
- <!-- Sys Props from the deployment.properties file... -->
- <sysproperty key="org.jboss.esb.test.ftp.hostname" value="${org.jboss.esb.test.ftp.hostname}"/>
- <sysproperty key="org.jboss.esb.test.ftp.user" value="${org.jboss.esb.test.ftp.user}"/>
- <sysproperty key="org.jboss.esb.test.ftp.pwd" value="${org.jboss.esb.test.ftp.pwd}"/>
- <sysproperty key="org.jboss.esb.test.ftp.dir" value="${org.jboss.esb.test.ftp.dir}"/>
- <sysproperty key="org.jboss.esb.test.quickstarts.dir" value="${org.jboss.esb.test.quickstarts.dir}"/>
-
- </junit>
-
- <!-- Report on the tests (format results) ... -->
- <junitreport todir="${qa.quickstarts.report}">
- <fileset dir="${qa.quickstarts.report}">
- <include name="*.xml"/>
- </fileset>
- <report format="frames" todir="${qa.quickstarts.report}"/>
- <report format="noframes" todir="${qa.quickstarts.report}"/>
- </junitreport>
-
- </target>
-
- <target name="test-emma" depends="compile-emma, prompt, execute-emma"/>
- <target name="ci-test-emma" depends="compile-emma, execute-emma"/>
-
- <target name="compile-emma">
- <echo message="Running JUnit based QA tests (with ema enabled) ..."/>
- <!-- Build the tests... -->
- <mkdir dir="${qa.quickstarts.classes}"/>
- <javac srcdir="${qa.quickstarts.src}" destdir="${qa.quickstarts.classes}" classpathref="qa.quickstarts.emma.cp" debug="on"/>
- </target>
-
- <target name="prompt">
- <property name="tests.exclude" value="**/*IntegrationTest.java"/>
- <echo message=""/>
- <echo message=""/>
- <input message='Which tests? (Press return to run all tests - Wildcards Supported - already assumes test cases end with the "Test" suffix)'
- addproperty="tests.filter"
- defaultvalue="*"/>
- </target>
-
- <target name="execute-emma">
- <!-- Run the tests... -->
- <property name="tests.filter" value="*"/>
- <mkdir dir="${qa.quickstarts.report}"/>
- <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="yes" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <batchtest todir="${qa.quickstarts.report}">
- <fileset dir="${qa.quickstarts.src}">
- <include name="**/${tests.filter}Test.java"/>
- </fileset>
- </batchtest>
- <classpath>
- <pathelement location="${qa.quickstarts.classes}"/>
- <path refid="qa.quickstarts.emma.cp"/>
- <pathelement location="${qa.quickstarts.src}"/>
- </classpath>
-
- <jvmarg value="-Xmx${qa.quickstarts.memory}"/>
- <!-- emma jvm args -->
- <jvmarg value="-Demma.coverage.out.file=${coverage}/all/coverage.emma"/>
- <jvmarg value="-Demma.coverage.out.merge=true"/>
-
-
- <sysproperty key="jbosstest.deploy.dir" value="${qa.quickstarts.build.lib}"/>
- <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
- <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
- <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
-
- <!-- Listener Sys Props... -->
- <sysproperty key="org.jboss.soa.esb.paramsRepository.file.root"
- value="${org.jboss.soa.esb.paramsRepository.file.root}"/>
-
- <!-- Sys Props from the test.properties file... -->
- <sysproperty key="org.jboss.soa.esb.jndi.server.type" value="${org.jboss.soa.esb.jndi.server.type}"/>
- <sysproperty key="org.jboss.soa.esb.jndi.server.url" value="${org.jboss.soa.esb.jndi.server.url}"/>
-
- <!-- Sys Props from the deployment.properties file... -->
- <sysproperty key="org.jboss.esb.test.ftp.hostname" value="${org.jboss.esb.test.ftp.hostname}"/>
- <sysproperty key="org.jboss.esb.test.ftp.user" value="${org.jboss.esb.test.ftp.user}"/>
- <sysproperty key="org.jboss.esb.test.ftp.pwd" value="${org.jboss.esb.test.ftp.pwd}"/>
- <sysproperty key="org.jboss.esb.test.ftp.dir" value="${org.jboss.esb.test.ftp.dir}"/>
- </junit>
-
- <!-- Report on the tests (format results) ... -->
- <junitreport todir="${qa.quickstarts.report}">
- <fileset dir="${qa.quickstarts.report}">
- <include name="*.xml"/>
- </fileset>
- <report format="frames" todir="${qa.quickstarts.report}"/>
- <report format="noframes" todir="${qa.quickstarts.report}"/>
- </junitreport>
-
- </target>
-
-</project>
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/build.xml (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/build.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/build.xml (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/build.xml 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,391 @@
+<?xml version="1.0"?>
+<project name="JUnit" default="test" basedir=".">
+ <property file="quickstarts.properties"/>
+
+ <property name="product.dir" location="../../product"/>
+ <property name="product.build" location="${product.dir}/build"/>
+ <property name="product.lib" location="${product.build}/jbossesb/lib"/>
+ <property name="product.lib.ext" location="${product.lib}/ext"/>
+ <property name="org.jboss.esb.test.quickstarts.dir" location="${product.build}/jbossesb/samples/quickstarts"/>
+ <property name="coverage" location="${product.build}/tests/coverage"/>
+ <property name="qa.dir" location=".."/>
+ <property name="qa.build" location="${qa.dir}/build"/>
+ <property name="qa.build.reports" location="${qa.build}/reports"/>
+ <property name="qa.lib" location="${qa.dir}/lib"/>
+ <property name="qa.build.stylesheets" location="${qa.build}/stylesheets"/>
+ <property name="qa.source.stylesheets" location="${qa.dir}/stylesheets"/>
+ <property name="qa.quickstarts.src" location="src"/>
+ <property name="qa.quickstarts.build" location="${qa.build}/quickstarts"/>
+ <property name="qa.quickstarts.build.lib" location="${qa.quickstarts.build}/lib"/>
+ <property name="qa.quickstarts.classes" location="${qa.quickstarts.build}/classes"/>
+ <property name="qa.junit.resources" location="resources"/>
+ <property name="qa.quickstarts.report" location="${qa.quickstarts.build}/report"/>
+ <property name="qa.quickstarts.memory" value="128m"/>
+
+ <property name="qa.quickstarts.server.home" location="${org.jboss.esb.server.home}"/>
+
+ <property name="org.jboss.soa.esb.paramsRepository.file.root" location="src"/>
+
+ <property name="junit.jar" location="${product.lib.ext}/junit-4.1.jar"/>
+ <macrodef name="runant">
+ <attribute name="target"/>
+ <attribute name="failonerror" default="true"/>
+ <attribute name="resultproperty" default="product.java.resultproperty"/>
+ <sequential>
+ <java classname="org.apache.tools.ant.launch.Launcher"
+ classpath="${ant.library.dir}/ant-launcher.jar"
+ fork="true" failonerror="@{failonerror}"
+ resultproperty="@{resultproperty}">
+ <sysproperty key="ant.home" value="${ant.home}"/>
+ <sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
+ <sysproperty key="org.jboss.esb.properties" value="${org.jboss.esb.properties}"/>
+ <arg value="-cp"/>
+ <arg value="${junit.jar}"/>
+ <arg value="-f"/>
+ <arg value="${ant.file}"/>
+ <arg value="@{target}"/>
+ </java>
+ </sequential>
+ </macrodef>
+
+ <path id="base.cp">
+ <fileset dir="${qa.lib}/ext" includes="*.jar"/>
+ <fileset dir="${product.lib}/ext" includes="*.jar"/>
+ <pathelement location="${qa.dir}/"/>
+ </path>
+
+ <path id="qa.quickstarts.cp">
+ <!-- include qs specific jars -->
+ <fileset dir="${org.jboss.esb.test.quickstarts.dir}">
+ <include name="bpm_orchestration1/lib/**/*.jar"/>
+ <include name="dynamic_router/lib/**/*.jar"/>
+ <include name="fun_cbr/lib/**/*.jar"/>
+ <include name="helloworld/lib/**/*.jar"/>
+ <include name="helloworld_action/lib/**/*.jar"/>
+ <include name="helloworld_db_registration/lib/**/*.jar"/>
+ <include name="helloworld_file_action/lib/**/*.jar"/>
+ <include name="helloworld_sql_action/lib/**/*.jar"/>
+ <include name="recipient_list/lib/**/*.jar"/>
+ <include name="scripting_groovy/lib/**/*.jar"/>
+ <include name="simple_cbr/lib/**/*.jar"/>
+ <include name="static_router/lib/**/*.jar"/>
+ <include name="transform_CSV2XML/lib/**/*.jar"/>
+ <include name="transform_EDI2XML_Groovy_XSLT/lib/**/*.jar"/>
+ <include name="transform_XML2POJO/lib/**/*.jar"/>
+ <include name="transform_XML2XML_date_manipulation/lib/**/*.jar"/>
+ <include name="transform_XML2XML_simple/lib/**/*.jar"/>
+ <include name="wiretap/lib/**/*.jar"/>
+ </fileset>
+
+ <!-- include qs specific classes -->
+ <dirset dir="${org.jboss.esb.test.quickstarts.dir}">
+ <include name="bpm_orchestration1/build/classes"/>
+ <include name="dynamic_router/build/classes"/>
+ <include name="fun_cbr/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_sql_action/build/classes"/>
+ <include name="recipient_list/build/classes"/>
+ <include name="scripting_groovy/build/classes"/>
+ <include name="simple_cbr/build/classes"/>
+ <include name="static_router/build/classes"/>
+ <include name="transform_CSV2XML/build/classes"/>
+ <include name="transform_EDI2XML_Groovy_XSLT/build/classes"/>
+ <include name="transform_XML2POJO/build/classes"/>
+ <include name="transform_XML2XML_date_manipulation/build/classes"/>
+ <include name="transform_XML2XML_simple/build/classes"/>
+ <include name="wiretap/build/classes"/>
+ </dirset>
+
+ <fileset dir="${product.lib.ext}" includes="*.jar"/>
+ <fileset dir="${product.lib}" includes="*.jar"/>
+ <pathelement location="${qa.junit.resources}"/>
+ <path refid="base.cp"/>
+ </path>
+
+ <path id="qa.quickstarts.emma.cp">
+ <fileset dir="${coverage}/all" includes="jbossesb-instr-all.jar"/>
+ <path refid="base.cp"/>
+ </path>
+
+ <macrodef name="exec-quickstart">
+ <attribute name="quickstart"/>
+ <attribute name="target"/>
+ <sequential>
+ <ant antfile="build.xml"
+ dir="${org.jboss.esb.test.quickstarts.dir}/@{quickstart}"
+ target="@{target}" inheritAll="false">
+ <property name="quickstart.jbossesb.ftp.hostname" value="${org.jboss.esb.test.ftp.hostname}"/>
+ <property name="quickstart.jbossesb.ftp.username" value="${org.jboss.esb.test.ftp.user}"/>
+ <property name="quickstart.jbossesb.ftp.password" value="${org.jboss.esb.test.ftp.pwd}"/>
+ <property name="quickstart.jbossesb.ftp.directory" value="${org.jboss.esb.test.ftp.dir}"/>
+ <property name="org.jboss.esb.server.home" location="${qa.quickstarts.server.home}"/>
+ <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <target name="init">
+ <available property="quickstarts.exist" type="dir"
+ file="${org.jboss.esb.test.quickstarts.dir}"/>
+ </target>
+
+ <target name="clean" depends="init, clean-esb"/>
+
+ <target name="one-test">
+ <runant target="internal-one-test"/>
+ </target>
+
+ <target name="internal-one-test" depends="compile, prompt, execute"/>
+
+ <target name="test">
+ <runant target="ci-test"/>
+ </target>
+
+ <target name="ci-test" depends="compile, execute"/>
+
+ <target name="ci-clean" depends="init, clean-esb"/>
+
+ <target name="compile" depends="compile-esb">
+ <echo message="Compiling JUnit based Quickstart tests..."/>
+
+
+ <!-- Build the tests... -->
+ <mkdir dir="${qa.quickstarts.classes}"/>
+
+ <javac srcdir="${qa.quickstarts.src}" destdir="${qa.quickstarts.classes}" classpathref="qa.quickstarts.cp" debug="on"/>
+
+ </target>
+
+ <target name="clean-esb" if="quickstarts.exist">
+ <exec-quickstart quickstart="bpm_orchestration1" target="clean"/>
+ <exec-quickstart quickstart="dynamic_router" target="clean"/>
+ <exec-quickstart quickstart="fun_cbr" 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_sql_action" target="clean"/>
+ <exec-quickstart quickstart="recipient_list" target="clean"/>
+ <exec-quickstart quickstart="scripting_groovy" target="clean"/>
+ <exec-quickstart quickstart="simple_cbr" target="clean"/>
+ <exec-quickstart quickstart="static_router" target="clean"/>
+ <exec-quickstart quickstart="transform_CSV2XML" target="clean"/>
+ <exec-quickstart quickstart="transform_EDI2XML_Groovy_XSLT" target="clean"/>
+ <exec-quickstart quickstart="transform_XML2POJO" target="clean"/>
+ <exec-quickstart quickstart="transform_XML2XML_date_manipulation" target="clean"/>
+ <exec-quickstart quickstart="transform_XML2XML_simple" target="clean"/>
+ <exec-quickstart quickstart="wiretap" target="clean"/>
+ </target>
+
+ <target name="compile-esb">
+ <echo>Compile ESB Packages</echo>
+ <exec-quickstart quickstart="bpm_orchestration1" target="prepare-deployment"/>
+ <exec-quickstart quickstart="dynamic_router" target="prepare-deployment"/>
+ <exec-quickstart quickstart="fun_cbr" 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_sql_action" target="prepare-deployment"/>
+ <exec-quickstart quickstart="recipient_list" target="prepare-deployment"/>
+ <exec-quickstart quickstart="scripting_groovy" target="prepare-deployment"/>
+ <exec-quickstart quickstart="simple_cbr" target="prepare-deployment"/>
+ <exec-quickstart quickstart="static_router" target="prepare-deployment"/>
+ <exec-quickstart quickstart="transform_CSV2XML" target="prepare-deployment"/>
+ <exec-quickstart quickstart="transform_EDI2XML_Groovy_XSLT" target="prepare-deployment"/>
+ <exec-quickstart quickstart="transform_XML2POJO" target="prepare-deployment"/>
+ <exec-quickstart quickstart="transform_XML2XML_date_manipulation" target="prepare-deployment"/>
+ <exec-quickstart quickstart="transform_XML2XML_simple" target="prepare-deployment"/>
+ <exec-quickstart quickstart="wiretap" target="prepare-deployment"/>
+
+ <copy todir="${qa.quickstarts.build.lib}" flatten="true">
+ <fileset dir="${org.jboss.esb.test.quickstarts.dir}">
+ <include name="bpm_orchestration1/build/*.esb"/>
+ <include name="dynamic_router/build/*.esb"/>
+ <include name="fun_cbr/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_sql_action/build/*.esb"/>
+ <include name="recipient_list/build/*.esb"/>
+ <include name="scripting_groovy/build/*.esb"/>
+ <include name="simple_cbr/build/*.esb"/>
+ <include name="static_router/build/*.esb"/>
+ <include name="transform_CSV2XML/build/*.esb"/>
+ <include name="transform_EDI2XML_Groovy_XSLT/build/*.esb"/>
+ <include name="transform_XML2POJO/build/*.esb"/>
+ <include name="transform_XML2XML_date_manipulation/build/*.esb"/>
+ <include name="transform_XML2XML_simple/build/*.esb"/>
+ <include name="wiretap/build/*.esb"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="compile-stylesheets">
+ <mkdir dir="${qa.build.stylesheets}"/>
+ <copy todir="${qa.build.stylesheets}" filtering="yes">
+ <fileset dir="${qa.source.stylesheets}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+
+ <target name="tests-report-html" depends="compile-stylesheets">
+ <mkdir dir="${qa.build.reports}/html"/>
+
+ <junitreport todir="${qa.build.reports}">
+ <fileset dir="${qa.build.reports}">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="frames"
+ todir="${qa.build.reports}/html"
+ styledir="${qa.build.stylesheets}"
+ />
+ </junitreport>
+ </target>
+
+
+ <target name="execute">
+ <!-- Run the tests... -->
+ <property name="tests.filter" value="*"/>
+ <mkdir dir="${qa.quickstarts.report}"/>
+ <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="yes" fork="true">
+ <formatter type="plain" usefile="false"/>
+ <formatter type="xml"/>
+ <batchtest todir="${qa.quickstarts.report}">
+ <fileset dir="${qa.quickstarts.src}">
+ <include name="**/${tests.filter}Test.java"/>
+ <exclude name="${tests.exclude}"/>
+ <exclude name="**/HelloWorldSQLActionTest.java"/>
+ <exclude name="**/RecipientlistTest.java"/>
+ <exclude name="**/FunCBRTest.java"/>
+ <exclude name="**/BPMOrchestrationTest.java"/>
+ <exclude name="**/SimpleCBRTest.java"/>
+ <exclude name="**/DynamicRouterTest.java"/>
+ <exclude name="**/StaticRouterTest.java"/>
+ <exclude name="**/WebserviceAdapterTest.java"/>
+ <exclude name="**/HelloWorldDBRegistrationTest.java"/>
+ <exclude name="**/WebserviceBPELTest.java"/>
+ </fileset>
+ </batchtest>
+ <classpath>
+ <pathelement location="${qa.quickstarts.classes}"/>
+ <path refid="qa.quickstarts.cp"/>
+ <pathelement location="${qa.quickstarts.src}"/>
+ </classpath>
+ <jvmarg value="-Xmx${qa.quickstarts.memory}"/>
+
+ <sysproperty key="jbosstest.deploy.dir" value="${qa.quickstarts.build.lib}"/>
+ <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
+ <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
+ <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
+
+
+ <!-- Listener Sys Props... -->
+ <sysproperty key="org.jboss.soa.esb.paramsRepository.file.root"
+ value="${org.jboss.soa.esb.paramsRepository.file.root}"/>
+
+ <!-- Sys Props from the test.properties file... -->
+ <sysproperty key="org.jboss.soa.esb.jndi.server.type" value="${org.jboss.soa.esb.jndi.server.type}"/>
+ <sysproperty key="org.jboss.soa.esb.jndi.server.url" value="${org.jboss.soa.esb.jndi.server.url}"/>
+
+ <!-- Sys Props from the deployment.properties file... -->
+ <sysproperty key="org.jboss.esb.test.ftp.hostname" value="${org.jboss.esb.test.ftp.hostname}"/>
+ <sysproperty key="org.jboss.esb.test.ftp.user" value="${org.jboss.esb.test.ftp.user}"/>
+ <sysproperty key="org.jboss.esb.test.ftp.pwd" value="${org.jboss.esb.test.ftp.pwd}"/>
+ <sysproperty key="org.jboss.esb.test.ftp.dir" value="${org.jboss.esb.test.ftp.dir}"/>
+ <sysproperty key="org.jboss.esb.test.quickstarts.dir" value="${org.jboss.esb.test.quickstarts.dir}"/>
+
+ </junit>
+
+ <!-- Report on the tests (format results) ... -->
+ <junitreport todir="${qa.quickstarts.report}">
+ <fileset dir="${qa.quickstarts.report}">
+ <include name="*.xml"/>
+ </fileset>
+ <report format="frames" todir="${qa.quickstarts.report}"/>
+ <report format="noframes" todir="${qa.quickstarts.report}"/>
+ </junitreport>
+
+ </target>
+
+ <target name="test-emma" depends="compile-emma, prompt, execute-emma"/>
+ <target name="ci-test-emma" depends="compile-emma, execute-emma"/>
+
+ <target name="compile-emma">
+ <echo message="Running JUnit based QA tests (with ema enabled) ..."/>
+ <!-- Build the tests... -->
+ <mkdir dir="${qa.quickstarts.classes}"/>
+ <javac srcdir="${qa.quickstarts.src}" destdir="${qa.quickstarts.classes}" classpathref="qa.quickstarts.emma.cp" debug="on"/>
+ </target>
+
+ <target name="prompt">
+ <property name="tests.exclude" value="**/*IntegrationTest.java"/>
+ <echo message=""/>
+ <echo message=""/>
+ <input message='Which tests? (Press return to run all tests - Wildcards Supported - already assumes test cases end with the "Test" suffix)'
+ addproperty="tests.filter"
+ defaultvalue="*"/>
+ </target>
+
+ <target name="execute-emma">
+ <!-- Run the tests... -->
+ <property name="tests.filter" value="*"/>
+ <mkdir dir="${qa.quickstarts.report}"/>
+ <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="yes" fork="true">
+ <formatter type="plain" usefile="false"/>
+ <formatter type="xml"/>
+ <batchtest todir="${qa.quickstarts.report}">
+ <fileset dir="${qa.quickstarts.src}">
+ <include name="**/${tests.filter}Test.java"/>
+ </fileset>
+ </batchtest>
+ <classpath>
+ <pathelement location="${qa.quickstarts.classes}"/>
+ <path refid="qa.quickstarts.emma.cp"/>
+ <pathelement location="${qa.quickstarts.src}"/>
+ </classpath>
+
+ <jvmarg value="-Xmx${qa.quickstarts.memory}"/>
+ <!-- emma jvm args -->
+ <jvmarg value="-Demma.coverage.out.file=${coverage}/all/coverage.emma"/>
+ <jvmarg value="-Demma.coverage.out.merge=true"/>
+
+
+ <sysproperty key="jbosstest.deploy.dir" value="${qa.quickstarts.build.lib}"/>
+ <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
+ <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
+ <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
+
+ <!-- Listener Sys Props... -->
+ <sysproperty key="org.jboss.soa.esb.paramsRepository.file.root"
+ value="${org.jboss.soa.esb.paramsRepository.file.root}"/>
+
+ <!-- Sys Props from the test.properties file... -->
+ <sysproperty key="org.jboss.soa.esb.jndi.server.type" value="${org.jboss.soa.esb.jndi.server.type}"/>
+ <sysproperty key="org.jboss.soa.esb.jndi.server.url" value="${org.jboss.soa.esb.jndi.server.url}"/>
+
+ <!-- Sys Props from the deployment.properties file... -->
+ <sysproperty key="org.jboss.esb.test.ftp.hostname" value="${org.jboss.esb.test.ftp.hostname}"/>
+ <sysproperty key="org.jboss.esb.test.ftp.user" value="${org.jboss.esb.test.ftp.user}"/>
+ <sysproperty key="org.jboss.esb.test.ftp.pwd" value="${org.jboss.esb.test.ftp.pwd}"/>
+ <sysproperty key="org.jboss.esb.test.ftp.dir" value="${org.jboss.esb.test.ftp.dir}"/>
+ </junit>
+
+ <!-- Report on the tests (format results) ... -->
+ <junitreport todir="${qa.quickstarts.report}">
+ <fileset dir="${qa.quickstarts.report}">
+ <include name="*.xml"/>
+ </fileset>
+ <report format="frames" todir="${qa.quickstarts.report}"/>
+ <report format="noframes" todir="${qa.quickstarts.report}"/>
+ </junitreport>
+
+ </target>
+
+</project>
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/jndi.properties
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/jndi.properties 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/jndi.properties 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,5 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-java.naming.factory.url.pkgs=org.jnp.interfaces
-
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/jndi.properties (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/jndi.properties)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/jndi.properties (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/jndi.properties 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,5 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming
+java.naming.factory.url.pkgs=org.jnp.interfaces
+
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/quickstarts.properties
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/quickstarts.properties 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/quickstarts.properties 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,24 +0,0 @@
-#
-# If you wish to run these test from within this directory then the
-# following configuration entries need to be completed correctly.
-#
-# The parameters below are defaulted for the server created as part of
-# the qa configuration. To run with this configuration go up to qa directory
-# and start the server with the command 'ant start-server'.
-#
-# To run the tests execute 'ant' once the appropriate server is running.
-#
-# These parameters are overridden as part of the normal CI build
-
-# server information for running the quickstarts
-org.jboss.esb.server.home=../build/jbossesb-test/jbossesb-server
-org.jboss.esb.server.config=default
-
-# jbossesb location containing quickstarts
-org.jboss.esb.test.quickstarts.dir=../../product/build/jbossesb/samples/quickstarts
-
-# ftp properties
-org.jboss.esb.test.ftp.hostname=localhost:10021
-org.jboss.esb.test.ftp.user=esb
-org.jboss.esb.test.ftp.pwd=esb
-org.jboss.esb.test.ftp.dir=/
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/quickstarts.properties (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/quickstarts.properties)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/quickstarts.properties (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/quickstarts.properties 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,24 @@
+#
+# If you wish to run these test from within this directory then the
+# following configuration entries need to be completed correctly.
+#
+# The parameters below are defaulted for the server created as part of
+# the qa configuration. To run with this configuration go up to qa directory
+# and start the server with the command 'ant start-server'.
+#
+# To run the tests execute 'ant' once the appropriate server is running.
+#
+# These parameters are overridden as part of the normal CI build
+
+# server information for running the quickstarts
+org.jboss.esb.server.home=../build/jbossesb-test/jbossesb-server
+org.jboss.esb.server.config=default
+
+# jbossesb location containing quickstarts
+org.jboss.esb.test.quickstarts.dir=../../product/build/jbossesb/samples/quickstarts
+
+# ftp properties
+org.jboss.esb.test.ftp.hostname=localhost:10021
+org.jboss.esb.test.ftp.user=esb
+org.jboss.esb.test.ftp.pwd=esb
+org.jboss.esb.test.ftp.dir=/
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/resources)
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/jndi.properties
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/resources/jndi.properties 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/jndi.properties 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=jnp://localhost:1099
\ No newline at end of file
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/jndi.properties (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/resources/jndi.properties)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/jndi.properties (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/jndi.properties 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=jnp://localhost:1099
\ No newline at end of file
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageCSV2XML.log
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/resources/transformedmessageCSV2XML.log 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageCSV2XML.log 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,12 +0,0 @@
-<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>
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageCSV2XML.log (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/resources/transformedmessageCSV2XML.log)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageCSV2XML.log (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageCSV2XML.log 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,12 @@
+<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>
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageDateManipulation.log
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/resources/transformedmessageDateManipulation.log 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageDateManipulation.log 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,17 +0,0 @@
-<Order netAmount="59.97" orderId="1" statusCode="0" tax="4.95" totalAmount="64.92">
- <Customer firstName="Harry" lastName="Fletcher" state="SD" userName="user1"/>
- <OrderDate>
- <day>15</day>
- <time>13:45</time>
- <month>11</month>
- <year>06</year>
- </OrderDate>
- <OrderLines>
- <OrderLine position="1" quantity="1">
- <Product price="29.98" productId="364" title="The 40-Year-Old Virgin "/>
- </OrderLine>
- <OrderLine position="2" quantity="1">
- <Product price="29.99" productId="299" title="Pulp Fiction"/>
- </OrderLine>
- </OrderLines>
-</Order>
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageDateManipulation.log (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/resources/transformedmessageDateManipulation.log)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageDateManipulation.log (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageDateManipulation.log 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,17 @@
+<Order netAmount="59.97" orderId="1" statusCode="0" tax="4.95" totalAmount="64.92">
+ <Customer firstName="Harry" lastName="Fletcher" state="SD" userName="user1"/>
+ <OrderDate>
+ <day>15</day>
+ <time>13:45</time>
+ <month>11</month>
+ <year>06</year>
+ </OrderDate>
+ <OrderLines>
+ <OrderLine position="1" quantity="1">
+ <Product price="29.98" productId="364" title="The 40-Year-Old Virgin "/>
+ </OrderLine>
+ <OrderLine position="2" quantity="1">
+ <Product price="29.99" productId="299" title="Pulp Fiction"/>
+ </OrderLine>
+ </OrderLines>
+</Order>
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageEDI2XMLGroovyXSL.log
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/resources/transformedmessageEDI2XMLGroovyXSL.log 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageEDI2XMLGroovyXSL.log 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,9 +0,0 @@
-<Order date="11-15-06" netAmount="59.97" orderId="1" statusCode="0"
- tax="4.95" totalAmount="64.92">
- <Customer firstName="Harry" lastName="Fletcher" state="South Dakota"
- userName="user1"/>
- <OrderLines>
- <order-item price="29.98" product-id="364" quantity="1">The 40-Year-Old Virgin</order-item>
- <order-item price="29.99" product-id="299" quantity="1">Pulp Fiction</order-item>
- </OrderLines>
-</Order>
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageEDI2XMLGroovyXSL.log (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/resources/transformedmessageEDI2XMLGroovyXSL.log)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageEDI2XMLGroovyXSL.log (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageEDI2XMLGroovyXSL.log 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,9 @@
+<Order date="11-15-06" netAmount="59.97" orderId="1" statusCode="0"
+ tax="4.95" totalAmount="64.92">
+ <Customer firstName="Harry" lastName="Fletcher" state="South Dakota"
+ userName="user1"/>
+ <OrderLines>
+ <order-item price="29.98" product-id="364" quantity="1">The 40-Year-Old Virgin</order-item>
+ <order-item price="29.99" product-id="299" quantity="1">Pulp Fiction</order-item>
+ </OrderLines>
+</Order>
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageXML2POJO.log
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/resources/transformedmessageXML2POJO.log 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageXML2POJO.log 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,14 +0,0 @@
-<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 position="1" quantity="1">
- <Product price="29.98" productId="364"
- title="The 40-Year-Old Virgin "/>
- </OrderLine>
- <OrderLine position="2" quantity="1">
- <Product price="29.99" productId="299" title="Pulp Fiction"/>
- </OrderLine>
- </OrderLines>
-</Order>
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageXML2POJO.log (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/resources/transformedmessageXML2POJO.log)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageXML2POJO.log (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageXML2POJO.log 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,14 @@
+<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 position="1" quantity="1">
+ <Product price="29.98" productId="364"
+ title="The 40-Year-Old Virgin "/>
+ </OrderLine>
+ <OrderLine position="2" quantity="1">
+ <Product price="29.99" productId="299" title="Pulp Fiction"/>
+ </OrderLine>
+ </OrderLines>
+</Order>
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageXML2Simple.log
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/resources/transformedmessageXML2Simple.log 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageXML2Simple.log 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,7 +0,0 @@
-<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>
- <line-item><product>364</product><price>29.98</price><quantity>1</quantity></line-item>
- <line-item><product>299</product><price>29.99</price><quantity>1</quantity></line-item>
- </OrderLines>
-</Order>
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageXML2Simple.log (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/resources/transformedmessageXML2Simple.log)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageXML2Simple.log (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/resources/transformedmessageXML2Simple.log 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,7 @@
+<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>
+ <line-item><product>364</product><price>29.98</price><quantity>1</quantity></line-item>
+ <line-item><product>299</product><price>29.99</price><quantity>1</quantity></line-item>
+ </OrderLines>
+</Order>
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src)
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org)
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss)
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa)
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb)
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/MyAction.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/MyAction.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/MyAction.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,79 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.soa.esb;
-
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
-import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Message;
-
-public class MyAction extends AbstractActionPipelineProcessor
-{
- protected ConfigTree _config;
-
- public MyAction(ConfigTree config)
- {
- _config = config;
- }
-
- public Message noOperation(Message message)
- {
- return message;
- }
-
- public Message process(Message message) throws ActionProcessingException
- {
- logHeader();
- System.out.println("Body: " + new String(message.getBody().getByteArray()));
- logFooter();
- MBeanServer server = MBeanServerLocator.locateJBoss();
- StatsMBean stats ;
- try
- {
- stats = (StatsMBean)MBeanProxyExt.create(StatsMBean.class, StatsMBean.objectName, server);
- }
- catch (final MalformedObjectNameException mone)
- {
- throw new ActionProcessingException("Error creating MBean proxy", mone) ;
- }
- stats.setExecutedVersion("scope1");
- return message;
- }
-
- // This makes it easier to read on the console
- private void logHeader()
- {
- System.out.println("\n&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
- }
-
- private void logFooter()
- {
- System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&\n");
- }
-
-
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/MyAction.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/MyAction.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/MyAction.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/MyAction.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,79 @@
+/*
+* 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;
+
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+
+import org.jboss.mx.util.MBeanProxyExt;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
+import org.jboss.soa.esb.actions.ActionProcessingException;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+
+public class MyAction extends AbstractActionPipelineProcessor
+{
+ protected ConfigTree _config;
+
+ public MyAction(ConfigTree config)
+ {
+ _config = config;
+ }
+
+ public Message noOperation(Message message)
+ {
+ return message;
+ }
+
+ public Message process(Message message) throws ActionProcessingException
+ {
+ logHeader();
+ System.out.println("Body: " + new String(message.getBody().getByteArray()));
+ logFooter();
+ MBeanServer server = MBeanServerLocator.locateJBoss();
+ StatsMBean stats ;
+ try
+ {
+ stats = (StatsMBean)MBeanProxyExt.create(StatsMBean.class, StatsMBean.objectName, server);
+ }
+ catch (final MalformedObjectNameException mone)
+ {
+ throw new ActionProcessingException("Error creating MBean proxy", mone) ;
+ }
+ stats.setExecutedVersion("scope1");
+ return message;
+ }
+
+ // This makes it easier to read on the console
+ private void logHeader()
+ {
+ System.out.println("\n&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
+ }
+
+ private void logFooter()
+ {
+ System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&\n");
+ }
+
+
+}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/Stats.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/Stats.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/Stats.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,46 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.soa.esb;
-
-/**
- * comment
- *
- * @author <a href="bill at jboss.com">Bill Burke</a>
- * @version $Revision: 1.1 $
- */
-public class Stats implements StatsMBean
-{
- private String executedVersion;
-
-
- public String getExecutedVersion()
- {
- String msg = executedVersion;
- executedVersion = null;
- return msg;
- }
-
- public void setExecutedVersion(String executedVersion)
- {
- this.executedVersion = executedVersion;
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/Stats.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/Stats.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/Stats.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/Stats.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,46 @@
+/*
+* 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;
+
+/**
+ * comment
+ *
+ * @author <a href="bill at jboss.com">Bill Burke</a>
+ * @version $Revision: 1.1 $
+ */
+public class Stats implements StatsMBean
+{
+ private String executedVersion;
+
+
+ public String getExecutedVersion()
+ {
+ String msg = executedVersion;
+ executedVersion = null;
+ return msg;
+ }
+
+ public void setExecutedVersion(String executedVersion)
+ {
+ this.executedVersion = executedVersion;
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/StatsMBean.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/StatsMBean.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/StatsMBean.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,38 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.soa.esb;
-
-
-/**
- * comment
- *
- * @author <a href="bill at jboss.com">Bill Burke</a>
- * @version $Revision: 1.1 $
- */
-public interface StatsMBean
-{
- public static final String objectName = "jboss.esb:test=server";
-
- String getExecutedVersion();
-
- void setExecutedVersion(String executedVersion);
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/StatsMBean.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/StatsMBean.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/StatsMBean.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/StatsMBean.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,38 @@
+/*
+* 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;
+
+
+/**
+ * comment
+ *
+ * @author <a href="bill at jboss.com">Bill Burke</a>
+ * @version $Revision: 1.1 $
+ */
+public interface StatsMBean
+{
+ public static final String objectName = "jboss.esb:test=server";
+
+ String getExecutedVersion();
+
+ void setExecutedVersion(String executedVersion);
+}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart)
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test)
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/BPMOrchestrationTest.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/BPMOrchestrationTest.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/BPMOrchestrationTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.quickstart.test;
-
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- */
-public class BPMOrchestrationTest
- extends JBossTestCase
-{
- public BPMOrchestrationTest(String name)
- {
- super(name);
- }
-
- public void testMessage() throws Exception
- {
- sendMessage();
- Thread.sleep(10000); // wait for message to post.
- }
-
- public void sendMessage() throws Exception
- {
- }
-
- public static Test suite() throws Exception
- {
- return getDeploySetup(BPMOrchestrationTest.class, "Quickstart_bpm_orchestration1.esb");
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/BPMOrchestrationTest.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/BPMOrchestrationTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/BPMOrchestrationTest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/BPMOrchestrationTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -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.test.JBossTestCase;
+
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
+ */
+public class BPMOrchestrationTest
+ extends JBossTestCase
+{
+ public BPMOrchestrationTest(String name)
+ {
+ super(name);
+ }
+
+ public void testMessage() throws Exception
+ {
+ sendMessage();
+ Thread.sleep(10000); // wait for message to post.
+ }
+
+ public void sendMessage() throws Exception
+ {
+ }
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(BPMOrchestrationTest.class, "Quickstart_bpm_orchestration1.esb");
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/DynamicRouterTest.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/DynamicRouterTest.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/DynamicRouterTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,105 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.quickstart.test;
-
-import java.io.File;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-
-import org.jboss.soa.esb.actions.StoreMessageToFile;
-import org.jboss.soa.esb.samples.quickstart.dynamicRouter.test.ReceiveJMSMessage;
-import org.jboss.soa.esb.samples.quickstart.dynamicRouter.test.SendJMSMessage;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:"></a>
- * @version $Id: $
- */
-
-public class DynamicRouterTest extends JBossTestCase
-{
- private static final String JMS_MESSAGE = "DynamicRouterTest message";
- private static final String FILE_NAME = "DynamicRouterTest.log";
- private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME) + FILE_NAME;
- private static final int EXPECTED_RECORD_COUNT = 3;
-
- public DynamicRouterTest(String name)
- {
- super(name);
- }
-
- public void testMessage() throws Exception
- {
- sendMessage();
- /* Verify that the message file is created */
- boolean fileExists = Helpers.checkForFile(LOG_FILE);
- if (!fileExists) {
- fail ("Event file " + LOG_FILE + " not created - test marked as failing");
- }
-
- /* Verify that the message file is complete */
- boolean fileComplete = Helpers.checkFileContent(LOG_FILE, EXPECTED_RECORD_COUNT);
- if (!fileComplete) {
- Hashtable<String, String> temp = Helpers.getMessageString(LOG_FILE);
- File target = new File(LOG_FILE);
- target.delete();
- fail ("Event file " + LOG_FILE + " not complete - expected " + EXPECTED_RECORD_COUNT
- + " records - found " + temp.size() + ", test marked as failing");
- }
-
- Hashtable<String, String> theTable = Helpers.getMessageString(LOG_FILE);
-
- String theMessage1 = (String) theTable.get("Message1");
- String theMessage2 = (String) theTable.get("Message2");
- String theMessage3 = (String) theTable.get("Message3");
-
- assertEquals("The strings1 should match", theMessage1, JMS_MESSAGE);
- assertEquals("The strings2 should match", theMessage2, JMS_MESSAGE);
- assertEquals("The strings3 should match", theMessage3, JMS_MESSAGE);
-
- File target = new File(LOG_FILE);
- target.delete();
- }
-
- public void sendMessage() throws Exception
- {
- ReceiveJMSMessage rm = new ReceiveJMSMessage();
- rm.setupConnection();
- rm.sendAMessage("queue/qsdynamicrouter_1_Request:OK");
- rm.sendAMessage("queue/qsdynamicrouter_2_Request:OK");
- rm.sendAMessage("queue/qsdynamicrouter_3_Request:OK");
- rm.stop();
-
- SendJMSMessage sm = new SendJMSMessage();
- sm.setupConnection();
- sm.sendAMessage(JMS_MESSAGE + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_START + FILE_NAME + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END);
- sm.stop();
- }
-
- public static Test suite() throws Exception
- {
- return getDeploySetup(DynamicRouterTest.class, "Quickstart_dynamic_router.esb");
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/DynamicRouterTest.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/DynamicRouterTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/DynamicRouterTest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/DynamicRouterTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,105 @@
+/*
+ * 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 java.io.File;
+import java.util.Hashtable;
+
+import junit.framework.Test;
+
+import org.jboss.soa.esb.actions.StoreMessageToFile;
+import org.jboss.soa.esb.samples.quickstart.dynamicRouter.test.ReceiveJMSMessage;
+import org.jboss.soa.esb.samples.quickstart.dynamicRouter.test.SendJMSMessage;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:"></a>
+ * @version $Id: $
+ */
+
+public class DynamicRouterTest extends JBossTestCase
+{
+ private static final String JMS_MESSAGE = "DynamicRouterTest message";
+ private static final String FILE_NAME = "DynamicRouterTest.log";
+ private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME) + FILE_NAME;
+ private static final int EXPECTED_RECORD_COUNT = 3;
+
+ public DynamicRouterTest(String name)
+ {
+ super(name);
+ }
+
+ public void testMessage() throws Exception
+ {
+ sendMessage();
+ /* Verify that the message file is created */
+ boolean fileExists = Helpers.checkForFile(LOG_FILE);
+ if (!fileExists) {
+ fail ("Event file " + LOG_FILE + " not created - test marked as failing");
+ }
+
+ /* Verify that the message file is complete */
+ boolean fileComplete = Helpers.checkFileContent(LOG_FILE, EXPECTED_RECORD_COUNT);
+ if (!fileComplete) {
+ Hashtable<String, String> temp = Helpers.getMessageString(LOG_FILE);
+ File target = new File(LOG_FILE);
+ target.delete();
+ fail ("Event file " + LOG_FILE + " not complete - expected " + EXPECTED_RECORD_COUNT
+ + " records - found " + temp.size() + ", test marked as failing");
+ }
+
+ Hashtable<String, String> theTable = Helpers.getMessageString(LOG_FILE);
+
+ String theMessage1 = (String) theTable.get("Message1");
+ String theMessage2 = (String) theTable.get("Message2");
+ String theMessage3 = (String) theTable.get("Message3");
+
+ assertEquals("The strings1 should match", theMessage1, JMS_MESSAGE);
+ assertEquals("The strings2 should match", theMessage2, JMS_MESSAGE);
+ assertEquals("The strings3 should match", theMessage3, JMS_MESSAGE);
+
+ File target = new File(LOG_FILE);
+ target.delete();
+ }
+
+ public void sendMessage() throws Exception
+ {
+ ReceiveJMSMessage rm = new ReceiveJMSMessage();
+ rm.setupConnection();
+ rm.sendAMessage("queue/qsdynamicrouter_1_Request:OK");
+ rm.sendAMessage("queue/qsdynamicrouter_2_Request:OK");
+ rm.sendAMessage("queue/qsdynamicrouter_3_Request:OK");
+ rm.stop();
+
+ SendJMSMessage sm = new SendJMSMessage();
+ sm.setupConnection();
+ sm.sendAMessage(JMS_MESSAGE + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_START + FILE_NAME + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END);
+ sm.stop();
+ }
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(DynamicRouterTest.class, "Quickstart_dynamic_router.esb");
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/FunCBRTest.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/FunCBRTest.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/FunCBRTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,57 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.quickstart.test;
-
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- */
-
-public class FunCBRTest
- extends JBossTestCase
-{
- public FunCBRTest(String name)
- {
- super(name);
- }
-
- public void testMessage() throws Exception
- {
- sendMessage();
- Thread.sleep(10000); // wait for message to post.
- }
-
- public void sendMessage() throws Exception
- {
- }
-
- public static Test suite() throws Exception
- {
- return getDeploySetup(FunCBRTest.class, "Quickstart_fun_cbr.esb");
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/FunCBRTest.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/FunCBRTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/FunCBRTest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/FunCBRTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,57 @@
+/*
+ * 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.test.JBossTestCase;
+
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
+ */
+
+public class FunCBRTest
+ extends JBossTestCase
+{
+ public FunCBRTest(String name)
+ {
+ super(name);
+ }
+
+ public void testMessage() throws Exception
+ {
+ sendMessage();
+ Thread.sleep(10000); // wait for message to post.
+ }
+
+ public void sendMessage() throws Exception
+ {
+ }
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(FunCBRTest.class, "Quickstart_fun_cbr.esb");
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldActionTest.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldActionTest.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldActionTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,96 +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.quickstart.test;
-
-import java.io.File;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-
-import org.jboss.soa.esb.actions.StoreMessageToFile;
-import org.jboss.soa.esb.samples.quickstart.helloworldaction.test.SendJMSMessage;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id: BlobUnitTestCase.java 58110 2006-11-04 08:34:21Z
- * scott.stark at jboss.org $
- */
-
-public class HelloWorldActionTest extends JBossTestCase {
- private static final String JMS_MESSAGE = "HelloWorldActionTest message";
- private static final String RESPONSE_MESSAGE = "BEFORE**" + JMS_MESSAGE + "AFTER**" ;
- private static final String FILE_NAME = "HelloWorldActionTest.log";
- private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME) + FILE_NAME;
- private static final int EXPECTED_RECORD_COUNT = 1;
-
- public HelloWorldActionTest(String name) {
- super(name);
- }
-
- public void testMessage() throws Exception {
- final File logFile = new File(LOG_FILE) ;
- if (logFile.exists())
- {
- assertTrue("Deleting logfile", logFile.delete()) ;
- }
-
- sendMessage();
-
- /* Verify that the message file is created */
- boolean fileExists = Helpers.checkForFile(LOG_FILE);
- if (!fileExists) {
- fail("Event file " + LOG_FILE
- + " not created - test marked as failing");
- }
-
- /* Verify that the message file is complete */
- boolean fileComplete = Helpers.checkFileContent(LOG_FILE,
- EXPECTED_RECORD_COUNT);
- if (!fileComplete) {
- Hashtable<String, String> temp = Helpers.getMessageString(LOG_FILE);
- fail("Event file " + LOG_FILE + " not complete - expected "
- + EXPECTED_RECORD_COUNT + " records - found " + temp.size()
- + ", test marked as failing");
- }
-
- Hashtable<String, String> theTable = Helpers.getMessageString(LOG_FILE);
- String theMessage = (String) theTable.get("Message1");
- assertEquals("The strings should match", RESPONSE_MESSAGE, theMessage);
- assertTrue("Deleting logfile", logFile.delete()) ;
- }
-
- public void sendMessage() throws Exception {
- SendJMSMessage sm = new SendJMSMessage();
- sm.setupConnection();
- sm.sendAMessage(JMS_MESSAGE + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_START + FILE_NAME
- + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END);
- sm.stop();
- }
-
- public static Test suite() throws Exception {
- return getDeploySetup(HelloWorldActionTest.class,
- "Quickstart_helloworld_action.esb");
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldActionTest.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldActionTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldActionTest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldActionTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,96 @@
+/*
+ * 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 java.io.File;
+import java.util.Hashtable;
+
+import junit.framework.Test;
+
+import org.jboss.soa.esb.actions.StoreMessageToFile;
+import org.jboss.soa.esb.samples.quickstart.helloworldaction.test.SendJMSMessage;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id: BlobUnitTestCase.java 58110 2006-11-04 08:34:21Z
+ * scott.stark at jboss.org $
+ */
+
+public class HelloWorldActionTest extends JBossTestCase {
+ private static final String JMS_MESSAGE = "HelloWorldActionTest message";
+ private static final String RESPONSE_MESSAGE = "BEFORE**" + JMS_MESSAGE + "AFTER**" ;
+ private static final String FILE_NAME = "HelloWorldActionTest.log";
+ private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME) + FILE_NAME;
+ private static final int EXPECTED_RECORD_COUNT = 1;
+
+ public HelloWorldActionTest(String name) {
+ super(name);
+ }
+
+ public void testMessage() throws Exception {
+ final File logFile = new File(LOG_FILE) ;
+ if (logFile.exists())
+ {
+ assertTrue("Deleting logfile", logFile.delete()) ;
+ }
+
+ sendMessage();
+
+ /* Verify that the message file is created */
+ boolean fileExists = Helpers.checkForFile(LOG_FILE);
+ if (!fileExists) {
+ fail("Event file " + LOG_FILE
+ + " not created - test marked as failing");
+ }
+
+ /* Verify that the message file is complete */
+ boolean fileComplete = Helpers.checkFileContent(LOG_FILE,
+ EXPECTED_RECORD_COUNT);
+ if (!fileComplete) {
+ Hashtable<String, String> temp = Helpers.getMessageString(LOG_FILE);
+ fail("Event file " + LOG_FILE + " not complete - expected "
+ + EXPECTED_RECORD_COUNT + " records - found " + temp.size()
+ + ", test marked as failing");
+ }
+
+ Hashtable<String, String> theTable = Helpers.getMessageString(LOG_FILE);
+ String theMessage = (String) theTable.get("Message1");
+ assertEquals("The strings should match", RESPONSE_MESSAGE, theMessage);
+ assertTrue("Deleting logfile", logFile.delete()) ;
+ }
+
+ public void sendMessage() throws Exception {
+ SendJMSMessage sm = new SendJMSMessage();
+ sm.setupConnection();
+ sm.sendAMessage(JMS_MESSAGE + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_START + FILE_NAME
+ + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END);
+ sm.stop();
+ }
+
+ public static Test suite() throws Exception {
+ return getDeploySetup(HelloWorldActionTest.class,
+ "Quickstart_helloworld_action.esb");
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldDBRegistrationTest.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldDBRegistrationTest.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldDBRegistrationTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,92 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-
-package org.jboss.soa.esb.quickstart.test;
-
-import java.io.File;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-
-import org.jboss.soa.esb.actions.StoreMessageToFile;
-import org.jboss.soa.esb.samples.quickstart.helloworlddbregistration.test.SendJMSMessage;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id: BlobUnitTestCase.java 58110 2006-11-04 08:34:21Z
- * scott.stark at jboss.org $
- */
-
-public class HelloWorldDBRegistrationTest extends JBossTestCase {
- private static final String JMS_MESSAGE = "HelloWorldDBRegistrationTest message";
- private static final String FILE_NAME = "HelloWorldDBRegistrationTest.log";
- private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME) + FILE_NAME;
- private static final int EXPECTED_RECORD_COUNT = 1;
-
- public HelloWorldDBRegistrationTest(String name) {
- super(name);
- }
-
- public void testMessage() throws Exception {
- sendMessage();
-
- /* Verify that the message file is created */
- boolean fileExists = Helpers.checkForFile(LOG_FILE);
- if (!fileExists) {
- fail("Event file " + LOG_FILE
- + " not created - test marked as failing");
- }
-
- /* Verify that the message file is complete */
- boolean fileComplete = Helpers.checkFileContent(LOG_FILE,
- EXPECTED_RECORD_COUNT);
- if (!fileComplete) {
- Hashtable<String, String> temp = Helpers.getMessageString(LOG_FILE);
- File target = new File(LOG_FILE);
- target.delete();
- fail("Event file " + LOG_FILE + " not complete - expected "
- + EXPECTED_RECORD_COUNT + " records - found " + temp.size()
- + ", test marked as failing");
- }
-
- Hashtable<String, String> theTable = Helpers.getMessageString(LOG_FILE);
- String theMessage = (String) theTable.get("Message1");
- assertEquals("The strings should match", theMessage, JMS_MESSAGE);
- File target = new File(LOG_FILE);
- target.delete();
- }
-
- public void sendMessage() throws Exception {
- SendJMSMessage sm = new SendJMSMessage();
- sm.setupConnection();
- sm.sendAMessage(JMS_MESSAGE + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_START + FILE_NAME
- + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END);
- sm.stop();
- }
-
- public static Test suite() throws Exception {
- return getDeploySetup(HelloWorldDBRegistrationTest.class,
- "Quickstart_db_registration.esb");
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldDBRegistrationTest.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldDBRegistrationTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldDBRegistrationTest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldDBRegistrationTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package org.jboss.soa.esb.quickstart.test;
+
+import java.io.File;
+import java.util.Hashtable;
+
+import junit.framework.Test;
+
+import org.jboss.soa.esb.actions.StoreMessageToFile;
+import org.jboss.soa.esb.samples.quickstart.helloworlddbregistration.test.SendJMSMessage;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id: BlobUnitTestCase.java 58110 2006-11-04 08:34:21Z
+ * scott.stark at jboss.org $
+ */
+
+public class HelloWorldDBRegistrationTest extends JBossTestCase {
+ private static final String JMS_MESSAGE = "HelloWorldDBRegistrationTest message";
+ private static final String FILE_NAME = "HelloWorldDBRegistrationTest.log";
+ private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME) + FILE_NAME;
+ private static final int EXPECTED_RECORD_COUNT = 1;
+
+ public HelloWorldDBRegistrationTest(String name) {
+ super(name);
+ }
+
+ public void testMessage() throws Exception {
+ sendMessage();
+
+ /* Verify that the message file is created */
+ boolean fileExists = Helpers.checkForFile(LOG_FILE);
+ if (!fileExists) {
+ fail("Event file " + LOG_FILE
+ + " not created - test marked as failing");
+ }
+
+ /* Verify that the message file is complete */
+ boolean fileComplete = Helpers.checkFileContent(LOG_FILE,
+ EXPECTED_RECORD_COUNT);
+ if (!fileComplete) {
+ Hashtable<String, String> temp = Helpers.getMessageString(LOG_FILE);
+ File target = new File(LOG_FILE);
+ target.delete();
+ fail("Event file " + LOG_FILE + " not complete - expected "
+ + EXPECTED_RECORD_COUNT + " records - found " + temp.size()
+ + ", test marked as failing");
+ }
+
+ Hashtable<String, String> theTable = Helpers.getMessageString(LOG_FILE);
+ String theMessage = (String) theTable.get("Message1");
+ assertEquals("The strings should match", theMessage, JMS_MESSAGE);
+ File target = new File(LOG_FILE);
+ target.delete();
+ }
+
+ public void sendMessage() throws Exception {
+ SendJMSMessage sm = new SendJMSMessage();
+ sm.setupConnection();
+ sm.sendAMessage(JMS_MESSAGE + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_START + FILE_NAME
+ + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END);
+ sm.stop();
+ }
+
+ public static Test suite() throws Exception {
+ return getDeploySetup(HelloWorldDBRegistrationTest.class,
+ "Quickstart_db_registration.esb");
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldFileActionTest.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldFileActionTest.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldFileActionTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,135 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.quickstart.test;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-
-import org.jboss.soa.esb.actions.StoreMessageToFile;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- */
-
-public class HelloWorldFileActionTest
- extends JBossTestCase {
-
- private static final String FILE_NAME = "HelloWorldFileActionTest.log";
- private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME) + FILE_NAME;
- private static final int EXPECTED_RECORD_COUNT = 1;
- private static final String INPUT_DIRECTORY = "helloworld_file_action/build/dirs/input/";
- private static final String INPUT_FILE_NAME = "MyInput.dat";
- private static final String OUTPUT_DIRECTORY = "helloworld_file_action/build/dirs/output/";
- private static final String OUTPUT_FILE_NAME = OUTPUT_DIRECTORY + "MyInput.dat.sentToEsb";
- private static final String FILE_CONTENTS = "Hello World In A File";
- private static final String RESPONSE_CONTENTS = "BEFORE"+FILE_CONTENTS+"AFTER";
-
- public HelloWorldFileActionTest(String name)
- {
- super(name);
- }
-
- public void testMessage() throws Exception
- {
- final File logFile = new File(LOG_FILE) ;
- if (logFile.exists())
- {
- assertTrue("Deleting logfile", logFile.delete()) ;
- }
- final String outputFileName = Helpers.getQuickstartLocation(OUTPUT_FILE_NAME) ;
-
- createFileAction();
-
- /* Verify that the output file is created */
- boolean fileExists = Helpers.checkForFile(outputFileName);
- if (!fileExists) {
- fail("File " + outputFileName
- + " not created - test marked as failing");
- }
-
- /* Verify that the message file is created */
- fileExists = Helpers.checkForFile(LOG_FILE);
- if (!fileExists) {
- fail("Event file " + LOG_FILE
- + " not created - test marked as failing");
- }
-
- /* Verify that the log file is complete */
- boolean logFileComplete = Helpers.checkFileContent(LOG_FILE,
- EXPECTED_RECORD_COUNT);
- if (!logFileComplete) {
- Hashtable<String, String> temp = Helpers.getMessageString(LOG_FILE);
- fail("File Action Output file " + LOG_FILE + " not complete - expected "
- + EXPECTED_RECORD_COUNT + " records - found " + temp.size()
- + ", test marked as failing");
- }
-
- /* Check the log file */
- Hashtable<String, String> theTable = Helpers.getMessageString(LOG_FILE);
- String theMessage = (String) theTable.get("Message1");
- assertEquals("The strings in the log file should match", RESPONSE_CONTENTS, theMessage);
-
- /* Verify that the output file is complete */
- boolean fileComplete = Helpers.checkFileContent(outputFileName,
- EXPECTED_RECORD_COUNT);
- if (!fileComplete) {
- Hashtable<String, String> temp = Helpers.getMessageString(outputFileName);
- fail("File Action Output file " + outputFileName + " not complete - expected "
- + EXPECTED_RECORD_COUNT + " records - found " + temp.size()
- + ", test marked as failing");
- }
-
- theTable = Helpers.getMessageString(outputFileName);
- theMessage = (String) theTable.get("Message1");
- assertEquals("The strings in output file should match", FILE_CONTENTS, theMessage);
-
- assertTrue("Deleting logfile", logFile.delete()) ;
- } /* method */
-
- public void createFileAction() throws Exception
- {
- String tempStr = FILE_CONTENTS + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_START + FILE_NAME + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END;
- final String inputDirectory = Helpers.getQuickstartLocation(INPUT_DIRECTORY) ;
- File x = new File(inputDirectory, INPUT_FILE_NAME);
- try {
- BufferedWriter out = new BufferedWriter(new FileWriter(x));
- out.write(tempStr.toCharArray());
- out.close();
- } catch (Exception e) {
- System.out.println("Error while writing the file: " + x.getAbsolutePath());
- System.out.println(e.getMessage());
- }
- } /* method */
-
- public static Test suite() throws Exception
- {
- return getDeploySetup(HelloWorldFileActionTest.class, "Quickstart_helloworld_file_action.esb");
- } /* method */
-
-} /*/class */
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldFileActionTest.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldFileActionTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldFileActionTest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldFileActionTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,135 @@
+/*
+ * 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 java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.util.Hashtable;
+
+import junit.framework.Test;
+
+import org.jboss.soa.esb.actions.StoreMessageToFile;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
+ */
+
+public class HelloWorldFileActionTest
+ extends JBossTestCase {
+
+ private static final String FILE_NAME = "HelloWorldFileActionTest.log";
+ private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME) + FILE_NAME;
+ private static final int EXPECTED_RECORD_COUNT = 1;
+ private static final String INPUT_DIRECTORY = "helloworld_file_action/build/dirs/input/";
+ private static final String INPUT_FILE_NAME = "MyInput.dat";
+ private static final String OUTPUT_DIRECTORY = "helloworld_file_action/build/dirs/output/";
+ private static final String OUTPUT_FILE_NAME = OUTPUT_DIRECTORY + "MyInput.dat.sentToEsb";
+ private static final String FILE_CONTENTS = "Hello World In A File";
+ private static final String RESPONSE_CONTENTS = "BEFORE"+FILE_CONTENTS+"AFTER";
+
+ public HelloWorldFileActionTest(String name)
+ {
+ super(name);
+ }
+
+ public void testMessage() throws Exception
+ {
+ final File logFile = new File(LOG_FILE) ;
+ if (logFile.exists())
+ {
+ assertTrue("Deleting logfile", logFile.delete()) ;
+ }
+ final String outputFileName = Helpers.getQuickstartLocation(OUTPUT_FILE_NAME) ;
+
+ createFileAction();
+
+ /* Verify that the output file is created */
+ boolean fileExists = Helpers.checkForFile(outputFileName);
+ if (!fileExists) {
+ fail("File " + outputFileName
+ + " not created - test marked as failing");
+ }
+
+ /* Verify that the message file is created */
+ fileExists = Helpers.checkForFile(LOG_FILE);
+ if (!fileExists) {
+ fail("Event file " + LOG_FILE
+ + " not created - test marked as failing");
+ }
+
+ /* Verify that the log file is complete */
+ boolean logFileComplete = Helpers.checkFileContent(LOG_FILE,
+ EXPECTED_RECORD_COUNT);
+ if (!logFileComplete) {
+ Hashtable<String, String> temp = Helpers.getMessageString(LOG_FILE);
+ fail("File Action Output file " + LOG_FILE + " not complete - expected "
+ + EXPECTED_RECORD_COUNT + " records - found " + temp.size()
+ + ", test marked as failing");
+ }
+
+ /* Check the log file */
+ Hashtable<String, String> theTable = Helpers.getMessageString(LOG_FILE);
+ String theMessage = (String) theTable.get("Message1");
+ assertEquals("The strings in the log file should match", RESPONSE_CONTENTS, theMessage);
+
+ /* Verify that the output file is complete */
+ boolean fileComplete = Helpers.checkFileContent(outputFileName,
+ EXPECTED_RECORD_COUNT);
+ if (!fileComplete) {
+ Hashtable<String, String> temp = Helpers.getMessageString(outputFileName);
+ fail("File Action Output file " + outputFileName + " not complete - expected "
+ + EXPECTED_RECORD_COUNT + " records - found " + temp.size()
+ + ", test marked as failing");
+ }
+
+ theTable = Helpers.getMessageString(outputFileName);
+ theMessage = (String) theTable.get("Message1");
+ assertEquals("The strings in output file should match", FILE_CONTENTS, theMessage);
+
+ assertTrue("Deleting logfile", logFile.delete()) ;
+ } /* method */
+
+ public void createFileAction() throws Exception
+ {
+ String tempStr = FILE_CONTENTS + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_START + FILE_NAME + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END;
+ final String inputDirectory = Helpers.getQuickstartLocation(INPUT_DIRECTORY) ;
+ File x = new File(inputDirectory, INPUT_FILE_NAME);
+ try {
+ BufferedWriter out = new BufferedWriter(new FileWriter(x));
+ out.write(tempStr.toCharArray());
+ out.close();
+ } catch (Exception e) {
+ System.out.println("Error while writing the file: " + x.getAbsolutePath());
+ System.out.println(e.getMessage());
+ }
+ } /* method */
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(HelloWorldFileActionTest.class, "Quickstart_helloworld_file_action.esb");
+ } /* method */
+
+} /*/class */
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldSQLActionTest.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldSQLActionTest.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldSQLActionTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,140 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.quickstart.test;
-
-import junit.framework.Test;
-
-import org.jboss.soa.esb.actions.StoreMessageToFile;
-import org.jboss.test.JBossTestCase;
-
-import java.sql.*;
-import java.util.Vector;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- */
-public class HelloWorldSQLActionTest extends JBossTestCase {
-
- private static final String FILE_NAME = "HelloWorldSQLActionTest.log";
- private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME)
- + FILE_NAME;
- private static final int EXPECTED_RECORD_COUNT = 1;
-
-
- public HelloWorldSQLActionTest(String name) {
- super(name);
- }
-
- public void testMessage() throws Exception {
- sendMessage();
-
- // Commented out 20070824 - ldimaggi - the log file is not
- // being written - not clear why - perhaps due to
- // ESB supports DB as a transport - That type of transport does
- // not support MySQL
-
-// /* Verify that the message file is created */
-// boolean fileExists = Helpers.checkForFile(LOG_FILE);
-// if (!fileExists) {
-// fail("Event file " + LOG_FILE
-// + " not created - test marked as failing");
-// }
-//
-// /* Verify that the message file is complete */
-// boolean fileComplete = Helpers.checkFileContent(LOG_FILE,
-// EXPECTED_RECORD_COUNT);
-// if (!fileComplete) {
-// Hashtable temp = Helpers.getMessageString(LOG_FILE);
-// File target = new File(LOG_FILE);
-// target.delete();
-// fail("Event file " + LOG_FILE + " not complete - expected "
-// + EXPECTED_RECORD_COUNT + " records - found " + temp.size()
-// + ", test marked as failing");
-// }
-//
-// Hashtable theTable = Helpers.getMessageString(LOG_FILE);
-// String theMessage = (String) theTable.get("Message1");
-// assertEquals("The strings should match", theMessage, JMS_MESSAGE);
-// File target = new File(LOG_FILE);
-// target.delete();
-
- }
-
- public void sendMessage() throws Exception {
-
- Connection connection = null;
- try {
- // Load the JDBC driver
- String driverName = "org.gjt.mm.mysql.Driver";
- Class.forName(driverName);
-
- // Create a connection to the database
- String serverName = "localhost";
- String mydatabase = "test_sql_gateway";
- String url = "jdbc:mysql://" + serverName + "/" + mydatabase;
- String username = "root";
- String password = "";
- connection = DriverManager.getConnection(url, username, password);
- } catch (ClassNotFoundException e) {
- // Could not find the database driver
- } catch (SQLException e) {
- // Could not connect to the database
- }
-
- String loggingInfo = StoreMessageToFile.MESSAGE_CONTENT_FILENAME_START + LOG_FILE + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END;
- Vector<String> theRecords = new Vector<String>();
-
- String tempStr = "insert into gateway_table values(0,'data 111111 " + loggingInfo + " ','p')";
- theRecords.add(tempStr);
-
- tempStr = "insert into gateway_table values(0,'data 22 " + loggingInfo + " ','p')";
- theRecords.add(tempStr);
-
- tempStr = "insert into gateway_table values(0,'data 333333333333111111 " + loggingInfo + " ','p')";
- theRecords.add(tempStr);
-
- tempStr = "insert into gateway_table values(0,'data d d d d " + loggingInfo + " ','p')";
- theRecords.add(tempStr);
-
- tempStr = "insert into gateway_table values(0,'data data last record " + loggingInfo + " ','p')";
- theRecords.add(tempStr);
-
- for (int i = 0; i < theRecords.size(); i++) {
-
- try {
- Statement stmt = connection.createStatement();
- String sql = (String) theRecords.elementAt(i);
- stmt.executeUpdate(sql);
- } catch (SQLException e) {
- }
- }
-
- } /* method */
-
- public static Test suite() throws Exception {
- return getDeploySetup(HelloWorldSQLActionTest.class,
- "Quickstart_helloworld_SQL_action.esb");
- }/* method */
-
-} /* class */
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldSQLActionTest.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldSQLActionTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldSQLActionTest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldSQLActionTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,140 @@
+/*
+ * 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.actions.StoreMessageToFile;
+import org.jboss.test.JBossTestCase;
+
+import java.sql.*;
+import java.util.Vector;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
+ */
+public class HelloWorldSQLActionTest extends JBossTestCase {
+
+ private static final String FILE_NAME = "HelloWorldSQLActionTest.log";
+ private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME)
+ + FILE_NAME;
+ private static final int EXPECTED_RECORD_COUNT = 1;
+
+
+ public HelloWorldSQLActionTest(String name) {
+ super(name);
+ }
+
+ public void testMessage() throws Exception {
+ sendMessage();
+
+ // Commented out 20070824 - ldimaggi - the log file is not
+ // being written - not clear why - perhaps due to
+ // ESB supports DB as a transport - That type of transport does
+ // not support MySQL
+
+// /* Verify that the message file is created */
+// boolean fileExists = Helpers.checkForFile(LOG_FILE);
+// if (!fileExists) {
+// fail("Event file " + LOG_FILE
+// + " not created - test marked as failing");
+// }
+//
+// /* Verify that the message file is complete */
+// boolean fileComplete = Helpers.checkFileContent(LOG_FILE,
+// EXPECTED_RECORD_COUNT);
+// if (!fileComplete) {
+// Hashtable temp = Helpers.getMessageString(LOG_FILE);
+// File target = new File(LOG_FILE);
+// target.delete();
+// fail("Event file " + LOG_FILE + " not complete - expected "
+// + EXPECTED_RECORD_COUNT + " records - found " + temp.size()
+// + ", test marked as failing");
+// }
+//
+// Hashtable theTable = Helpers.getMessageString(LOG_FILE);
+// String theMessage = (String) theTable.get("Message1");
+// assertEquals("The strings should match", theMessage, JMS_MESSAGE);
+// File target = new File(LOG_FILE);
+// target.delete();
+
+ }
+
+ public void sendMessage() throws Exception {
+
+ Connection connection = null;
+ try {
+ // Load the JDBC driver
+ String driverName = "org.gjt.mm.mysql.Driver";
+ Class.forName(driverName);
+
+ // Create a connection to the database
+ String serverName = "localhost";
+ String mydatabase = "test_sql_gateway";
+ String url = "jdbc:mysql://" + serverName + "/" + mydatabase;
+ String username = "root";
+ String password = "";
+ connection = DriverManager.getConnection(url, username, password);
+ } catch (ClassNotFoundException e) {
+ // Could not find the database driver
+ } catch (SQLException e) {
+ // Could not connect to the database
+ }
+
+ String loggingInfo = StoreMessageToFile.MESSAGE_CONTENT_FILENAME_START + LOG_FILE + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END;
+ Vector<String> theRecords = new Vector<String>();
+
+ String tempStr = "insert into gateway_table values(0,'data 111111 " + loggingInfo + " ','p')";
+ theRecords.add(tempStr);
+
+ tempStr = "insert into gateway_table values(0,'data 22 " + loggingInfo + " ','p')";
+ theRecords.add(tempStr);
+
+ tempStr = "insert into gateway_table values(0,'data 333333333333111111 " + loggingInfo + " ','p')";
+ theRecords.add(tempStr);
+
+ tempStr = "insert into gateway_table values(0,'data d d d d " + loggingInfo + " ','p')";
+ theRecords.add(tempStr);
+
+ tempStr = "insert into gateway_table values(0,'data data last record " + loggingInfo + " ','p')";
+ theRecords.add(tempStr);
+
+ for (int i = 0; i < theRecords.size(); i++) {
+
+ try {
+ Statement stmt = connection.createStatement();
+ String sql = (String) theRecords.elementAt(i);
+ stmt.executeUpdate(sql);
+ } catch (SQLException e) {
+ }
+ }
+
+ } /* method */
+
+ public static Test suite() throws Exception {
+ return getDeploySetup(HelloWorldSQLActionTest.class,
+ "Quickstart_helloworld_SQL_action.esb");
+ }/* method */
+
+} /* class */
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldTest.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldTest.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,98 +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.quickstart.test;
-
-import java.io.File;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-
-import org.jboss.soa.esb.actions.StoreMessageToFile;
-import org.jboss.soa.esb.samples.quickstart.helloworld.test.SendJMSMessage;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Id: BlobUnitTestCase.java 58110 2006-11-04 08:34:21Z
- * scott.stark at jboss.org $
- */
-
-public class HelloWorldTest extends JBossTestCase {
- private static final String JMS_MESSAGE = "HelloWorldTest message";
-
- private static final String FILE_NAME = "HelloWorldTest.log";
-
- private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME)
- + FILE_NAME;
-
- private static final int EXPECTED_RECORD_COUNT = 1;
-
- public HelloWorldTest(String name) {
- super(name);
- }
-
- public void testMessage() throws Exception {
- final File logFile = new File(LOG_FILE) ;
- if (logFile.exists())
- {
- assertTrue("Deleting logfile", logFile.delete()) ;
- }
-
- sendMessage();
-
- /* Verify that the message file is created */
- boolean fileExists = Helpers.checkForFile(LOG_FILE);
- if (!fileExists) {
- fail("Event file " + LOG_FILE
- + " not created - test marked as failing");
- }
-
- /* Verify that the message file is complete */
- boolean fileComplete = Helpers.checkFileContent(LOG_FILE,
- EXPECTED_RECORD_COUNT);
- if (!fileComplete) {
- Hashtable<String, String> temp = Helpers.getMessageString(LOG_FILE);
- fail("Event file " + LOG_FILE + " not complete - expected "
- + EXPECTED_RECORD_COUNT + " records - found " + temp.size()
- + ", test marked as failing");
- }
-
- Hashtable<String, String> theTable = Helpers.getMessageString(LOG_FILE);
- String theMessage = (String) theTable.get("Message1");
- assertEquals("The strings should match", JMS_MESSAGE, theMessage);
- assertTrue("Deleting logfile", logFile.delete()) ;
- }
-
- public void sendMessage() throws Exception {
- SendJMSMessage sm = new SendJMSMessage();
- sm.setupConnection();
- sm.sendAMessage(JMS_MESSAGE + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_START + FILE_NAME
- + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END) ;
- sm.stop();
- }
-
- public static Test suite() throws Exception {
- return getDeploySetup(HelloWorldTest.class, "Quickstart_helloworld.esb");
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldTest.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldTest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HelloWorldTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,98 @@
+/*
+ * 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 java.io.File;
+import java.util.Hashtable;
+
+import junit.framework.Test;
+
+import org.jboss.soa.esb.actions.StoreMessageToFile;
+import org.jboss.soa.esb.samples.quickstart.helloworld.test.SendJMSMessage;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Id: BlobUnitTestCase.java 58110 2006-11-04 08:34:21Z
+ * scott.stark at jboss.org $
+ */
+
+public class HelloWorldTest extends JBossTestCase {
+ private static final String JMS_MESSAGE = "HelloWorldTest message";
+
+ private static final String FILE_NAME = "HelloWorldTest.log";
+
+ private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME)
+ + FILE_NAME;
+
+ private static final int EXPECTED_RECORD_COUNT = 1;
+
+ public HelloWorldTest(String name) {
+ super(name);
+ }
+
+ public void testMessage() throws Exception {
+ final File logFile = new File(LOG_FILE) ;
+ if (logFile.exists())
+ {
+ assertTrue("Deleting logfile", logFile.delete()) ;
+ }
+
+ sendMessage();
+
+ /* Verify that the message file is created */
+ boolean fileExists = Helpers.checkForFile(LOG_FILE);
+ if (!fileExists) {
+ fail("Event file " + LOG_FILE
+ + " not created - test marked as failing");
+ }
+
+ /* Verify that the message file is complete */
+ boolean fileComplete = Helpers.checkFileContent(LOG_FILE,
+ EXPECTED_RECORD_COUNT);
+ if (!fileComplete) {
+ Hashtable<String, String> temp = Helpers.getMessageString(LOG_FILE);
+ fail("Event file " + LOG_FILE + " not complete - expected "
+ + EXPECTED_RECORD_COUNT + " records - found " + temp.size()
+ + ", test marked as failing");
+ }
+
+ Hashtable<String, String> theTable = Helpers.getMessageString(LOG_FILE);
+ String theMessage = (String) theTable.get("Message1");
+ assertEquals("The strings should match", JMS_MESSAGE, theMessage);
+ assertTrue("Deleting logfile", logFile.delete()) ;
+ }
+
+ public void sendMessage() throws Exception {
+ SendJMSMessage sm = new SendJMSMessage();
+ sm.setupConnection();
+ sm.sendAMessage(JMS_MESSAGE + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_START + FILE_NAME
+ + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END) ;
+ sm.stop();
+ }
+
+ public static Test suite() throws Exception {
+ return getDeploySetup(HelloWorldTest.class, "Quickstart_helloworld.esb");
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/Helpers.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/Helpers.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/Helpers.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,207 +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.quickstart.test;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.Hashtable;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.jboss.soa.esb.actions.StoreMessageToFile;
-import org.jboss.soa.esb.quickstart.test.util.IdentitySAXHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import junit.framework.Assert;
-
-/**
- * Helper class for quickstart tests
- *
- */
-
-public class Helpers {
- public static final int FILE_TIMER = 3000;
- public static final int FILE_COUNTER = 5;
-
- /* Read the message files into a hash */
- public static Hashtable<String, String> getMessageString(String fileName) {
- Hashtable<String,String> returnTable = new Hashtable<String,String>();
- int theCounter = 1;
- try {
- BufferedReader in = new BufferedReader(new FileReader(fileName));
- String str;
- while ((str = in.readLine()) != null) {
- final int startTag = str.indexOf(StoreMessageToFile.MESSAGE_CONTENT_FILENAME_START);
- if (startTag == -1) {
- break ;
- }
- final int endTag = str.indexOf(StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END) ;
- final String returnString ;
- if (endTag > startTag) {
- final int endIndex = endTag + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END.length() ;
- if (endIndex < str.length()-1) {
- returnString = str.substring(0, startTag) + str.substring(endIndex) ;
- } else {
- returnString = str.substring(0, startTag) ;
- }
- } else {
- returnString = str ;
- }
- returnTable.put("Message" + theCounter++, returnString);
- }
- in.close();
- } catch (IOException e) {
- Assert.fail("Cannot read file: " + fileName);
- }
- return returnTable;
- } /* method */
-
- /* Read the message files into a hash- used by HelloWorldFileActionTest */
- public static Hashtable<String, String> getFileActionMessageString(String fileName) {
- Hashtable<String,String> returnTable = new Hashtable<String,String>();
- int theCounter = 1;
- try {
- BufferedReader in = new BufferedReader(new FileReader(fileName));
- String str;
- while ((str = in.readLine()) != null) {
- returnTable.put("Message" + theCounter++, str);
- }
- in.close();
- } catch (IOException e) {
- Assert.fail("Cannot read file: " + fileName);
- }
- return returnTable;
- } /* method */
-
- /* Determine if the event file has been written */
- public static boolean checkForFile(String fileName) throws Exception {
- boolean wasFileFound = false;
- /* Look for file, if it's there, set the boolean and return, if it's
- * not, wait and try again */
- final File file = new File(fileName) ;
- for (int i = 0; i < FILE_COUNTER; i++) {
- boolean exists = file.exists();
- if (exists) {
- wasFileFound = true;
- break;
- }
- else {
- Thread.sleep(FILE_TIMER);
- }
- }
- return wasFileFound;
- } /* method */
-
- /* Determine if the event file has the correct # of entries written to it - this is probably
- * only needed for tests that write the same message to multiple queues - for example,
- * the RecipientlistTest */
- public static boolean checkFileContent(String fileName, int recordCount) throws Exception {
- boolean correctFileSize = false;
-
- /* Determine the number of records in the file, if it's not correct
- * wait and try again */
- for (int i = 0; i < FILE_COUNTER; i++) {
- Hashtable<String, String> theTable = getMessageString(fileName);
- int theKeys = theTable.size();
- if (theKeys == recordCount){
- correctFileSize = true;
- break;
- }
- else {
- Thread.sleep(FILE_TIMER);
- }
- }
- return correctFileSize;
- } /* method */
-
-
- public static String getTempDir(String filename)
- {
- String tmpDir="";
- if (!filename.startsWith(File.separator)) {
- tmpDir = System.getProperty("java.io.tmpdir") + File.separator;
- }
- return tmpDir;
- }
-
- public static String getQuickstartLocation(final String location)
- throws IOException
- {
- final File quickstartDir = new File(System.getProperty("org.jboss.esb.test.quickstarts.dir"), location) ;
- return quickstartDir.getCanonicalPath() ;
- }
-
- public static boolean compareXMLContent(final String content1, final String content2)
- throws ParserConfigurationException, SAXException, IOException
- {
- final SAXParserFactory parserFactory = SAXParserFactory.newInstance() ;
- parserFactory.setNamespaceAware(true) ;
-
- final SAXParser parser = parserFactory.newSAXParser() ;
-
- final IdentitySAXHandler handler1 = new IdentitySAXHandler() ;
- parser.parse(new InputSource(new StringReader(content1)), handler1) ;
-
- final IdentitySAXHandler handler2 = new IdentitySAXHandler() ;
- parser.parse(new InputSource(new StringReader(content2)), handler2) ;
-
- return (handler1.getRootElement().equals(handler2.getRootElement())) ;
- }
-
- public static void main(final String[] args)
- {
- final String content =
- "<test attr='1'>\n" +
- " <inner inner1Attr='1'>\r\n" +
- " innerContent1 \n" +
- " </inner>\n" +
- " testContent\n" +
- " <inner inner2Attr='2'>\r\n" +
- " innerContent2\n" +
- " </inner>\n" +
- " <inner3 inner3Attr='3'>\r\n" +
- " innerContent3\n" +
- " </inner3>\n" +
- " </test>" ;
- final SAXParserFactory parserFactory = SAXParserFactory.newInstance() ;
- parserFactory.setNamespaceAware(true) ;
-
- try
- {
- final SAXParser parser = parserFactory.newSAXParser() ;
-
- final IdentitySAXHandler handler1 = new IdentitySAXHandler() ;
- parser.parse(new InputSource(new StringReader(content)), handler1) ;
- }
- catch (final Throwable th)
- {
- th.printStackTrace() ;
- }
- }
-
-} /* class */
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/Helpers.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/Helpers.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/Helpers.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/Helpers.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,207 @@
+/*
+ * 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 java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.Hashtable;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.jboss.soa.esb.actions.StoreMessageToFile;
+import org.jboss.soa.esb.quickstart.test.util.IdentitySAXHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import junit.framework.Assert;
+
+/**
+ * Helper class for quickstart tests
+ *
+ */
+
+public class Helpers {
+ public static final int FILE_TIMER = 3000;
+ public static final int FILE_COUNTER = 5;
+
+ /* Read the message files into a hash */
+ public static Hashtable<String, String> getMessageString(String fileName) {
+ Hashtable<String,String> returnTable = new Hashtable<String,String>();
+ int theCounter = 1;
+ try {
+ BufferedReader in = new BufferedReader(new FileReader(fileName));
+ String str;
+ while ((str = in.readLine()) != null) {
+ final int startTag = str.indexOf(StoreMessageToFile.MESSAGE_CONTENT_FILENAME_START);
+ if (startTag == -1) {
+ break ;
+ }
+ final int endTag = str.indexOf(StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END) ;
+ final String returnString ;
+ if (endTag > startTag) {
+ final int endIndex = endTag + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END.length() ;
+ if (endIndex < str.length()-1) {
+ returnString = str.substring(0, startTag) + str.substring(endIndex) ;
+ } else {
+ returnString = str.substring(0, startTag) ;
+ }
+ } else {
+ returnString = str ;
+ }
+ returnTable.put("Message" + theCounter++, returnString);
+ }
+ in.close();
+ } catch (IOException e) {
+ Assert.fail("Cannot read file: " + fileName);
+ }
+ return returnTable;
+ } /* method */
+
+ /* Read the message files into a hash- used by HelloWorldFileActionTest */
+ public static Hashtable<String, String> getFileActionMessageString(String fileName) {
+ Hashtable<String,String> returnTable = new Hashtable<String,String>();
+ int theCounter = 1;
+ try {
+ BufferedReader in = new BufferedReader(new FileReader(fileName));
+ String str;
+ while ((str = in.readLine()) != null) {
+ returnTable.put("Message" + theCounter++, str);
+ }
+ in.close();
+ } catch (IOException e) {
+ Assert.fail("Cannot read file: " + fileName);
+ }
+ return returnTable;
+ } /* method */
+
+ /* Determine if the event file has been written */
+ public static boolean checkForFile(String fileName) throws Exception {
+ boolean wasFileFound = false;
+ /* Look for file, if it's there, set the boolean and return, if it's
+ * not, wait and try again */
+ final File file = new File(fileName) ;
+ for (int i = 0; i < FILE_COUNTER; i++) {
+ boolean exists = file.exists();
+ if (exists) {
+ wasFileFound = true;
+ break;
+ }
+ else {
+ Thread.sleep(FILE_TIMER);
+ }
+ }
+ return wasFileFound;
+ } /* method */
+
+ /* Determine if the event file has the correct # of entries written to it - this is probably
+ * only needed for tests that write the same message to multiple queues - for example,
+ * the RecipientlistTest */
+ public static boolean checkFileContent(String fileName, int recordCount) throws Exception {
+ boolean correctFileSize = false;
+
+ /* Determine the number of records in the file, if it's not correct
+ * wait and try again */
+ for (int i = 0; i < FILE_COUNTER; i++) {
+ Hashtable<String, String> theTable = getMessageString(fileName);
+ int theKeys = theTable.size();
+ if (theKeys == recordCount){
+ correctFileSize = true;
+ break;
+ }
+ else {
+ Thread.sleep(FILE_TIMER);
+ }
+ }
+ return correctFileSize;
+ } /* method */
+
+
+ public static String getTempDir(String filename)
+ {
+ String tmpDir="";
+ if (!filename.startsWith(File.separator)) {
+ tmpDir = System.getProperty("java.io.tmpdir") + File.separator;
+ }
+ return tmpDir;
+ }
+
+ public static String getQuickstartLocation(final String location)
+ throws IOException
+ {
+ final File quickstartDir = new File(System.getProperty("org.jboss.esb.test.quickstarts.dir"), location) ;
+ return quickstartDir.getCanonicalPath() ;
+ }
+
+ public static boolean compareXMLContent(final String content1, final String content2)
+ throws ParserConfigurationException, SAXException, IOException
+ {
+ final SAXParserFactory parserFactory = SAXParserFactory.newInstance() ;
+ parserFactory.setNamespaceAware(true) ;
+
+ final SAXParser parser = parserFactory.newSAXParser() ;
+
+ final IdentitySAXHandler handler1 = new IdentitySAXHandler() ;
+ parser.parse(new InputSource(new StringReader(content1)), handler1) ;
+
+ final IdentitySAXHandler handler2 = new IdentitySAXHandler() ;
+ parser.parse(new InputSource(new StringReader(content2)), handler2) ;
+
+ return (handler1.getRootElement().equals(handler2.getRootElement())) ;
+ }
+
+ public static void main(final String[] args)
+ {
+ final String content =
+ "<test attr='1'>\n" +
+ " <inner inner1Attr='1'>\r\n" +
+ " innerContent1 \n" +
+ " </inner>\n" +
+ " testContent\n" +
+ " <inner inner2Attr='2'>\r\n" +
+ " innerContent2\n" +
+ " </inner>\n" +
+ " <inner3 inner3Attr='3'>\r\n" +
+ " innerContent3\n" +
+ " </inner3>\n" +
+ " </test>" ;
+ final SAXParserFactory parserFactory = SAXParserFactory.newInstance() ;
+ parserFactory.setNamespaceAware(true) ;
+
+ try
+ {
+ final SAXParser parser = parserFactory.newSAXParser() ;
+
+ final IdentitySAXHandler handler1 = new IdentitySAXHandler() ;
+ parser.parse(new InputSource(new StringReader(content)), handler1) ;
+ }
+ catch (final Throwable th)
+ {
+ th.printStackTrace() ;
+ }
+ }
+
+} /* class */
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/RecipientlistTest.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/RecipientlistTest.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/RecipientlistTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,113 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.quickstart.test;
-
-import java.io.File;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-
-import org.jboss.soa.esb.actions.StoreMessageToFile;
-import org.jboss.soa.esb.samples.quickstart.recipientList.test.SendCBRJMSMessage;
-import org.jboss.soa.esb.samples.quickstart.recipientList.test.SendStaticRouterJMSMessage;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:"></a>
- * @version $Id: $
- */
-
-public class RecipientlistTest extends JBossTestCase {
- private static final String JMS_MESSAGE = "RecipientlistTest message";
- private static final String FILE_NAME = "RecipientlistTest.log";
- private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME) + FILE_NAME;
- private static final String JMS_CBR_MESSAGE = "<Order sampleData=\"CBR test\" testDate=\"20070518\" routeToFollow=\"both\"><Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\" state=\"SD\"/></Order>";
- private static final int EXPECTED_RECORD_COUNT = 3;
-
- public RecipientlistTest(String name) {
- super(name);
- }
-
- /* This test is intentionally skipped as of 20070813 - ldimaggi -
- * there's some problem with the CBR - the test seems unable to
- * send the messages to the destinations targetted by the CBR */
- public void skip_testCBRMessage() throws Exception {
- sendCBRJMSMessage();
- Thread.sleep(10000); // wait for message to post.
- }
-
- public void testStaticMessage() throws Exception {
- sendStaticRouterJMSMessage();
-
- /* Verify that the message file is created */
- boolean fileExists = Helpers.checkForFile(LOG_FILE);
- if (!fileExists) {
- fail ("Event file " + LOG_FILE + " not created - test marked as failing");
- }
-
- /* Verify that the message file is complete */
- boolean fileComplete = Helpers.checkFileContent(LOG_FILE, EXPECTED_RECORD_COUNT);
- if (!fileComplete) {
- Hashtable<String, String> temp = Helpers.getMessageString(LOG_FILE);
- File target = new File(LOG_FILE);
- target.delete();
- fail ("Event file " + LOG_FILE + " not complete - expected " + EXPECTED_RECORD_COUNT
- + " records - found " + temp.size() + ", test marked as failing");
- }
-
- Hashtable<String, String> theTable = Helpers.getMessageString(LOG_FILE);
-
- String theMessage1 = (String) theTable.get("Message1");
- String theMessage2 = (String) theTable.get("Message2");
- String theMessage3 = (String) theTable.get("Message3");
-
- assertEquals("The strings should match1", theMessage1, JMS_MESSAGE);
- assertEquals("The strings should match2", theMessage2, JMS_MESSAGE);
- assertEquals("The strings should match3", theMessage3, JMS_MESSAGE);
-
- File target = new File(LOG_FILE);
- target.delete();
- }
-
- public void sendCBRJMSMessage() throws Exception {
- SendCBRJMSMessage sm = new SendCBRJMSMessage();
- sm.setupConnection();
- sm.sendAMessage(JMS_CBR_MESSAGE + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_START + FILE_NAME
- + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END);
- sm.stop();
- }
-
- public void sendStaticRouterJMSMessage() throws Exception {
- SendStaticRouterJMSMessage sm = new SendStaticRouterJMSMessage();
- sm.setupConnection();
- sm.sendAMessage(JMS_MESSAGE + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_START + FILE_NAME
- + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END);
- sm.stop();
- }
-
- public static Test suite() throws Exception {
- return getDeploySetup(RecipientlistTest.class,
- "Quickstart_recipient_list.esb");
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/RecipientlistTest.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/RecipientlistTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/RecipientlistTest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/RecipientlistTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,113 @@
+/*
+ * 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 java.io.File;
+import java.util.Hashtable;
+
+import junit.framework.Test;
+
+import org.jboss.soa.esb.actions.StoreMessageToFile;
+import org.jboss.soa.esb.samples.quickstart.recipientList.test.SendCBRJMSMessage;
+import org.jboss.soa.esb.samples.quickstart.recipientList.test.SendStaticRouterJMSMessage;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:"></a>
+ * @version $Id: $
+ */
+
+public class RecipientlistTest extends JBossTestCase {
+ private static final String JMS_MESSAGE = "RecipientlistTest message";
+ private static final String FILE_NAME = "RecipientlistTest.log";
+ private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME) + FILE_NAME;
+ private static final String JMS_CBR_MESSAGE = "<Order sampleData=\"CBR test\" testDate=\"20070518\" routeToFollow=\"both\"><Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\" state=\"SD\"/></Order>";
+ private static final int EXPECTED_RECORD_COUNT = 3;
+
+ public RecipientlistTest(String name) {
+ super(name);
+ }
+
+ /* This test is intentionally skipped as of 20070813 - ldimaggi -
+ * there's some problem with the CBR - the test seems unable to
+ * send the messages to the destinations targetted by the CBR */
+ public void skip_testCBRMessage() throws Exception {
+ sendCBRJMSMessage();
+ Thread.sleep(10000); // wait for message to post.
+ }
+
+ public void testStaticMessage() throws Exception {
+ sendStaticRouterJMSMessage();
+
+ /* Verify that the message file is created */
+ boolean fileExists = Helpers.checkForFile(LOG_FILE);
+ if (!fileExists) {
+ fail ("Event file " + LOG_FILE + " not created - test marked as failing");
+ }
+
+ /* Verify that the message file is complete */
+ boolean fileComplete = Helpers.checkFileContent(LOG_FILE, EXPECTED_RECORD_COUNT);
+ if (!fileComplete) {
+ Hashtable<String, String> temp = Helpers.getMessageString(LOG_FILE);
+ File target = new File(LOG_FILE);
+ target.delete();
+ fail ("Event file " + LOG_FILE + " not complete - expected " + EXPECTED_RECORD_COUNT
+ + " records - found " + temp.size() + ", test marked as failing");
+ }
+
+ Hashtable<String, String> theTable = Helpers.getMessageString(LOG_FILE);
+
+ String theMessage1 = (String) theTable.get("Message1");
+ String theMessage2 = (String) theTable.get("Message2");
+ String theMessage3 = (String) theTable.get("Message3");
+
+ assertEquals("The strings should match1", theMessage1, JMS_MESSAGE);
+ assertEquals("The strings should match2", theMessage2, JMS_MESSAGE);
+ assertEquals("The strings should match3", theMessage3, JMS_MESSAGE);
+
+ File target = new File(LOG_FILE);
+ target.delete();
+ }
+
+ public void sendCBRJMSMessage() throws Exception {
+ SendCBRJMSMessage sm = new SendCBRJMSMessage();
+ sm.setupConnection();
+ sm.sendAMessage(JMS_CBR_MESSAGE + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_START + FILE_NAME
+ + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END);
+ sm.stop();
+ }
+
+ public void sendStaticRouterJMSMessage() throws Exception {
+ SendStaticRouterJMSMessage sm = new SendStaticRouterJMSMessage();
+ sm.setupConnection();
+ sm.sendAMessage(JMS_MESSAGE + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_START + FILE_NAME
+ + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END);
+ sm.stop();
+ }
+
+ public static Test suite() throws Exception {
+ return getDeploySetup(RecipientlistTest.class,
+ "Quickstart_recipient_list.esb");
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/ScriptingGroovyTest.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/ScriptingGroovyTest.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/ScriptingGroovyTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,103 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.quickstart.test;
-
-import java.io.File;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-
-import org.jboss.soa.esb.actions.StoreMessageToFile;
-import org.jboss.soa.esb.samples.quickstart.scriptinggroovy.test.SendJMSMessage;
-import org.jboss.test.JBossTestCase;
-
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- */
-
-public class ScriptingGroovyTest
- extends JBossTestCase
-{
- private static final String JMS_MESSAGE = "ScriptingGroovyTest message";
-
- private static final String FILE_NAME = "ScriptingGroovyTest.log";
-
- private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME)
- + FILE_NAME;
-
- private static final int EXPECTED_RECORD_COUNT = 1;
-
- public ScriptingGroovyTest(String name)
- {
- super(name);
- }
-
- public void testMessage() throws Exception
- {
- final File logFile = new File(LOG_FILE) ;
- if (logFile.exists())
- {
- assertTrue("Deleting logfile", logFile.delete()) ;
- }
-
- sendMessage();
-
- /* Verify that the message file is created */
- boolean fileExists = Helpers.checkForFile(LOG_FILE);
- if (!fileExists) {
- fail("Event file " + LOG_FILE
- + " not created - test marked as failing");
- }
-
- /* Verify that the message file is complete */
- boolean fileComplete = Helpers.checkFileContent(LOG_FILE,
- EXPECTED_RECORD_COUNT);
- if (!fileComplete) {
- Hashtable<String, String> temp = Helpers.getMessageString(LOG_FILE);
- fail("Event file " + LOG_FILE + " not complete - expected "
- + EXPECTED_RECORD_COUNT + " records - found " + temp.size()
- + ", test marked as failing");
- }
-
- Hashtable<String, String> theTable = Helpers.getMessageString(LOG_FILE);
- String theMessage = (String) theTable.get("Message1");
- assertEquals("The strings should match", JMS_MESSAGE, theMessage);
- assertTrue("Deleting logfile", logFile.delete()) ;
- }
-
- public void sendMessage() throws Exception
- {
- SendJMSMessage sm = new SendJMSMessage();
- sm.setupConnection();
- sm.sendAMessage(JMS_MESSAGE + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_START + FILE_NAME
- + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END) ;
- sm.stop();
- }
-
- public static Test suite() throws Exception
- {
- return getDeploySetup(ScriptingGroovyTest.class, "scripting-groovy-quickstart.esb");
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/ScriptingGroovyTest.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/ScriptingGroovyTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/ScriptingGroovyTest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/ScriptingGroovyTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,103 @@
+/*
+ * 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 java.io.File;
+import java.util.Hashtable;
+
+import junit.framework.Test;
+
+import org.jboss.soa.esb.actions.StoreMessageToFile;
+import org.jboss.soa.esb.samples.quickstart.scriptinggroovy.test.SendJMSMessage;
+import org.jboss.test.JBossTestCase;
+
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
+ */
+
+public class ScriptingGroovyTest
+ extends JBossTestCase
+{
+ private static final String JMS_MESSAGE = "ScriptingGroovyTest message";
+
+ private static final String FILE_NAME = "ScriptingGroovyTest.log";
+
+ private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME)
+ + FILE_NAME;
+
+ private static final int EXPECTED_RECORD_COUNT = 1;
+
+ public ScriptingGroovyTest(String name)
+ {
+ super(name);
+ }
+
+ public void testMessage() throws Exception
+ {
+ final File logFile = new File(LOG_FILE) ;
+ if (logFile.exists())
+ {
+ assertTrue("Deleting logfile", logFile.delete()) ;
+ }
+
+ sendMessage();
+
+ /* Verify that the message file is created */
+ boolean fileExists = Helpers.checkForFile(LOG_FILE);
+ if (!fileExists) {
+ fail("Event file " + LOG_FILE
+ + " not created - test marked as failing");
+ }
+
+ /* Verify that the message file is complete */
+ boolean fileComplete = Helpers.checkFileContent(LOG_FILE,
+ EXPECTED_RECORD_COUNT);
+ if (!fileComplete) {
+ Hashtable<String, String> temp = Helpers.getMessageString(LOG_FILE);
+ fail("Event file " + LOG_FILE + " not complete - expected "
+ + EXPECTED_RECORD_COUNT + " records - found " + temp.size()
+ + ", test marked as failing");
+ }
+
+ Hashtable<String, String> theTable = Helpers.getMessageString(LOG_FILE);
+ String theMessage = (String) theTable.get("Message1");
+ assertEquals("The strings should match", JMS_MESSAGE, theMessage);
+ assertTrue("Deleting logfile", logFile.delete()) ;
+ }
+
+ public void sendMessage() throws Exception
+ {
+ SendJMSMessage sm = new SendJMSMessage();
+ sm.setupConnection();
+ sm.sendAMessage(JMS_MESSAGE + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_START + FILE_NAME
+ + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END) ;
+ sm.stop();
+ }
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(ScriptingGroovyTest.class, "scripting-groovy-quickstart.esb");
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/SimpleCBRTest.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/SimpleCBRTest.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/SimpleCBRTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.quickstart.test;
-
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- */
-public class SimpleCBRTest
- extends JBossTestCase
-{
- public SimpleCBRTest(String name)
- {
- super(name);
- }
-
- public void testMessage() throws Exception
- {
- sendMessage();
- Thread.sleep(10000); // wait for message to post.
- }
-
- public void sendMessage() throws Exception
- {
- }
-
- public static Test suite() throws Exception
- {
- return getDeploySetup(SimpleCBRTest.class, "Quickstart_simple_cbr.esb");
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/SimpleCBRTest.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/SimpleCBRTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/SimpleCBRTest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/SimpleCBRTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -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.test.JBossTestCase;
+
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
+ */
+public class SimpleCBRTest
+ extends JBossTestCase
+{
+ public SimpleCBRTest(String name)
+ {
+ super(name);
+ }
+
+ public void testMessage() throws Exception
+ {
+ sendMessage();
+ Thread.sleep(10000); // wait for message to post.
+ }
+
+ public void sendMessage() throws Exception
+ {
+ }
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(SimpleCBRTest.class, "Quickstart_simple_cbr.esb");
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/StaticRouterTest.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/StaticRouterTest.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/StaticRouterTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.quickstart.test;
-
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- */
-public class StaticRouterTest
- extends JBossTestCase
-{
- public StaticRouterTest(String name)
- {
- super(name);
- }
-
- public void testMessage() throws Exception
- {
- sendMessage();
- Thread.sleep(10000); // wait for message to post.
- }
-
- public void sendMessage() throws Exception
- {
- }
-
- public static Test suite() throws Exception
- {
- return getDeploySetup(StaticRouterTest.class, "Quickstart_static_router.esb");
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/StaticRouterTest.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/StaticRouterTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/StaticRouterTest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/StaticRouterTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -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.test.JBossTestCase;
+
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
+ */
+public class StaticRouterTest
+ extends JBossTestCase
+{
+ public StaticRouterTest(String name)
+ {
+ super(name);
+ }
+
+ public void testMessage() throws Exception
+ {
+ sendMessage();
+ Thread.sleep(10000); // wait for message to post.
+ }
+
+ public void sendMessage() throws Exception
+ {
+ }
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(StaticRouterTest.class, "Quickstart_static_router.esb");
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformCSV2XMLTest.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformCSV2XMLTest.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformCSV2XMLTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,90 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.quickstart.test;
-
-import java.io.File;
-import java.io.InputStream;
-
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-import org.jboss.soa.esb.samples.quickstart.transformcsv2xml.SendJMSMessage;
-import org.jboss.soa.esb.testutils.FileUtil;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- */
-public class TransformCSV2XMLTest
- extends JBossTestCase {
- private static final String FILE_NAME = "transformedmessageCSV2XML.log";
- private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME)
- + FILE_NAME;
-
-
- public TransformCSV2XMLTest(String name)
- {
- super(name);
- }
-
- public void testMessage() throws Exception
- {
- final File logFile = new File(LOG_FILE) ;
- if (logFile.exists())
- {
- assertTrue("Deleting logfile", logFile.delete()) ;
- }
-
- sendMessage();
-
- /* Verify that the message file is created */
- boolean fileExists = Helpers.checkForFile(LOG_FILE);
- if (!fileExists) {
- fail("Event file " + LOG_FILE
- + " not created - test marked as failing");
- }
-
- // Make sure the file matches expected output
- final InputStream is = getClass().getClassLoader().getResourceAsStream(FILE_NAME) ;
- File target = new File(LOG_FILE);
- String targetString = FileUtil.readTextFile(target);
- String expectedString = FileUtil.readStream(is);
- final boolean match = Helpers.compareXMLContent(expectedString, targetString) ;
- assertTrue("Unexpected response: " + targetString, match) ;
-
- assertTrue("Deleting logfile", logFile.delete()) ;
- }
-
- public void sendMessage() throws Exception
- {
- SendJMSMessage sm = new SendJMSMessage();
- sm.setupConnection();
- sm.sendAMessage(Helpers.getQuickstartLocation("transform_CSV2XML/SampleOrder.csv"));
- sm.stop();
- }
-
- public static Test suite() throws Exception
- {
- return getDeploySetup(TransformCSV2XMLTest.class, "transformation-CSV2XML-quickstart.esb");
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformCSV2XMLTest.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformCSV2XMLTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformCSV2XMLTest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformCSV2XMLTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,90 @@
+/*
+ * 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 java.io.File;
+import java.io.InputStream;
+
+import junit.framework.Test;
+
+import org.jboss.test.JBossTestCase;
+import org.jboss.soa.esb.samples.quickstart.transformcsv2xml.SendJMSMessage;
+import org.jboss.soa.esb.testutils.FileUtil;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
+ */
+public class TransformCSV2XMLTest
+ extends JBossTestCase {
+ private static final String FILE_NAME = "transformedmessageCSV2XML.log";
+ private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME)
+ + FILE_NAME;
+
+
+ public TransformCSV2XMLTest(String name)
+ {
+ super(name);
+ }
+
+ public void testMessage() throws Exception
+ {
+ final File logFile = new File(LOG_FILE) ;
+ if (logFile.exists())
+ {
+ assertTrue("Deleting logfile", logFile.delete()) ;
+ }
+
+ sendMessage();
+
+ /* Verify that the message file is created */
+ boolean fileExists = Helpers.checkForFile(LOG_FILE);
+ if (!fileExists) {
+ fail("Event file " + LOG_FILE
+ + " not created - test marked as failing");
+ }
+
+ // Make sure the file matches expected output
+ final InputStream is = getClass().getClassLoader().getResourceAsStream(FILE_NAME) ;
+ File target = new File(LOG_FILE);
+ String targetString = FileUtil.readTextFile(target);
+ String expectedString = FileUtil.readStream(is);
+ final boolean match = Helpers.compareXMLContent(expectedString, targetString) ;
+ assertTrue("Unexpected response: " + targetString, match) ;
+
+ assertTrue("Deleting logfile", logFile.delete()) ;
+ }
+
+ public void sendMessage() throws Exception
+ {
+ SendJMSMessage sm = new SendJMSMessage();
+ sm.setupConnection();
+ sm.sendAMessage(Helpers.getQuickstartLocation("transform_CSV2XML/SampleOrder.csv"));
+ sm.stop();
+ }
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(TransformCSV2XMLTest.class, "transformation-CSV2XML-quickstart.esb");
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformDateManipulationTest.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformDateManipulationTest.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformDateManipulationTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,91 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.quickstart.test;
-
-import java.io.File;
-import java.io.InputStream;
-
-import junit.framework.Test;
-
-import org.jboss.soa.esb.samples.quickstart.transformxml2xmldatemanipulation.test.SendJMSMessage;
-import org.jboss.soa.esb.testutils.FileUtil;
-import org.jboss.test.JBossTestCase;
-
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- */
-public class TransformDateManipulationTest
- extends JBossTestCase
-{
- private static final String FILE_NAME = "transformedmessageDateManipulation.log";
- private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME)
- + FILE_NAME;
-
- public TransformDateManipulationTest(String name)
- {
- super(name);
- }
-
- public void testMessage() throws Exception
- {
- final File logFile = new File(LOG_FILE) ;
- if (logFile.exists())
- {
- assertTrue("Deleting logfile", logFile.delete()) ;
- }
-
- sendMessage();
-
- /* Verify that the message file is created */
- boolean fileExists = Helpers.checkForFile(LOG_FILE);
- if (!fileExists) {
- fail("Event file " + LOG_FILE
- + " not created - test marked as failing");
- }
-
- // Make sure the file matches expected output
- final InputStream is = getClass().getClassLoader().getResourceAsStream(FILE_NAME) ;
- File target = new File(LOG_FILE);
- String targetString = FileUtil.readTextFile(target);
- String expectedString = FileUtil.readStream(is);
- final boolean match = Helpers.compareXMLContent(expectedString, targetString) ;
- assertTrue("Unexpected response: " + targetString, match) ;
-
- assertTrue("Deleting logfile", logFile.delete()) ;
- }
-
- public void sendMessage() throws Exception
- {
- SendJMSMessage sm = new SendJMSMessage();
- sm.setupConnection();
- sm.sendAMessage(Helpers.getQuickstartLocation("transform_XML2XML_date_manipulation/SampleOrder.xml"));
- sm.stop();
- }
-
- public static Test suite() throws Exception
- {
- return getDeploySetup(TransformDateManipulationTest.class, "transformation-date-manipulation-quickstart.esb");
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformDateManipulationTest.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformDateManipulationTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformDateManipulationTest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformDateManipulationTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,91 @@
+/*
+ * 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 java.io.File;
+import java.io.InputStream;
+
+import junit.framework.Test;
+
+import org.jboss.soa.esb.samples.quickstart.transformxml2xmldatemanipulation.test.SendJMSMessage;
+import org.jboss.soa.esb.testutils.FileUtil;
+import org.jboss.test.JBossTestCase;
+
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
+ */
+public class TransformDateManipulationTest
+ extends JBossTestCase
+{
+ private static final String FILE_NAME = "transformedmessageDateManipulation.log";
+ private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME)
+ + FILE_NAME;
+
+ public TransformDateManipulationTest(String name)
+ {
+ super(name);
+ }
+
+ public void testMessage() throws Exception
+ {
+ final File logFile = new File(LOG_FILE) ;
+ if (logFile.exists())
+ {
+ assertTrue("Deleting logfile", logFile.delete()) ;
+ }
+
+ sendMessage();
+
+ /* Verify that the message file is created */
+ boolean fileExists = Helpers.checkForFile(LOG_FILE);
+ if (!fileExists) {
+ fail("Event file " + LOG_FILE
+ + " not created - test marked as failing");
+ }
+
+ // Make sure the file matches expected output
+ final InputStream is = getClass().getClassLoader().getResourceAsStream(FILE_NAME) ;
+ File target = new File(LOG_FILE);
+ String targetString = FileUtil.readTextFile(target);
+ String expectedString = FileUtil.readStream(is);
+ final boolean match = Helpers.compareXMLContent(expectedString, targetString) ;
+ assertTrue("Unexpected response: " + targetString, match) ;
+
+ assertTrue("Deleting logfile", logFile.delete()) ;
+ }
+
+ public void sendMessage() throws Exception
+ {
+ SendJMSMessage sm = new SendJMSMessage();
+ sm.setupConnection();
+ sm.sendAMessage(Helpers.getQuickstartLocation("transform_XML2XML_date_manipulation/SampleOrder.xml"));
+ sm.stop();
+ }
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(TransformDateManipulationTest.class, "transformation-date-manipulation-quickstart.esb");
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformEDI2XMLGroovyXSLTTest.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformEDI2XMLGroovyXSLTTest.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformEDI2XMLGroovyXSLTTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,92 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.quickstart.test;
-
-import java.io.File;
-import java.io.InputStream;
-
-import junit.framework.Test;
-
-import org.jboss.soa.esb.samples.quickstart.transformedi2xmlgroovyxslt.test.SendJMSMessage;
-import org.jboss.soa.esb.testutils.FileUtil;
-import org.jboss.test.JBossTestCase;
-
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- */
-public class TransformEDI2XMLGroovyXSLTTest
- extends JBossTestCase
-{
- private static final String FILE_NAME = "transformedmessageEDI2XMLGroovyXSL.log";
- private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME)
- + FILE_NAME;
-
-
- public TransformEDI2XMLGroovyXSLTTest(String name)
- {
- super(name);
- }
-
- public void testMessage() throws Exception
- {
- final File logFile = new File(LOG_FILE) ;
- if (logFile.exists())
- {
- assertTrue("Deleting logfile", logFile.delete()) ;
- }
-
- sendMessage();
-
- /* Verify that the message file is created */
- boolean fileExists = Helpers.checkForFile(LOG_FILE);
- if (!fileExists) {
- fail("Event file " + LOG_FILE
- + " not created - test marked as failing");
- }
-
- // Make sure the file matches expected output
- final InputStream is = getClass().getClassLoader().getResourceAsStream(FILE_NAME) ;
- File target = new File(LOG_FILE);
- String targetString = FileUtil.readTextFile(target);
- String expectedString = FileUtil.readStream(is);
- final boolean match = Helpers.compareXMLContent(expectedString, targetString) ;
- assertTrue("Unexpected response: " + targetString, match) ;
-
- assertTrue("Deleting logfile", logFile.delete()) ;
- }
-
- public void sendMessage() throws Exception
- {
- SendJMSMessage sm = new SendJMSMessage();
- sm.setupConnection();
- sm.sendAMessage(Helpers.getQuickstartLocation("transform_EDI2XML_Groovy_XSLT/SampleOrder.edi"));
- sm.stop();
- }
-
- public static Test suite() throws Exception
- {
- return getDeploySetup(TransformEDI2XMLGroovyXSLTTest.class, "transformation-edi2xml_groovy-quickstart.esb");
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformEDI2XMLGroovyXSLTTest.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformEDI2XMLGroovyXSLTTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformEDI2XMLGroovyXSLTTest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformEDI2XMLGroovyXSLTTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.soa.esb.quickstart.test;
+
+import java.io.File;
+import java.io.InputStream;
+
+import junit.framework.Test;
+
+import org.jboss.soa.esb.samples.quickstart.transformedi2xmlgroovyxslt.test.SendJMSMessage;
+import org.jboss.soa.esb.testutils.FileUtil;
+import org.jboss.test.JBossTestCase;
+
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
+ */
+public class TransformEDI2XMLGroovyXSLTTest
+ extends JBossTestCase
+{
+ private static final String FILE_NAME = "transformedmessageEDI2XMLGroovyXSL.log";
+ private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME)
+ + FILE_NAME;
+
+
+ public TransformEDI2XMLGroovyXSLTTest(String name)
+ {
+ super(name);
+ }
+
+ public void testMessage() throws Exception
+ {
+ final File logFile = new File(LOG_FILE) ;
+ if (logFile.exists())
+ {
+ assertTrue("Deleting logfile", logFile.delete()) ;
+ }
+
+ sendMessage();
+
+ /* Verify that the message file is created */
+ boolean fileExists = Helpers.checkForFile(LOG_FILE);
+ if (!fileExists) {
+ fail("Event file " + LOG_FILE
+ + " not created - test marked as failing");
+ }
+
+ // Make sure the file matches expected output
+ final InputStream is = getClass().getClassLoader().getResourceAsStream(FILE_NAME) ;
+ File target = new File(LOG_FILE);
+ String targetString = FileUtil.readTextFile(target);
+ String expectedString = FileUtil.readStream(is);
+ final boolean match = Helpers.compareXMLContent(expectedString, targetString) ;
+ assertTrue("Unexpected response: " + targetString, match) ;
+
+ assertTrue("Deleting logfile", logFile.delete()) ;
+ }
+
+ public void sendMessage() throws Exception
+ {
+ SendJMSMessage sm = new SendJMSMessage();
+ sm.setupConnection();
+ sm.sendAMessage(Helpers.getQuickstartLocation("transform_EDI2XML_Groovy_XSLT/SampleOrder.edi"));
+ sm.stop();
+ }
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(TransformEDI2XMLGroovyXSLTTest.class, "transformation-edi2xml_groovy-quickstart.esb");
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformXML2PojoTest.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformXML2PojoTest.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformXML2PojoTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,73 +0,0 @@
-package org.jboss.soa.esb.quickstart.test;
-
-import java.io.File;
-import java.io.InputStream;
-
-import junit.framework.Test;
-
-import org.jboss.soa.esb.samples.quickstart.transformxml2pojo.test.SendJMSMessage;
-import org.jboss.soa.esb.testutils.FileUtil;
-import org.jboss.test.JBossTestCase;
-
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- */
-public class TransformXML2PojoTest
- extends JBossTestCase
-{
- private static final String FILE_NAME = "transformedmessageXML2POJO.log";
- private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME)
- + FILE_NAME;
-
-
- public TransformXML2PojoTest(String name)
- {
- super(name);
- }
-
- public void testMessage() throws Exception
- {
- final File logFile = new File(LOG_FILE) ;
- if (logFile.exists())
- {
- assertTrue("Deleting logfile", logFile.delete()) ;
- }
-
- sendMessage();
-
- /* Verify that the message file is created */
- boolean fileExists = Helpers.checkForFile(LOG_FILE);
- if (!fileExists) {
- fail("Event file " + LOG_FILE
- + " not created - test marked as failing");
- }
-
- // Make sure the file matches expected output
- final InputStream is = getClass().getClassLoader().getResourceAsStream(FILE_NAME) ;
- File target = new File(LOG_FILE);
- String targetString = FileUtil.readTextFile(target);
- String expectedString = FileUtil.readStream(is);
- final boolean match = Helpers.compareXMLContent(expectedString, targetString) ;
- assertTrue("Unexpected response: " + targetString, match) ;
-
- assertTrue("Deleting logfile", logFile.delete()) ;
- }
-
- public void sendMessage() throws Exception
- {
- SendJMSMessage sm = new SendJMSMessage();
- sm.setupConnection();
- String fileContent = sm.readAsciiFile(Helpers.getQuickstartLocation("transform_XML2POJO/SampleOrder.xml"));
- System.out.println("FILECONTENT[" + fileContent + "]");
- sm.sendAMessage(fileContent);
- sm.stop();
- }
-
- public static Test suite() throws Exception
- {
- return getDeploySetup(TransformXML2PojoTest.class, "transformation-pojo-quickstart.esb");
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformXML2PojoTest.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformXML2PojoTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformXML2PojoTest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformXML2PojoTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,73 @@
+package org.jboss.soa.esb.quickstart.test;
+
+import java.io.File;
+import java.io.InputStream;
+
+import junit.framework.Test;
+
+import org.jboss.soa.esb.samples.quickstart.transformxml2pojo.test.SendJMSMessage;
+import org.jboss.soa.esb.testutils.FileUtil;
+import org.jboss.test.JBossTestCase;
+
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
+ */
+public class TransformXML2PojoTest
+ extends JBossTestCase
+{
+ private static final String FILE_NAME = "transformedmessageXML2POJO.log";
+ private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME)
+ + FILE_NAME;
+
+
+ public TransformXML2PojoTest(String name)
+ {
+ super(name);
+ }
+
+ public void testMessage() throws Exception
+ {
+ final File logFile = new File(LOG_FILE) ;
+ if (logFile.exists())
+ {
+ assertTrue("Deleting logfile", logFile.delete()) ;
+ }
+
+ sendMessage();
+
+ /* Verify that the message file is created */
+ boolean fileExists = Helpers.checkForFile(LOG_FILE);
+ if (!fileExists) {
+ fail("Event file " + LOG_FILE
+ + " not created - test marked as failing");
+ }
+
+ // Make sure the file matches expected output
+ final InputStream is = getClass().getClassLoader().getResourceAsStream(FILE_NAME) ;
+ File target = new File(LOG_FILE);
+ String targetString = FileUtil.readTextFile(target);
+ String expectedString = FileUtil.readStream(is);
+ final boolean match = Helpers.compareXMLContent(expectedString, targetString) ;
+ assertTrue("Unexpected response: " + targetString, match) ;
+
+ assertTrue("Deleting logfile", logFile.delete()) ;
+ }
+
+ public void sendMessage() throws Exception
+ {
+ SendJMSMessage sm = new SendJMSMessage();
+ sm.setupConnection();
+ String fileContent = sm.readAsciiFile(Helpers.getQuickstartLocation("transform_XML2POJO/SampleOrder.xml"));
+ System.out.println("FILECONTENT[" + fileContent + "]");
+ sm.sendAMessage(fileContent);
+ sm.stop();
+ }
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(TransformXML2PojoTest.class, "transformation-pojo-quickstart.esb");
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformXMLSimpleTest.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformXMLSimpleTest.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformXMLSimpleTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,90 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.quickstart.test;
-
-import java.io.File;
-import java.io.InputStream;
-
-import junit.framework.Test;
-
-import org.jboss.soa.esb.testutils.FileUtil;
-import org.jboss.test.JBossTestCase;
-import org.jboss.soa.esb.samples.quickstart.transformxml2xmlsimple.test.SendJMSMessage;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- */
-public class TransformXMLSimpleTest
- extends JBossTestCase
-{
- private static final String FILE_NAME = "transformedmessageXML2Simple.log";
- private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME)
- + FILE_NAME;
-
- public TransformXMLSimpleTest(String name)
- {
- super(name);
- }
-
- public void testMessage() throws Exception
- {
- final File logFile = new File(LOG_FILE) ;
- if (logFile.exists())
- {
- assertTrue("Deleting logfile", logFile.delete()) ;
- }
-
- sendMessage();
-
- /* Verify that the message file is created */
- boolean fileExists = Helpers.checkForFile(LOG_FILE);
- if (!fileExists) {
- fail("Event file " + LOG_FILE
- + " not created - test marked as failing");
- }
-
- // Make sure the file matches expected output
- final InputStream is = getClass().getClassLoader().getResourceAsStream(FILE_NAME) ;
- File target = new File(LOG_FILE);
- String targetString = FileUtil.readTextFile(target);
- String expectedString = FileUtil.readStream(is);
- final boolean match = Helpers.compareXMLContent(expectedString, targetString) ;
- assertTrue("Unexpected response: " + targetString, match) ;
-
- assertTrue("Deleting logfile", logFile.delete()) ;
- }
-
- public void sendMessage() throws Exception
- {
- SendJMSMessage sm = new SendJMSMessage();
- sm.setupConnection();
- sm.sendAMessage(Helpers.getQuickstartLocation("transform_XML2XML_simple/SampleOrder.xml"));
- sm.stop();
- }
-
- public static Test suite() throws Exception
- {
- return getDeploySetup(TransformXMLSimpleTest.class, "transformation-simple-quickstart.esb");
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformXMLSimpleTest.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformXMLSimpleTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformXMLSimpleTest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/TransformXMLSimpleTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,90 @@
+/*
+ * 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 java.io.File;
+import java.io.InputStream;
+
+import junit.framework.Test;
+
+import org.jboss.soa.esb.testutils.FileUtil;
+import org.jboss.test.JBossTestCase;
+import org.jboss.soa.esb.samples.quickstart.transformxml2xmlsimple.test.SendJMSMessage;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
+ */
+public class TransformXMLSimpleTest
+ extends JBossTestCase
+{
+ private static final String FILE_NAME = "transformedmessageXML2Simple.log";
+ private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME)
+ + FILE_NAME;
+
+ public TransformXMLSimpleTest(String name)
+ {
+ super(name);
+ }
+
+ public void testMessage() throws Exception
+ {
+ final File logFile = new File(LOG_FILE) ;
+ if (logFile.exists())
+ {
+ assertTrue("Deleting logfile", logFile.delete()) ;
+ }
+
+ sendMessage();
+
+ /* Verify that the message file is created */
+ boolean fileExists = Helpers.checkForFile(LOG_FILE);
+ if (!fileExists) {
+ fail("Event file " + LOG_FILE
+ + " not created - test marked as failing");
+ }
+
+ // Make sure the file matches expected output
+ final InputStream is = getClass().getClassLoader().getResourceAsStream(FILE_NAME) ;
+ File target = new File(LOG_FILE);
+ String targetString = FileUtil.readTextFile(target);
+ String expectedString = FileUtil.readStream(is);
+ final boolean match = Helpers.compareXMLContent(expectedString, targetString) ;
+ assertTrue("Unexpected response: " + targetString, match) ;
+
+ assertTrue("Deleting logfile", logFile.delete()) ;
+ }
+
+ public void sendMessage() throws Exception
+ {
+ SendJMSMessage sm = new SendJMSMessage();
+ sm.setupConnection();
+ sm.sendAMessage(Helpers.getQuickstartLocation("transform_XML2XML_simple/SampleOrder.xml"));
+ sm.stop();
+ }
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(TransformXMLSimpleTest.class, "transformation-simple-quickstart.esb");
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceAdapterTest.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceAdapterTest.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceAdapterTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.quickstart.test;
-
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- */
-public class WebserviceAdapterTest
- extends JBossTestCase
-{
- public WebserviceAdapterTest(String name)
- {
- super(name);
- }
-
- public void testMessage() throws Exception
- {
- sendMessage();
- Thread.sleep(10000); // wait for message to post.
- }
-
- public void sendMessage() throws Exception
- {
- }
-
- public static Test suite() throws Exception
- {
- return getDeploySetup(WebserviceAdapterTest.class, "transformation-simple-quickstart.esb");
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceAdapterTest.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceAdapterTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceAdapterTest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceAdapterTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -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.test.JBossTestCase;
+
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
+ */
+public class WebserviceAdapterTest
+ extends JBossTestCase
+{
+ public WebserviceAdapterTest(String name)
+ {
+ super(name);
+ }
+
+ public void testMessage() throws Exception
+ {
+ sendMessage();
+ Thread.sleep(10000); // wait for message to post.
+ }
+
+ public void sendMessage() throws Exception
+ {
+ }
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(WebserviceAdapterTest.class, "transformation-simple-quickstart.esb");
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceBPELTest.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceBPELTest.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceBPELTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.quickstart.test;
-
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- */
-public class WebserviceBPELTest
- extends JBossTestCase
-{
- public WebserviceBPELTest(String name)
- {
- super(name);
- }
-
- public void testMessage() throws Exception
- {
- sendMessage();
- Thread.sleep(10000); // wait for message to post.
- }
-
- public void sendMessage() throws Exception
- {
- }
-
- public static Test suite() throws Exception
- {
- return getDeploySetup(WebserviceBPELTest.class, "transformation-simple-quickstart.esb");
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceBPELTest.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceBPELTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceBPELTest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WebserviceBPELTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -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.test.JBossTestCase;
+
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
+ */
+public class WebserviceBPELTest
+ extends JBossTestCase
+{
+ public WebserviceBPELTest(String name)
+ {
+ super(name);
+ }
+
+ public void testMessage() throws Exception
+ {
+ sendMessage();
+ Thread.sleep(10000); // wait for message to post.
+ }
+
+ public void sendMessage() throws Exception
+ {
+ }
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(WebserviceBPELTest.class, "transformation-simple-quickstart.esb");
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WiretapTest.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WiretapTest.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WiretapTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,95 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.quickstart.test;
-
-import java.io.File;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-
-import org.jboss.soa.esb.actions.StoreMessageToFile;
-import org.jboss.soa.esb.samples.quickstart.wiretap.test.SendStaticRouterJMSMessage;
-import org.jboss.test.JBossTestCase;
-
-/**
- * Sample client for the jboss container.
- *
- * @author <a href="mailto:"></a>
- * @version $Id: $
- */
-
-public class WiretapTest extends JBossTestCase {
- private static final String JMS_MESSAGE = "Wiretap Message";
- private static final String FILE_NAME = "Wiretap.log";
- private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME) + FILE_NAME;
- private static final int EXPECTED_RECORD_COUNT = 2;
-
- public WiretapTest(String name) {
- super(name);
- } /* method */
-
- public void testStaticRouterMessage() throws Exception {
- final File logFile = new File(LOG_FILE) ;
- if (logFile.exists())
- {
- assertTrue("Deleting logfile", logFile.delete()) ;
- }
-
- sendStaticRouterJMSMessage();
-
- /* Verify that the message file is created */
- boolean fileExists = Helpers.checkForFile(LOG_FILE);
- if (!fileExists) {
- fail ("Event file " + LOG_FILE + " not created - test marked as failing");
- }
-
- /* Verify that the message file is complete */
- boolean fileComplete = Helpers.checkFileContent(LOG_FILE, EXPECTED_RECORD_COUNT);
- if (!fileComplete) {
- Hashtable<String, String> temp = Helpers.getMessageString(LOG_FILE);
- fail ("Event file " + LOG_FILE + " not complete - expected " + EXPECTED_RECORD_COUNT
- + " records - found " + temp.size() + ", test marked as failing");
- }
-
- Hashtable<String, String> theTable = Helpers.getMessageString(LOG_FILE);
-
- String theMessage1 = (String) theTable.get("Message1");
- String theMessage2 = (String) theTable.get("Message2");
-
- assertEquals("The strings1 should match", theMessage1, JMS_MESSAGE);
- assertEquals("The strings2 should match", theMessage2, JMS_MESSAGE);
-
- assertTrue("Deleting logfile", logFile.delete()) ;
- } /* method */
-
- public void sendStaticRouterJMSMessage() throws Exception {
- SendStaticRouterJMSMessage sm = new SendStaticRouterJMSMessage();
- sm.setupConnection();
- sm.sendAMessage(JMS_MESSAGE + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_START + FILE_NAME + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END);
- sm.stop();
- } /* method */
-
- public static Test suite() throws Exception {
- return getDeploySetup(WiretapTest.class, "Quickstart_wiretap.esb");
- } /* method */
-
-} /* class */
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WiretapTest.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WiretapTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WiretapTest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/WiretapTest.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,95 @@
+/*
+ * 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 java.io.File;
+import java.util.Hashtable;
+
+import junit.framework.Test;
+
+import org.jboss.soa.esb.actions.StoreMessageToFile;
+import org.jboss.soa.esb.samples.quickstart.wiretap.test.SendStaticRouterJMSMessage;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * Sample client for the jboss container.
+ *
+ * @author <a href="mailto:"></a>
+ * @version $Id: $
+ */
+
+public class WiretapTest extends JBossTestCase {
+ private static final String JMS_MESSAGE = "Wiretap Message";
+ private static final String FILE_NAME = "Wiretap.log";
+ private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME) + FILE_NAME;
+ private static final int EXPECTED_RECORD_COUNT = 2;
+
+ public WiretapTest(String name) {
+ super(name);
+ } /* method */
+
+ public void testStaticRouterMessage() throws Exception {
+ final File logFile = new File(LOG_FILE) ;
+ if (logFile.exists())
+ {
+ assertTrue("Deleting logfile", logFile.delete()) ;
+ }
+
+ sendStaticRouterJMSMessage();
+
+ /* Verify that the message file is created */
+ boolean fileExists = Helpers.checkForFile(LOG_FILE);
+ if (!fileExists) {
+ fail ("Event file " + LOG_FILE + " not created - test marked as failing");
+ }
+
+ /* Verify that the message file is complete */
+ boolean fileComplete = Helpers.checkFileContent(LOG_FILE, EXPECTED_RECORD_COUNT);
+ if (!fileComplete) {
+ Hashtable<String, String> temp = Helpers.getMessageString(LOG_FILE);
+ fail ("Event file " + LOG_FILE + " not complete - expected " + EXPECTED_RECORD_COUNT
+ + " records - found " + temp.size() + ", test marked as failing");
+ }
+
+ Hashtable<String, String> theTable = Helpers.getMessageString(LOG_FILE);
+
+ String theMessage1 = (String) theTable.get("Message1");
+ String theMessage2 = (String) theTable.get("Message2");
+
+ assertEquals("The strings1 should match", theMessage1, JMS_MESSAGE);
+ assertEquals("The strings2 should match", theMessage2, JMS_MESSAGE);
+
+ assertTrue("Deleting logfile", logFile.delete()) ;
+ } /* method */
+
+ public void sendStaticRouterJMSMessage() throws Exception {
+ SendStaticRouterJMSMessage sm = new SendStaticRouterJMSMessage();
+ sm.setupConnection();
+ sm.sendAMessage(JMS_MESSAGE + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_START + FILE_NAME + StoreMessageToFile.MESSAGE_CONTENT_FILENAME_END);
+ sm.stop();
+ } /* method */
+
+ public static Test suite() throws Exception {
+ return getDeploySetup(WiretapTest.class, "Quickstart_wiretap.esb");
+ } /* method */
+
+} /* class */
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util)
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Element.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Element.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Element.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,138 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.quickstart.test.util;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import javax.xml.namespace.QName;
-
-import org.xml.sax.Attributes;
-
-/**
- * Simple class representing an element.
- * This is used to compare XML documents.
- *
- * @author Kevin Conner
- */
-public class Element implements Node
-{
- /**
- * The QName comparator.
- */
- private static final Comparator<QName> QNAME_COMPARATOR = new QNameComparator() ;
-
- /**
- * The name of the element.
- */
- private final QName name ;
- /**
- * Associated attributes.
- */
- private final Map<QName, String> attributes = new TreeMap<QName, String>(QNAME_COMPARATOR) ;
- /**
- * Children.
- */
- private final List<Node> children = new ArrayList<Node>() ;
-
- /**
- * Construct the element.
- * @param namespaceURI The namespace for the element.
- * @param localName The local name of the element.
- * @param attributes The associated attributes.
- */
- Element(final String namespaceURI, final String localName, final Attributes attributes)
- {
- name = new QName(namespaceURI, localName) ;
- final int numAttributes = attributes.getLength() ;
- for(int count = 0 ; count < numAttributes ; count++)
- {
- final String attrNamespaceURI = attributes.getURI(count) ;
- final String attrLocalName = attributes.getLocalName(count) ;
- final String attrValue = attributes.getValue(count) ;
-
- this.attributes.put(new QName(attrNamespaceURI, attrLocalName), attrValue) ;
- }
- }
-
- /**
- * Add a child node.
- * @param child The child node.
- */
- void addChild(final Node child)
- {
- children.add(child) ;
- }
-
- /**
- * Check for equality.
- * @param obj the object to test against.
- */
- @Override
- public boolean equals(final Object obj)
- {
- if (obj == null)
- {
- return false ;
- }
-
- if (obj == this)
- {
- return true ;
- }
-
- if (obj instanceof Element)
- {
- final Element rhs = (Element)obj ;
- return (name.equals(rhs.name) && attributes.equals(rhs.attributes) &&
- children.equals(rhs.children)) ;
- }
-
- return false ;
- }
-
- /**
- * The QName comparator class.
- * @author kevin
- */
- private static final class QNameComparator implements Comparator<QName>
- {
- /**
- * Compare the QNames.
- * @param name1 The first QName.
- * @param name2 The second QName.
- * @return
- */
- public int compare(final QName name1, final QName name2)
- {
- final int uriComparator = name1.getNamespaceURI().compareTo(name2.getNamespaceURI()) ;
- if (uriComparator != 0)
- {
- return uriComparator ;
- }
- return name1.getLocalPart().compareTo(name2.getLocalPart());
- }
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Element.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Element.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Element.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Element.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,138 @@
+/*
+ * 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.util;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import javax.xml.namespace.QName;
+
+import org.xml.sax.Attributes;
+
+/**
+ * Simple class representing an element.
+ * This is used to compare XML documents.
+ *
+ * @author Kevin Conner
+ */
+public class Element implements Node
+{
+ /**
+ * The QName comparator.
+ */
+ private static final Comparator<QName> QNAME_COMPARATOR = new QNameComparator() ;
+
+ /**
+ * The name of the element.
+ */
+ private final QName name ;
+ /**
+ * Associated attributes.
+ */
+ private final Map<QName, String> attributes = new TreeMap<QName, String>(QNAME_COMPARATOR) ;
+ /**
+ * Children.
+ */
+ private final List<Node> children = new ArrayList<Node>() ;
+
+ /**
+ * Construct the element.
+ * @param namespaceURI The namespace for the element.
+ * @param localName The local name of the element.
+ * @param attributes The associated attributes.
+ */
+ Element(final String namespaceURI, final String localName, final Attributes attributes)
+ {
+ name = new QName(namespaceURI, localName) ;
+ final int numAttributes = attributes.getLength() ;
+ for(int count = 0 ; count < numAttributes ; count++)
+ {
+ final String attrNamespaceURI = attributes.getURI(count) ;
+ final String attrLocalName = attributes.getLocalName(count) ;
+ final String attrValue = attributes.getValue(count) ;
+
+ this.attributes.put(new QName(attrNamespaceURI, attrLocalName), attrValue) ;
+ }
+ }
+
+ /**
+ * Add a child node.
+ * @param child The child node.
+ */
+ void addChild(final Node child)
+ {
+ children.add(child) ;
+ }
+
+ /**
+ * Check for equality.
+ * @param obj the object to test against.
+ */
+ @Override
+ public boolean equals(final Object obj)
+ {
+ if (obj == null)
+ {
+ return false ;
+ }
+
+ if (obj == this)
+ {
+ return true ;
+ }
+
+ if (obj instanceof Element)
+ {
+ final Element rhs = (Element)obj ;
+ return (name.equals(rhs.name) && attributes.equals(rhs.attributes) &&
+ children.equals(rhs.children)) ;
+ }
+
+ return false ;
+ }
+
+ /**
+ * The QName comparator class.
+ * @author kevin
+ */
+ private static final class QNameComparator implements Comparator<QName>
+ {
+ /**
+ * Compare the QNames.
+ * @param name1 The first QName.
+ * @param name2 The second QName.
+ * @return
+ */
+ public int compare(final QName name1, final QName name2)
+ {
+ final int uriComparator = name1.getNamespaceURI().compareTo(name2.getNamespaceURI()) ;
+ if (uriComparator != 0)
+ {
+ return uriComparator ;
+ }
+ return name1.getLocalPart().compareTo(name2.getLocalPart());
+ }
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/IdentitySAXHandler.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/IdentitySAXHandler.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/IdentitySAXHandler.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,138 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.quickstart.test.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * Simple SAX parser creating an identity document for the incoming XML.
- * Any leading and trailing whitespace is ignored in the document as are
- * namespace prefixes.
- *
- * @author Kevin Conner
- */
-public class IdentitySAXHandler extends DefaultHandler
-{
- /**
- * The root element.
- */
- private Element rootElement ;
- /**
- * The current element.
- */
- private Element currentElement ;
- /**
- * The stack of working elements.
- */
- private List<Element> stack = new ArrayList<Element>() ;
- /**
- * The current text value.
- */
- private StringBuilder currentText = new StringBuilder() ;
-
- @Override
- public void startElement(final String uri, final String localName,
- final String name, final Attributes attributes)
- throws SAXException
- {
- checkText() ;
-
- final Element element = new Element(uri, localName, attributes) ;
- if (rootElement == null)
- {
- rootElement = element ;
- }
-
- if (currentElement != null)
- {
- currentElement.addChild(element) ;
- stack.add(currentElement) ;
- }
- currentElement = element ;
- }
-
- @Override
- public void endElement(final String uri, final String localName,
- final String name)
- throws SAXException
- {
- checkText() ;
-
- final int lastIndex = (stack.size() - 1) ;
- if (lastIndex < 0)
- {
- currentElement = null ;
- }
- else
- {
- currentElement = stack.remove(lastIndex) ;
- }
- }
-
- @Override
- public void characters(final char[] ch, final int start, final int length)
- throws SAXException
- {
- currentText.append(ch, start, length) ;
- }
-
- private void checkText()
- {
- final int textLength = currentText.length() ;
- if (textLength > 0)
- {
- int start = 0 ;
- while((start < textLength) && isXMLWhitespace(currentText.charAt(start)))
- {
- start++ ;
- }
-
- int end = textLength-1 ;
- while((end >= start) && isXMLWhitespace(currentText.charAt(end)))
- {
- end-- ;
- }
-
- if (start <= end)
- {
- currentElement.addChild(new Text(currentText.substring(start, end+1))) ;
- }
- currentText.setLength(0) ;
- currentText.trimToSize() ;
- }
- }
-
- private boolean isXMLWhitespace(final char ch)
- {
- return ((ch == ' ') || (ch == '\t') || (ch == '\r') || (ch == '\n')) ;
- }
-
- public Element getRootElement()
- {
- return rootElement ;
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/IdentitySAXHandler.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/IdentitySAXHandler.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/IdentitySAXHandler.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/IdentitySAXHandler.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,138 @@
+/*
+ * 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.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+/**
+ * Simple SAX parser creating an identity document for the incoming XML.
+ * Any leading and trailing whitespace is ignored in the document as are
+ * namespace prefixes.
+ *
+ * @author Kevin Conner
+ */
+public class IdentitySAXHandler extends DefaultHandler
+{
+ /**
+ * The root element.
+ */
+ private Element rootElement ;
+ /**
+ * The current element.
+ */
+ private Element currentElement ;
+ /**
+ * The stack of working elements.
+ */
+ private List<Element> stack = new ArrayList<Element>() ;
+ /**
+ * The current text value.
+ */
+ private StringBuilder currentText = new StringBuilder() ;
+
+ @Override
+ public void startElement(final String uri, final String localName,
+ final String name, final Attributes attributes)
+ throws SAXException
+ {
+ checkText() ;
+
+ final Element element = new Element(uri, localName, attributes) ;
+ if (rootElement == null)
+ {
+ rootElement = element ;
+ }
+
+ if (currentElement != null)
+ {
+ currentElement.addChild(element) ;
+ stack.add(currentElement) ;
+ }
+ currentElement = element ;
+ }
+
+ @Override
+ public void endElement(final String uri, final String localName,
+ final String name)
+ throws SAXException
+ {
+ checkText() ;
+
+ final int lastIndex = (stack.size() - 1) ;
+ if (lastIndex < 0)
+ {
+ currentElement = null ;
+ }
+ else
+ {
+ currentElement = stack.remove(lastIndex) ;
+ }
+ }
+
+ @Override
+ public void characters(final char[] ch, final int start, final int length)
+ throws SAXException
+ {
+ currentText.append(ch, start, length) ;
+ }
+
+ private void checkText()
+ {
+ final int textLength = currentText.length() ;
+ if (textLength > 0)
+ {
+ int start = 0 ;
+ while((start < textLength) && isXMLWhitespace(currentText.charAt(start)))
+ {
+ start++ ;
+ }
+
+ int end = textLength-1 ;
+ while((end >= start) && isXMLWhitespace(currentText.charAt(end)))
+ {
+ end-- ;
+ }
+
+ if (start <= end)
+ {
+ currentElement.addChild(new Text(currentText.substring(start, end+1))) ;
+ }
+ currentText.setLength(0) ;
+ currentText.trimToSize() ;
+ }
+ }
+
+ private boolean isXMLWhitespace(final char ch)
+ {
+ return ((ch == ' ') || (ch == '\t') || (ch == '\r') || (ch == '\n')) ;
+ }
+
+ public Element getRootElement()
+ {
+ return rootElement ;
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Node.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Node.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Node.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.quickstart.test.util;
-
-/**
- * Simple Node tagging XML nodes.
- *
- * @author Kevin Conner
- */
-public interface Node
-{
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Node.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Node.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Node.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Node.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,31 @@
+/*
+ * 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.util;
+
+/**
+ * Simple Node tagging XML nodes.
+ *
+ * @author Kevin Conner
+ */
+public interface Node
+{
+}
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Text.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Text.java 2007-10-12 07:34:50 UTC (rev 15793)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Text.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -1,72 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.quickstart.test.util;
-
-
-/**
- * Simple class representing a text element.
- * This is used to compare XML documents.
- *
- * @author Kevin Conner
- */
-public class Text implements Node
-{
- /**
- * The text content.
- */
- private final String text ;
-
- /**
- * Construct the text element.
- * @param text The text value.
- */
- Text(final String text)
- {
- this.text = text ;
- }
-
- /**
- * Check for equality.
- * @param obj the object to test against.
- */
- @Override
- public boolean equals(final Object obj)
- {
- if (obj == null)
- {
- return false ;
- }
-
- if (obj == this)
- {
- return true ;
- }
-
- if (obj instanceof Text)
- {
- final Text rhs = (Text)obj ;
- return (text.equals(rhs.text)) ;
- }
-
- return false ;
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Text.java (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Text.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Text.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/util/Text.java 2007-10-12 08:05:28 UTC (rev 15795)
@@ -0,0 +1,72 @@
+/*
+ * 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.util;
+
+
+/**
+ * Simple class representing a text element.
+ * This is used to compare XML documents.
+ *
+ * @author Kevin Conner
+ */
+public class Text implements Node
+{
+ /**
+ * The text content.
+ */
+ private final String text ;
+
+ /**
+ * Construct the text element.
+ * @param text The text value.
+ */
+ Text(final String text)
+ {
+ this.text = text ;
+ }
+
+ /**
+ * Check for equality.
+ * @param obj the object to test against.
+ */
+ @Override
+ public boolean equals(final Object obj)
+ {
+ if (obj == null)
+ {
+ return false ;
+ }
+
+ if (obj == this)
+ {
+ return true ;
+ }
+
+ if (obj instanceof Text)
+ {
+ final Text rhs = (Text)obj ;
+ return (text.equals(rhs.text)) ;
+ }
+
+ return false ;
+ }
+}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/qa/quickstarts/src/org/jboss/soa/esb/server (from rev 15793, labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/server)
More information about the jboss-svn-commits
mailing list