Author: objectiser Date: 2009-10-20 11:12:05 -0400 (Tue, 20 Oct 2009) New Revision: 195 Modified: trunk/integration-tests/src/test/resources/deployment.properties trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world/messages/hello_response1.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp1.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_correlation/messages/goodbye_response1.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_correlation/messages/hello_response1.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_invoke/messages/hello_response1.xml trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/DatabaseInitializer.java Log: Updated expected results so all tests now pass with hsql. Modified: trunk/integration-tests/src/test/resources/deployment.properties =================================================================== --- trunk/integration-tests/src/test/resources/deployment.properties 2009-10-20 14:14:47 UTC (rev 194) +++ trunk/integration-tests/src/test/resources/deployment.properties 2009-10-20 15:12:05 UTC (rev 195) @@ -17,3 +17,8 @@ # The directory for JBossESB home # (e.g. /var/local/jbossesb-4.6.GA) org.jboss.esb.home=/home/gbrown/NotBackedUp/testing/riftsawIT/jbossesb-4.6.GA + +# database +# (e.g. hsql derby mysql) +database=hsql + Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world/messages/hello_response1.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world/messages/hello_response1.xml 2009-10-20 14:14:47 UTC (rev 194) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world/messages/hello_response1.xml 2009-10-20 15:12:05 UTC (rev 195) @@ -1 +1,3 @@ -<?xml version='1.0' encoding='UTF-8'?><soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">&l... xmlns:odens="http://www.jboss.org/bpel/examples/wsdl"><Te... xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl">Hello World</TestPart></odens:helloResponse></soapenv:Body></soapenv:Envelope> \ No newline at end of file +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:... xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:wsdl='http://www.jboss.org/bpel/examples/wsdl'> + <TestPart>Hello World</TestPart> + </wsdl:hello></env:Body></env:Envelope> \ No newline at end of file Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp1.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp1.xml 2009-10-20 14:14:47 UTC (rev 194) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp1.xml 2009-10-20 15:12:05 UTC (rev 195) @@ -1 +1 @@ -<?xml version='1.0' encoding='UTF-8'?><soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">&l... xmlns:odens="http://example.com/loan-approval/wsdl/"><acc... \ No newline at end of file +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:... \ No newline at end of file Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_correlation/messages/goodbye_response1.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_correlation/messages/goodbye_response1.xml 2009-10-20 14:14:47 UTC (rev 194) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_correlation/messages/goodbye_response1.xml 2009-10-20 15:12:05 UTC (rev 195) @@ -1,3 +1,6 @@ -<?xml version='1.0' encoding='UTF-8'?><soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">&l... xmlns:odens="http://www.jboss.org/bpel/examples/wsdl"><ID xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:... xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:wsdl='http://www.jboss.org/bpel/examples/wsdl'> + <ID> <id>1</id> - </ID><Message xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl">Goodbye World</Message></odens:goodbyeResponse></soapenv:Body></soapenv:Envelope> \ No newline at end of file + </ID> + <Message>Goodbye World</Message> + </wsdl:goodbye></env:Body></env:Envelope> \ No newline at end of file Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_correlation/messages/hello_response1.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_correlation/messages/hello_response1.xml 2009-10-20 14:14:47 UTC (rev 194) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_correlation/messages/hello_response1.xml 2009-10-20 15:12:05 UTC (rev 195) @@ -1,3 +1,6 @@ -<?xml version='1.0' encoding='UTF-8'?><soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">&l... xmlns:odens="http://www.jboss.org/bpel/examples/wsdl"><ID xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:... xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:wsdl='http://www.jboss.org/bpel/examples/wsdl'> + <ID> <id>1</id> - </ID><Message xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl">Hello World</Message></odens:helloResponse></soapenv:Body></soapenv:Envelope> \ No newline at end of file + </ID> + <Message>Hello World</Message> + </wsdl:hello></env:Body></env:Envelope> \ No newline at end of file Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_invoke/messages/hello_response1.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_invoke/messages/hello_response1.xml 2009-10-20 14:14:47 UTC (rev 194) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_invoke/messages/hello_response1.xml 2009-10-20 15:12:05 UTC (rev 195) @@ -1 +1,3 @@ -<?xml version='1.0' encoding='UTF-8'?><soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">&l... xmlns:odens="http://www.jboss.org/bpel/examples/wsdl"><To... xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl">Hello ME. Sincerely, JBossWS and BPEL</ToWhom></odens:sayHelloToResponse></soapenv:Body></soapenv:Envelope> \ No newline at end of file +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:... xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:wsdl='http://www.jboss.org/bpel/examples/wsdl'> + <ToWhom>Hello ME. Sincerely, JBossWS and BPEL</ToWhom> + </wsdl:sayHelloTo></env:Body></env:Envelope> \ No newline at end of file Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/DatabaseInitializer.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/DatabaseInitializer.java 2009-10-20 14:14:47 UTC (rev 194) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/DatabaseInitializer.java 2009-10-20 15:12:05 UTC (rev 195) @@ -135,11 +135,11 @@ tx = (UserTransaction)new InitialContext().lookup("UserTransaction"); tx.begin(); - log.info("Execute SQL from resource: "+resource); + log.debug("Execute SQL from resource: "+resource); URL url = Thread.currentThread().getContextClassLoader().getResource(resource); - log.info("Execute SQL from resource URL: "+url); + log.debug("Execute SQL from resource URL: "+url); String sql = getStringFromStream(url.openStream()); sql = sql.replaceAll("(?m)^--([^\n]+)?$", ""); // Remove all commented lines