July 2010 - riftsaw-commits - Jboss List Archives

riftsaw SVN: r843 - branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4 and 2 other directories.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2010-07-07 10:37:19 -0400 (Wed, 07 Jul 2010) New Revision: 843 Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java Log: Fix test failures when running with cxf ws stack. Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java 2010-07-07 11:57:36 UTC (rev 842) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java 2010-07-07 14:37:19 UTC (rev 843) @@ -59,11 +59,11 @@ // If testing against cxf, then result is presented slightly differently if (result.indexOf("SOAP-ENV") != -1) { + result = processResult(result); + result = result.replaceAll("<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/inventory' />","<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/inventory'/>"); } - result = processResult(result); - assertMessageFromFile(result, "throw_inv_fault_response.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java 2010-07-07 11:57:36 UTC (rev 842) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java 2010-07-07 14:37:19 UTC (rev 843) @@ -41,11 +41,11 @@ // If testing against cxf, then result is presented slightly differently if (result.indexOf("SOAP-ENV") != -1) { + result = processResult(result); + result = result.replaceAll("<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/purchase' />","<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/purchase'/>"); } - result = processResult(result); - assertMessageFromFile(result, "invalid_response.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java 2010-07-07 11:57:36 UTC (rev 842) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java 2010-07-07 14:37:19 UTC (rev 843) @@ -59,11 +59,11 @@ // If testing against cxf, then result is presented slightly differently if (result.indexOf("SOAP-ENV") != -1) { + result = processResult(result); + result = result.replaceAll("<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/inventory' />","<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/inventory'/>"); } - result = processResult(result); - assertMessageFromFile(result, "throw_inv_fault_response.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java 2010-07-07 11:57:36 UTC (rev 842) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java 2010-07-07 14:37:19 UTC (rev 843) @@ -41,11 +41,11 @@ // If testing against cxf, then result is presented slightly differently if (result.indexOf("SOAP-ENV") != -1) { + result = processResult(result); + result = result.replaceAll("<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/purchase' />","<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/purchase'/>"); } - result = processResult(result); - assertMessageFromFile(result, "invalid_response.xml"); }

13 years, 10 months

1
0
0 / 0

riftsaw SVN: r842 - branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests and 24 other directories.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2010-07-07 07:57:36 -0400 (Wed, 07 Jul 2010) New Revision: 842 Added: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSayHelloTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHello.bpel branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHelloArtifacts.wsdl branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/bpel-deploy.xml branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/build.xml branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_request1.xml branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_response1.xml trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSayHelloTestCase.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHello.bpel trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHelloArtifacts.wsdl trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/bpel-deploy.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_request1.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_response1.xml Modified: branches/RiftSaw-2.1.x/integration-tests/build.xml branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/RiftSawTest.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldExtendedTimeoutTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderODETestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELInvokeESBEBWSTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureInvokeTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationWithOneWayTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleInvokeTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvoke2TestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvokeTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw118TestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw163TestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw209TestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw70TestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint1/BluePrint1TestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint2/BluePrint2TestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint5/BluePrint5TestCase.java trunk/integration-tests/build.xml trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/RiftSawTest.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldExtendedTimeoutTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderODETestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELInvokeESBEBWSTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureInvokeTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationWithOneWayTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleInvokeTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvoke2TestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvokeTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw118TestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw163TestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw209TestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw70TestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint1/BluePrint1TestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint2/BluePrint2TestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint5/BluePrint5TestCase.java Log: Added 'say_hello' as integration test, to provide another doc/lit example. Refactored response message processing, dependent upon which stack is used, into superclass. Modified: branches/RiftSaw-2.1.x/integration-tests/build.xml =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/build.xml 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/build.xml 2010-07-07 11:57:36 UTC (rev 842) @@ -131,6 +131,7 @@ <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_header_wsdl/build.xml" /> + <ant antfile="src/test/resources/samples/Quickstart_bpel_say_hello/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_simple_correlation/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_simple_correlation_with_oneway/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_simple_invoke/build.xml" /> Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/RiftSawTest.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/RiftSawTest.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/RiftSawTest.java 2010-07-07 11:57:36 UTC (rev 842) @@ -158,4 +158,20 @@ return(result); } + + protected String processResult(String result) { + // If testing against cxf, then result is presented slightly differently + if (result.indexOf("SOAP-ENV") != -1) { + result = result.replaceAll("SOAP-ENV", "env"); + result = result.replaceAll(" xmlns=\"\"",""); + result = result.replaceAll("\"","'"); + result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); + + result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); + result = result.replaceAll("ns0","valueNS"); + result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); + } + + return(result); + } } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldExtendedTimeoutTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldExtendedTimeoutTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldExtendedTimeoutTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_hello_world_extended_timeoutWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderODETestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderODETestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderODETestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,12 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_hello_world_header_odeWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - } + result = processResult(result); // TODO: Commented out until fixed assertMessageFromFile(result, "hello_response1.xml"); Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -47,12 +47,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_hello_world_header_wsdlWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_hello_worldWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELInvokeESBEBWSTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELInvokeESBEBWSTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELInvokeESBEBWSTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -54,14 +54,8 @@ String result=sendSOAPMessage("approve_request1.xml", "http://localhost:8080/Quickstart_bpel_approval_serviceWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } - + result = processResult(result); + assertMessageFromFile(result, "approve_response1.xml"); } } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("loanreq1.xml", "http://localhost:8080/Quickstart_bpel_loan_approvalWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "loanresp1.xml"); } @@ -61,13 +55,7 @@ String result=sendSOAPMessage("loanreq2.xml", "http://localhost:8080/Quickstart_bpel_loan_approvalWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "loanresp2.xml"); } Added: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSayHelloTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSayHelloTestCase.java (rev 0) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSayHelloTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.bpel.tests.samples; + +import org.jboss.soa.bpel.tests.RiftSawTest; +import org.jboss.soa.bpel.tests.RiftSawTestSetup; + +import junit.framework.Test; + +/** + * Test case for running the Quickstart_bpel_say_hello sample. + */ +public class QuickstartBPELSayHelloTestCase extends RiftSawTest { + + private static final String TEST_NAME = "Quickstart_bpel_say_hello"; + + public QuickstartBPELSayHelloTestCase() { + super(TEST_NAME); + } + + public static Test suite() { + return(new RiftSawTestSetup(QuickstartBPELSayHelloTestCase.class, + TEST_NAME, "Quickstart_bpel_say_hello-1.jar")); + } + + public void testSendHello() throws Exception { + String result=sendSOAPMessage("sayHello_request1.xml", + "http://localhost:8080/SayHelloProcess"); + + result = processResult(result); + + assertMessageFromFile(result, "sayHello_response1.xml"); + } +} Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureInvokeTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureInvokeTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureInvokeTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -54,13 +54,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_secure_invokeWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -58,26 +58,14 @@ String result1=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_correlationWS"); - // If testing against cxf, then result is presented slightly differently - if (result1.indexOf("SOAP-ENV") != -1) { - result1 = result1.replaceAll("SOAP-ENV", "env"); - result1 = result1.replaceAll(" xmlns=\"\"",""); - result1 = result1.replaceAll("\"","'"); - result1 = result1.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result1 = processResult(result1); assertMessageFromFile(result1, "hello_response1.xml"); String result2=sendSOAPMessage("goodbye_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_correlationWS"); - // If testing against cxf, then result is presented slightly differently - if (result2.indexOf("SOAP-ENV") != -1) { - result2 = result2.replaceAll("SOAP-ENV", "env"); - result2 = result2.replaceAll(" xmlns=\"\"",""); - result2 = result2.replaceAll("\"","'"); - result2 = result2.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result2 = processResult(result2); assertMessageFromFile(result2, "goodbye_response1.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationWithOneWayTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationWithOneWayTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationWithOneWayTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -58,13 +58,7 @@ String result2=sendSOAPMessage("goodbye_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_correlation_onewayWS"); - // If testing against cxf, then result is presented slightly differently - if (result2.indexOf("SOAP-ENV") != -1) { - result2 = result2.replaceAll("SOAP-ENV", "env"); - result2 = result2.replaceAll(" xmlns=\"\"",""); - result2 = result2.replaceAll("\"","'"); - result2 = result2.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result2 = processResult(result2); assertMessageFromFile(result2, "goodbye_response1.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleInvokeTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleInvokeTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleInvokeTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_invokeWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,26 +46,14 @@ String result1=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_pickWS"); - // If testing against cxf, then result is presented slightly differently - if (result1.indexOf("SOAP-ENV") != -1) { - result1 = result1.replaceAll("SOAP-ENV", "env"); - result1 = result1.replaceAll(" xmlns=\"\"",""); - result1 = result1.replaceAll("\"","'"); - result1 = result1.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result1 = processResult(result1); assertMessageFromFile(result1, "hello_response1.xml"); String result2=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_pickWS"); - // If testing against cxf, then result is presented slightly differently - if (result2.indexOf("SOAP-ENV") != -1) { - result2 = result2.replaceAll("SOAP-ENV", "env"); - result2 = result2.replaceAll(" xmlns=\"\"",""); - result2 = result2.replaceAll("\"","'"); - result2 = result2.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result2 = processResult(result2); assertMessageFromFile(result2, "hello_response1.xml"); } @@ -74,26 +62,14 @@ String result1=sendSOAPMessage("goodbye_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_pickWS"); - // If testing against cxf, then result is presented slightly differently - if (result1.indexOf("SOAP-ENV") != -1) { - result1 = result1.replaceAll("SOAP-ENV", "env"); - result1 = result1.replaceAll(" xmlns=\"\"",""); - result1 = result1.replaceAll("\"","'"); - result1 = result1.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result1 = processResult(result1); assertMessageFromFile(result1, "goodbye_response1.xml"); String result2=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_pickWS"); - // If testing against cxf, then result is presented slightly differently - if (result2.indexOf("SOAP-ENV") != -1) { - result2 = result2.replaceAll("SOAP-ENV", "env"); - result2 = result2.replaceAll(" xmlns=\"\"",""); - result2 = result2.replaceAll("\"","'"); - result2 = result2.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result2 = processResult(result2); assertMessageFromFile(result2, "hello_response1.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvoke2TestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvoke2TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvoke2TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -54,14 +54,8 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_invokeWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } - + result = processResult(result); + assertMessageFromFile(result, "hello_response1.xml"); } } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvokeTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvokeTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvokeTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -54,13 +54,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_invokeWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw118TestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw118TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw118TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/RiftSaw_118WS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); // Comment out until RIFTSAW-118 is fixed assertMessageFromFile(result, "hello_response1.xml"); Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw163TestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw163TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw163TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/RiftSaw_163WS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); // Comment out until RIFTSAW-118 is fixed assertMessageFromFile(result, "hello_response1.xml"); Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw209TestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw209TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw209TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/RiftSaw_209WS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw70TestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw70TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw70TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/RiftSaw_70WS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); result = result.replaceAll(" xmlns:pol='http://www.example.org/policyQuote'>", ">"); Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint1/BluePrint1TestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint1/BluePrint1TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint1/BluePrint1TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -30,13 +30,7 @@ String result=sendSOAPMessage("valid.xml", "http://localhost:8080/BPEL_BluePrint1_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "valid_response.xml"); } @@ -45,16 +39,7 @@ String result=sendSOAPMessage("invalid.xml", "http://localhost:8080/BPEL_BluePrint1_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); - } + result = processResult(result); assertMessageFromFile(result, "invalid_response.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint2/BluePrint2TestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint2/BluePrint2TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint2/BluePrint2TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -30,13 +30,7 @@ String result=sendSOAPMessage("valid.xml", "http://localhost:8080/BPEL_BluePrint2_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "valid_response.xml"); } @@ -45,16 +39,7 @@ String result=sendSOAPMessage("invalid.xml", "http://localhost:8080/BPEL_BluePrint2_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); - } + result = processResult(result); assertMessageFromFile(result, "invalid_response.xml"); } @@ -63,16 +48,7 @@ String result=sendSOAPMessage("timeout.xml", "http://localhost:8080/BPEL_BluePrint2_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); - } + result = processResult(result); assertMessageFromFile(result, "timeout_response.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -30,13 +30,7 @@ String result=sendSOAPMessage("valid.xml", "http://localhost:8080/BPEL_BluePrint3_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "valid_response.xml"); } @@ -45,16 +39,7 @@ String result=sendSOAPMessage("invalid.xml", "http://localhost:8080/BPEL_BluePrint3_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); - } + result = processResult(result); assertMessageFromFile(result, "invalid_response.xml"); } @@ -63,16 +48,7 @@ String result=sendSOAPMessage("throw_po_fault.xml", "http://localhost:8080/BPEL_BluePrint3_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); - } + result = processResult(result); assertMessageFromFile(result, "throw_po_fault_response.xml"); } @@ -83,16 +59,11 @@ // If testing against cxf, then result is presented slightly differently if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); result = result.replaceAll("<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/inventory' />","<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/inventory'/>"); } + result = processResult(result); + assertMessageFromFile(result, "throw_inv_fault_response.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -30,13 +30,7 @@ String result=sendSOAPMessage("valid.xml", "http://localhost:8080/BPEL_BluePrint4_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "valid_response.xml"); } @@ -47,16 +41,11 @@ // If testing against cxf, then result is presented slightly differently if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); result = result.replaceAll("<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/purchase' />","<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/purchase'/>"); } + result = processResult(result); + assertMessageFromFile(result, "invalid_response.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint5/BluePrint5TestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint5/BluePrint5TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint5/BluePrint5TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -30,13 +30,7 @@ String result=sendSOAPMessage("book_airline.xml", "http://localhost:8080/BPEL_BluePrint5_ReservationService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "book_airline_response.xml"); } @@ -45,13 +39,7 @@ String result=sendSOAPMessage("book_car.xml", "http://localhost:8080/BPEL_BluePrint5_ReservationService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "book_car_response.xml"); } @@ -60,13 +48,7 @@ String result=sendSOAPMessage("book_hotel.xml", "http://localhost:8080/BPEL_BluePrint5_ReservationService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "book_hotel_response.xml"); } @@ -75,13 +57,7 @@ String result=sendSOAPMessage("book_all.xml", "http://localhost:8080/BPEL_BluePrint5_ReservationService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "book_all_response.xml"); } Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHello.bpel =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHello.bpel (rev 0) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHello.bpel 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,81 @@ + +<bpel:process name="HelloWorld" + targetNamespace="http://www.jboss.org/bpel/examples" + suppressJoinFailure="yes" + xmlns:tns="http://www.jboss.org/bpel/examples" + xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" + > + +  + <bpel:import location="SayHelloArtifacts.wsdl" namespace="http://www.jboss.org/bpel/examples" + importType="http://schemas.xmlsoap.org/wsdl/" /> + +  +  +  +  + <bpel:partnerLinks> +  + <bpel:partnerLink name="client" + partnerLinkType="tns:SayHello" + myRole="SayHelloProvider" + /> + </bpel:partnerLinks> + +  +  +  +  + <bpel:variables> +  + <bpel:variable name="ReceiveSayHelloVar" + messageType="tns:SayHelloRequestMessage"/> + +  + <bpel:variable name="ReplySayHelloVar" + messageType="tns:SayHelloResponseMessage"/> + </bpel:variables> + +  +  +  +  +  + <bpel:sequence name="main"> + +  + <bpel:receive name="ReceiveSayHello" partnerLink="client" + portType="tns:SayHello" + operation="sayHello" variable="ReceiveSayHelloVar" + createInstance="yes"/> + +  + <bpel:assign validate="no" name="AssignName"> + <bpel:copy> + <bpel:from><bpel:literal><tns:HelloWorldResponse xmlns:tns="http://www.jboss.org/bpel/examples" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <tns:result></tns:result> +</tns:HelloWorldResponse> +</bpel:literal></bpel:from> + <bpel:to variable="ReplySayHelloVar" part="parameters"></bpel:to> + </bpel:copy> + <bpel:copy> + <bpel:from> + <![CDATA[concat('Hello ', $ReceiveSayHelloVar.parameters/tns:input)]]> + </bpel:from> + <bpel:to part="parameters" variable="ReplySayHelloVar"> + <bpel:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0"><![CDATA[tns:result]]></bpel:query> + </bpel:to> + </bpel:copy> + </bpel:assign> + <bpel:reply name="ReplySayHello" + partnerLink="client" + portType="tns:SayHello" + operation="sayHello" + variable="ReplySayHelloVar" + /> + </bpel:sequence> +</bpel:process> \ No newline at end of file Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHelloArtifacts.wsdl =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHelloArtifacts.wsdl (rev 0) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHelloArtifacts.wsdl 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,90 @@ +<?xml version="1.0"?> +<definitions name="SayHello" + targetNamespace="http://www.jboss.org/bpel/examples" + xmlns:tns="http://www.jboss.org/bpel/examples" + xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + + + <types> + <schema attributeFormDefault="unqualified" elementFormDefault="qualified" + targetNamespace="http://www.jboss.org/bpel/examples" + xmlns="http://www.w3.org/2001/XMLSchema"> + + <element name="SayHelloRequest"> + <complexType> + <sequence> + <element name="input" type="string"/> + </sequence> + </complexType> + </element> + + <element name="SayHelloResponse"> + <complexType> + <sequence> + <element name="result" type="string"/> + </sequence> + </complexType> + </element> + </schema> + </types> + + + + <message name="SayHelloRequestMessage"> + <part name="parameters" element="tns:SayHelloRequest"/> + </message> + <message name="SayHelloResponseMessage"> + <part name="parameters" element="tns:SayHelloResponse"/> + </message> + + + +  + <portType name="SayHello"> + <operation name="sayHello"> + <input message="tns:SayHelloRequestMessage" /> + <output message="tns:SayHelloResponseMessage"/> + </operation> + </portType> + + + + <plnk:partnerLinkType name="SayHello"> + <plnk:role name="SayHelloProvider" portType="tns:SayHello"/> + </plnk:partnerLinkType> + + <binding name="SayHelloBinding" type="tns:SayHello"> + <soap:binding style="document" + transport="http://schemas.xmlsoap.org/soap/http" /> + <operation name="sayHello"> + <soap:operation + soapAction="http://www.jboss.org/bpel/examples/sayHello" /> + <input> + <soap:body use="literal" /> + </input> + <output> + <soap:body use="literal" /> + </output> + </operation> + </binding> + <service name="SayHelloService"> + <port name="SayHelloPort" binding="tns:SayHelloBinding"> + <soap:address location="http://localhost:8080/SayHelloProcess" /> + </port> + </service> +</definitions> Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/bpel-deploy.xml =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/bpel-deploy.xml (rev 0) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/bpel-deploy.xml 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03" xmlns:examples="http://www.jboss.org/bpel/examples"> + <process name="examples:HelloWorld"> + <active>true</active> + <retired>false</retired> + <process-events generate="all"/> + <provide partnerLink="client"> + <service name="examples:SayHelloService" port="SayHelloPort"/> + </provide> + </process> +</deploy> \ No newline at end of file Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/build.xml =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/build.xml (rev 0) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/build.xml 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,30 @@ +<project name="Quickstart_bpel_say_hello" default="deploy" basedir="."> + + <description> + ${ant.project.name} + ${line.separator} + </description> + + <property name="version" value="1" /> + + <property name="deploy.dir" value="${basedir}/target/tests"/> + <property name="test.dir" value="${basedir}/src/test/resources/samples/${ant.project.name}" /> + + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> + + <target name="deploy"> + <echo>Deploy ${ant.project.name}</echo> + <mkdir dir="${deploy.dir}/${ant.project.name}" /> + <jar basedir="${test.dir}/bpel" destfile="${deploy.dir}/${ant.project.name}/${sample.jar.name}" /> + + <copy todir="${deploy.dir}/${ant.project.name}"> + <fileset dir="${test.dir}/messages"/> + </copy> + </target> + + <target name="undeploy"> + <echo>Undeploy ${ant.project.name}</echo> + <delete file="${deploy.dir}/${sample.jar.name}" /> + </target> + +</project> Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_request1.xml =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_request1.xml (rev 0) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_request1.xml 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,8 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:exam="http://www.jboss.org/bpel/examples"> + <soapenv:Header/> + <soapenv:Body> + <exam:SayHelloRequest> + <exam:input>Dolly</exam:input> + </exam:SayHelloRequest> + </soapenv:Body> +</soapenv:Envelope> Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_response1.xml =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_response1.xml (rev 0) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_response1.xml 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,3 @@ +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><SayHelloResponse xmlns='http://www.jboss.org/bpel/examples'> + <tns:result xmlns:tns='http://www.jboss.org/bpel/examples'>Hello Dolly</tns:result> +</SayHelloResponse></env:Body></env:Envelope> \ No newline at end of file Modified: trunk/integration-tests/build.xml =================================================================== --- trunk/integration-tests/build.xml 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/build.xml 2010-07-07 11:57:36 UTC (rev 842) @@ -131,6 +131,7 @@ <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_header_wsdl/build.xml" /> + <ant antfile="src/test/resources/samples/Quickstart_bpel_say_hello/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_simple_correlation/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_simple_correlation_with_oneway/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_simple_invoke/build.xml" /> Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/RiftSawTest.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/RiftSawTest.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/RiftSawTest.java 2010-07-07 11:57:36 UTC (rev 842) @@ -158,4 +158,20 @@ return(result); } + + protected String processResult(String result) { + // If testing against cxf, then result is presented slightly differently + if (result.indexOf("SOAP-ENV") != -1) { + result = result.replaceAll("SOAP-ENV", "env"); + result = result.replaceAll(" xmlns=\"\"",""); + result = result.replaceAll("\"","'"); + result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); + + result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); + result = result.replaceAll("ns0","valueNS"); + result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); + } + + return(result); + } } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldExtendedTimeoutTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldExtendedTimeoutTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldExtendedTimeoutTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_hello_world_extended_timeoutWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderODETestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderODETestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderODETestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,12 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_hello_world_header_odeWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - } + result = processResult(result); // TODO: Commented out until fixed assertMessageFromFile(result, "hello_response1.xml"); Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -47,12 +47,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_hello_world_header_wsdlWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_hello_worldWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELInvokeESBEBWSTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELInvokeESBEBWSTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELInvokeESBEBWSTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -54,14 +54,8 @@ String result=sendSOAPMessage("approve_request1.xml", "http://localhost:8080/Quickstart_bpel_approval_serviceWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } - + result = processResult(result); + assertMessageFromFile(result, "approve_response1.xml"); } } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("loanreq1.xml", "http://localhost:8080/Quickstart_bpel_loan_approvalWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "loanresp1.xml"); } @@ -61,13 +55,7 @@ String result=sendSOAPMessage("loanreq2.xml", "http://localhost:8080/Quickstart_bpel_loan_approvalWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "loanresp2.xml"); } Added: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSayHelloTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSayHelloTestCase.java (rev 0) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSayHelloTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.bpel.tests.samples; + +import org.jboss.soa.bpel.tests.RiftSawTest; +import org.jboss.soa.bpel.tests.RiftSawTestSetup; + +import junit.framework.Test; + +/** + * Test case for running the Quickstart_bpel_say_hello sample. + */ +public class QuickstartBPELSayHelloTestCase extends RiftSawTest { + + private static final String TEST_NAME = "Quickstart_bpel_say_hello"; + + public QuickstartBPELSayHelloTestCase() { + super(TEST_NAME); + } + + public static Test suite() { + return(new RiftSawTestSetup(QuickstartBPELSayHelloTestCase.class, + TEST_NAME, "Quickstart_bpel_say_hello-1.jar")); + } + + public void testSendHello() throws Exception { + String result=sendSOAPMessage("sayHello_request1.xml", + "http://localhost:8080/SayHelloProcess"); + + result = processResult(result); + + assertMessageFromFile(result, "sayHello_response1.xml"); + } +} Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureInvokeTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureInvokeTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureInvokeTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -54,13 +54,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_secure_invokeWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -58,26 +58,14 @@ String result1=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_correlationWS"); - // If testing against cxf, then result is presented slightly differently - if (result1.indexOf("SOAP-ENV") != -1) { - result1 = result1.replaceAll("SOAP-ENV", "env"); - result1 = result1.replaceAll(" xmlns=\"\"",""); - result1 = result1.replaceAll("\"","'"); - result1 = result1.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result1 = processResult(result1); assertMessageFromFile(result1, "hello_response1.xml"); String result2=sendSOAPMessage("goodbye_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_correlationWS"); - // If testing against cxf, then result is presented slightly differently - if (result2.indexOf("SOAP-ENV") != -1) { - result2 = result2.replaceAll("SOAP-ENV", "env"); - result2 = result2.replaceAll(" xmlns=\"\"",""); - result2 = result2.replaceAll("\"","'"); - result2 = result2.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result2 = processResult(result2); assertMessageFromFile(result2, "goodbye_response1.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationWithOneWayTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationWithOneWayTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationWithOneWayTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -58,13 +58,7 @@ String result2=sendSOAPMessage("goodbye_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_correlation_onewayWS"); - // If testing against cxf, then result is presented slightly differently - if (result2.indexOf("SOAP-ENV") != -1) { - result2 = result2.replaceAll("SOAP-ENV", "env"); - result2 = result2.replaceAll(" xmlns=\"\"",""); - result2 = result2.replaceAll("\"","'"); - result2 = result2.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result2 = processResult(result2); assertMessageFromFile(result2, "goodbye_response1.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleInvokeTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleInvokeTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleInvokeTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_invokeWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,26 +46,14 @@ String result1=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_pickWS"); - // If testing against cxf, then result is presented slightly differently - if (result1.indexOf("SOAP-ENV") != -1) { - result1 = result1.replaceAll("SOAP-ENV", "env"); - result1 = result1.replaceAll(" xmlns=\"\"",""); - result1 = result1.replaceAll("\"","'"); - result1 = result1.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result1 = processResult(result1); assertMessageFromFile(result1, "hello_response1.xml"); String result2=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_pickWS"); - // If testing against cxf, then result is presented slightly differently - if (result2.indexOf("SOAP-ENV") != -1) { - result2 = result2.replaceAll("SOAP-ENV", "env"); - result2 = result2.replaceAll(" xmlns=\"\"",""); - result2 = result2.replaceAll("\"","'"); - result2 = result2.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result2 = processResult(result2); assertMessageFromFile(result2, "hello_response1.xml"); } @@ -74,26 +62,14 @@ String result1=sendSOAPMessage("goodbye_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_pickWS"); - // If testing against cxf, then result is presented slightly differently - if (result1.indexOf("SOAP-ENV") != -1) { - result1 = result1.replaceAll("SOAP-ENV", "env"); - result1 = result1.replaceAll(" xmlns=\"\"",""); - result1 = result1.replaceAll("\"","'"); - result1 = result1.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result1 = processResult(result1); assertMessageFromFile(result1, "goodbye_response1.xml"); String result2=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_pickWS"); - // If testing against cxf, then result is presented slightly differently - if (result2.indexOf("SOAP-ENV") != -1) { - result2 = result2.replaceAll("SOAP-ENV", "env"); - result2 = result2.replaceAll(" xmlns=\"\"",""); - result2 = result2.replaceAll("\"","'"); - result2 = result2.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result2 = processResult(result2); assertMessageFromFile(result2, "hello_response1.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvoke2TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvoke2TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvoke2TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -54,14 +54,8 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_invokeWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } - + result = processResult(result); + assertMessageFromFile(result, "hello_response1.xml"); } } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvokeTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvokeTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvokeTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -54,13 +54,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_invokeWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw118TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw118TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw118TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/RiftSaw_118WS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); // Comment out until RIFTSAW-118 is fixed assertMessageFromFile(result, "hello_response1.xml"); Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw163TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw163TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw163TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/RiftSaw_163WS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); // Comment out until RIFTSAW-118 is fixed assertMessageFromFile(result, "hello_response1.xml"); Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw209TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw209TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw209TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/RiftSaw_209WS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw70TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw70TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw70TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/RiftSaw_70WS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); result = result.replaceAll(" xmlns:pol='http://www.example.org/policyQuote'>", ">"); Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint1/BluePrint1TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint1/BluePrint1TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint1/BluePrint1TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -30,13 +30,7 @@ String result=sendSOAPMessage("valid.xml", "http://localhost:8080/BPEL_BluePrint1_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "valid_response.xml"); } @@ -45,16 +39,7 @@ String result=sendSOAPMessage("invalid.xml", "http://localhost:8080/BPEL_BluePrint1_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); - } + result = processResult(result); assertMessageFromFile(result, "invalid_response.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint2/BluePrint2TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint2/BluePrint2TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint2/BluePrint2TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -30,13 +30,7 @@ String result=sendSOAPMessage("valid.xml", "http://localhost:8080/BPEL_BluePrint2_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "valid_response.xml"); } @@ -45,16 +39,7 @@ String result=sendSOAPMessage("invalid.xml", "http://localhost:8080/BPEL_BluePrint2_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); - } + result = processResult(result); assertMessageFromFile(result, "invalid_response.xml"); } @@ -63,16 +48,7 @@ String result=sendSOAPMessage("timeout.xml", "http://localhost:8080/BPEL_BluePrint2_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); - } + result = processResult(result); assertMessageFromFile(result, "timeout_response.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -30,13 +30,7 @@ String result=sendSOAPMessage("valid.xml", "http://localhost:8080/BPEL_BluePrint3_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "valid_response.xml"); } @@ -45,16 +39,7 @@ String result=sendSOAPMessage("invalid.xml", "http://localhost:8080/BPEL_BluePrint3_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); - } + result = processResult(result); assertMessageFromFile(result, "invalid_response.xml"); } @@ -63,16 +48,7 @@ String result=sendSOAPMessage("throw_po_fault.xml", "http://localhost:8080/BPEL_BluePrint3_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); - } + result = processResult(result); assertMessageFromFile(result, "throw_po_fault_response.xml"); } @@ -83,16 +59,11 @@ // If testing against cxf, then result is presented slightly differently if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); result = result.replaceAll("<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/inventory' />","<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/inventory'/>"); } + result = processResult(result); + assertMessageFromFile(result, "throw_inv_fault_response.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -30,13 +30,7 @@ String result=sendSOAPMessage("valid.xml", "http://localhost:8080/BPEL_BluePrint4_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "valid_response.xml"); } @@ -47,16 +41,11 @@ // If testing against cxf, then result is presented slightly differently if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); result = result.replaceAll("<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/purchase' />","<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/purchase'/>"); } + result = processResult(result); + assertMessageFromFile(result, "invalid_response.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint5/BluePrint5TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint5/BluePrint5TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint5/BluePrint5TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -30,13 +30,7 @@ String result=sendSOAPMessage("book_airline.xml", "http://localhost:8080/BPEL_BluePrint5_ReservationService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "book_airline_response.xml"); } @@ -45,13 +39,7 @@ String result=sendSOAPMessage("book_car.xml", "http://localhost:8080/BPEL_BluePrint5_ReservationService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "book_car_response.xml"); } @@ -60,13 +48,7 @@ String result=sendSOAPMessage("book_hotel.xml", "http://localhost:8080/BPEL_BluePrint5_ReservationService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "book_hotel_response.xml"); } @@ -75,13 +57,7 @@ String result=sendSOAPMessage("book_all.xml", "http://localhost:8080/BPEL_BluePrint5_ReservationService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "book_all_response.xml"); } Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHello.bpel =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHello.bpel (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHello.bpel 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,81 @@ + +<bpel:process name="HelloWorld" + targetNamespace="http://www.jboss.org/bpel/examples" + suppressJoinFailure="yes" + xmlns:tns="http://www.jboss.org/bpel/examples" + xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" + > + +  + <bpel:import location="SayHelloArtifacts.wsdl" namespace="http://www.jboss.org/bpel/examples" + importType="http://schemas.xmlsoap.org/wsdl/" /> + +  +  +  +  + <bpel:partnerLinks> +  + <bpel:partnerLink name="client" + partnerLinkType="tns:SayHello" + myRole="SayHelloProvider" + /> + </bpel:partnerLinks> + +  +  +  +  + <bpel:variables> +  + <bpel:variable name="ReceiveSayHelloVar" + messageType="tns:SayHelloRequestMessage"/> + +  + <bpel:variable name="ReplySayHelloVar" + messageType="tns:SayHelloResponseMessage"/> + </bpel:variables> + +  +  +  +  +  + <bpel:sequence name="main"> + +  + <bpel:receive name="ReceiveSayHello" partnerLink="client" + portType="tns:SayHello" + operation="sayHello" variable="ReceiveSayHelloVar" + createInstance="yes"/> + +  + <bpel:assign validate="no" name="AssignName"> + <bpel:copy> + <bpel:from><bpel:literal><tns:HelloWorldResponse xmlns:tns="http://www.jboss.org/bpel/examples" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <tns:result></tns:result> +</tns:HelloWorldResponse> +</bpel:literal></bpel:from> + <bpel:to variable="ReplySayHelloVar" part="parameters"></bpel:to> + </bpel:copy> + <bpel:copy> + <bpel:from> + <![CDATA[concat('Hello ', $ReceiveSayHelloVar.parameters/tns:input)]]> + </bpel:from> + <bpel:to part="parameters" variable="ReplySayHelloVar"> + <bpel:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0"><![CDATA[tns:result]]></bpel:query> + </bpel:to> + </bpel:copy> + </bpel:assign> + <bpel:reply name="ReplySayHello" + partnerLink="client" + portType="tns:SayHello" + operation="sayHello" + variable="ReplySayHelloVar" + /> + </bpel:sequence> +</bpel:process> \ No newline at end of file Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHelloArtifacts.wsdl =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHelloArtifacts.wsdl (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHelloArtifacts.wsdl 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,90 @@ +<?xml version="1.0"?> +<definitions name="SayHello" + targetNamespace="http://www.jboss.org/bpel/examples" + xmlns:tns="http://www.jboss.org/bpel/examples" + xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + + + <types> + <schema attributeFormDefault="unqualified" elementFormDefault="qualified" + targetNamespace="http://www.jboss.org/bpel/examples" + xmlns="http://www.w3.org/2001/XMLSchema"> + + <element name="SayHelloRequest"> + <complexType> + <sequence> + <element name="input" type="string"/> + </sequence> + </complexType> + </element> + + <element name="SayHelloResponse"> + <complexType> + <sequence> + <element name="result" type="string"/> + </sequence> + </complexType> + </element> + </schema> + </types> + + + + <message name="SayHelloRequestMessage"> + <part name="parameters" element="tns:SayHelloRequest"/> + </message> + <message name="SayHelloResponseMessage"> + <part name="parameters" element="tns:SayHelloResponse"/> + </message> + + + +  + <portType name="SayHello"> + <operation name="sayHello"> + <input message="tns:SayHelloRequestMessage" /> + <output message="tns:SayHelloResponseMessage"/> + </operation> + </portType> + + + + <plnk:partnerLinkType name="SayHello"> + <plnk:role name="SayHelloProvider" portType="tns:SayHello"/> + </plnk:partnerLinkType> + + <binding name="SayHelloBinding" type="tns:SayHello"> + <soap:binding style="document" + transport="http://schemas.xmlsoap.org/soap/http" /> + <operation name="sayHello"> + <soap:operation + soapAction="http://www.jboss.org/bpel/examples/sayHello" /> + <input> + <soap:body use="literal" /> + </input> + <output> + <soap:body use="literal" /> + </output> + </operation> + </binding> + <service name="SayHelloService"> + <port name="SayHelloPort" binding="tns:SayHelloBinding"> + <soap:address location="http://localhost:8080/SayHelloProcess" /> + </port> + </service> +</definitions> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/bpel-deploy.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/bpel-deploy.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/bpel-deploy.xml 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03" xmlns:examples="http://www.jboss.org/bpel/examples"> + <process name="examples:HelloWorld"> + <active>true</active> + <retired>false</retired> + <process-events generate="all"/> + <provide partnerLink="client"> + <service name="examples:SayHelloService" port="SayHelloPort"/> + </provide> + </process> +</deploy> \ No newline at end of file Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/build.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/build.xml 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,30 @@ +<project name="Quickstart_bpel_say_hello" default="deploy" basedir="."> + + <description> + ${ant.project.name} + ${line.separator} + </description> + + <property name="version" value="1" /> + + <property name="deploy.dir" value="${basedir}/target/tests"/> + <property name="test.dir" value="${basedir}/src/test/resources/samples/${ant.project.name}" /> + + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> + + <target name="deploy"> + <echo>Deploy ${ant.project.name}</echo> + <mkdir dir="${deploy.dir}/${ant.project.name}" /> + <jar basedir="${test.dir}/bpel" destfile="${deploy.dir}/${ant.project.name}/${sample.jar.name}" /> + + <copy todir="${deploy.dir}/${ant.project.name}"> + <fileset dir="${test.dir}/messages"/> + </copy> + </target> + + <target name="undeploy"> + <echo>Undeploy ${ant.project.name}</echo> + <delete file="${deploy.dir}/${sample.jar.name}" /> + </target> + +</project> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_request1.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_request1.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_request1.xml 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,8 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:exam="http://www.jboss.org/bpel/examples"> + <soapenv:Header/> + <soapenv:Body> + <exam:SayHelloRequest> + <exam:input>Dolly</exam:input> + </exam:SayHelloRequest> + </soapenv:Body> +</soapenv:Envelope> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_response1.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_response1.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_response1.xml 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,3 @@ +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><SayHelloResponse xmlns='http://www.jboss.org/bpel/examples'> + <tns:result xmlns:tns='http://www.jboss.org/bpel/examples'>Hello Dolly</tns:result> +</SayHelloResponse></env:Body></env:Envelope> \ No newline at end of file

13 years, 10 months

1
0
0 / 0

riftsaw SVN: r841 - branches/RiftSaw-2.1.x/samples/quickstart/salutations/bpelContent and 4 other directories.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2010-07-07 04:26:58 -0400 (Wed, 07 Jul 2010) New Revision: 841 Removed: branches/RiftSaw-2.1.x/samples/quickstart/math/bpelContent/Math.bpelex branches/RiftSaw-2.1.x/samples/quickstart/salutations/bpelContent/Salutations.bpelex branches/RiftSaw-2.1.x/samples/quickstart/say_hello/bpelContent/SayHello.bpelex trunk/samples/quickstart/math/bpelContent/Math.bpelex trunk/samples/quickstart/salutations/bpelContent/Salutations.bpelex trunk/samples/quickstart/say_hello/bpelContent/SayHello.bpelex Log: Remove unwanted bpelex files. Deleted: branches/RiftSaw-2.1.x/samples/quickstart/math/bpelContent/Math.bpelex =================================================================== --- branches/RiftSaw-2.1.x/samples/quickstart/math/bpelContent/Math.bpelex 2010-07-06 15:58:49 UTC (rev 840) +++ branches/RiftSaw-2.1.x/samples/quickstart/math/bpelContent/Math.bpelex 2010-07-07 08:26:58 UTC (rev 841) @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<extensionmodel:ExtensionMap xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:extensionmodel="http:///extensionmodel.ecore" xmlns:org.eclipse.bpel.ui.uiextensionmodel="http:///org/eclipse/bpel/ui/uiextensionmodel.ecore" namespace="http://org.eclipse.bpel.ui/"> - <extensions> - <extendedObject href="Math.bpel#//@variables/(a)children.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@variables/(a)children.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#/"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ProcessExtension" modificationStamp="1273238599000"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@variables/(a)children.2"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@variables/(a)children.3"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@variables/(a)children.4"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@variables/(a)children.5"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@activity"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@activity/(a)activities.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@activity/(a)activities.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@activity/@activities.1/(a)copy.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@activity/@activities.1/(a)copy.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@activity/@activities.1/(a)copy.2"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@activity/(a)activities.2"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@activity/(a)activities.3"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@activity/@activities.3/(a)copy.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@activity/@activities.3/(a)copy.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@activity/(a)activities.4"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> -</extensionmodel:ExtensionMap> Deleted: branches/RiftSaw-2.1.x/samples/quickstart/salutations/bpelContent/Salutations.bpelex =================================================================== --- branches/RiftSaw-2.1.x/samples/quickstart/salutations/bpelContent/Salutations.bpelex 2010-07-06 15:58:49 UTC (rev 840) +++ branches/RiftSaw-2.1.x/samples/quickstart/salutations/bpelContent/Salutations.bpelex 2010-07-07 08:26:58 UTC (rev 841) @@ -1,99 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<extensionmodel:ExtensionMap xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:extensionmodel="http:///extensionmodel.ecore" xmlns:org.eclipse.bpel.ui.uiextensionmodel="http:///org/eclipse/bpel/ui/uiextensionmodel.ecore" namespace="http://org.eclipse.bpel.ui/"> - <extensions> - <extendedObject href="Salutations.bpel#//@variables/(a)children.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@variables/(a)children.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/(a)activities.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/(a)activities.4"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#/"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ProcessExtension" modificationStamp="1273066670000"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/(a)activities.3"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/(a)activities.2"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@variables/(a)children.2"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.3/(a)copy.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.3/(a)copy.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.2/(a)elseIf.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CaseExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.2/@elseIf.0/(a)activity"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.2/@elseIf.0/@activity/(a)copy.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.2/(a)elseIf.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CaseExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.2/@elseIf.1/(a)activity"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.2/@elseIf.1/@activity/(a)copy.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.2/@else/(a)activity"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.2/@else/@activity/(a)copy.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.2/(a)activity"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.2/@activity/(a)copy.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/(a)activities.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.1/(a)copy.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@variables/(a)children.3"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> -</extensionmodel:ExtensionMap> Deleted: branches/RiftSaw-2.1.x/samples/quickstart/say_hello/bpelContent/SayHello.bpelex =================================================================== --- branches/RiftSaw-2.1.x/samples/quickstart/say_hello/bpelContent/SayHello.bpelex 2010-07-06 15:58:49 UTC (rev 840) +++ branches/RiftSaw-2.1.x/samples/quickstart/say_hello/bpelContent/SayHello.bpelex 2010-07-07 08:26:58 UTC (rev 841) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<extensionmodel:ExtensionMap xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:extensionmodel="http:///extensionmodel.ecore" xmlns:org.eclipse.bpel.ui.uiextensionmodel="http:///org/eclipse/bpel/ui/uiextensionmodel.ecore" namespace="http://org.eclipse.bpel.ui/"> - <extensions> - <extendedObject href="SayHello.bpel#//@variables/(a)children.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="SayHello.bpel#//@variables/(a)children.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="SayHello.bpel#//@activity"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="SayHello.bpel#//@activity/(a)activities.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="SayHello.bpel#//@activity/(a)activities.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="SayHello.bpel#//@activity/@activities.1/(a)copy.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="SayHello.bpel#//@activity/@activities.1/(a)copy.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="SayHello.bpel#//@activity/(a)activities.2"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="SayHello.bpel#/"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ProcessExtension" modificationStamp="1273664549000"/> - </extensions> -</extensionmodel:ExtensionMap> Deleted: trunk/samples/quickstart/math/bpelContent/Math.bpelex =================================================================== --- trunk/samples/quickstart/math/bpelContent/Math.bpelex 2010-07-06 15:58:49 UTC (rev 840) +++ trunk/samples/quickstart/math/bpelContent/Math.bpelex 2010-07-07 08:26:58 UTC (rev 841) @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<extensionmodel:ExtensionMap xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:extensionmodel="http:///extensionmodel.ecore" xmlns:org.eclipse.bpel.ui.uiextensionmodel="http:///org/eclipse/bpel/ui/uiextensionmodel.ecore" namespace="http://org.eclipse.bpel.ui/"> - <extensions> - <extendedObject href="Math.bpel#//@variables/(a)children.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@variables/(a)children.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#/"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ProcessExtension" modificationStamp="1273238599000"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@variables/(a)children.2"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@variables/(a)children.3"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@variables/(a)children.4"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@variables/(a)children.5"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@activity"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@activity/(a)activities.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@activity/(a)activities.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@activity/@activities.1/(a)copy.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@activity/@activities.1/(a)copy.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@activity/@activities.1/(a)copy.2"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@activity/(a)activities.2"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@activity/(a)activities.3"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@activity/@activities.3/(a)copy.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@activity/@activities.3/(a)copy.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Math.bpel#//@activity/(a)activities.4"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> -</extensionmodel:ExtensionMap> Deleted: trunk/samples/quickstart/salutations/bpelContent/Salutations.bpelex =================================================================== --- trunk/samples/quickstart/salutations/bpelContent/Salutations.bpelex 2010-07-06 15:58:49 UTC (rev 840) +++ trunk/samples/quickstart/salutations/bpelContent/Salutations.bpelex 2010-07-07 08:26:58 UTC (rev 841) @@ -1,99 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<extensionmodel:ExtensionMap xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:extensionmodel="http:///extensionmodel.ecore" xmlns:org.eclipse.bpel.ui.uiextensionmodel="http:///org/eclipse/bpel/ui/uiextensionmodel.ecore" namespace="http://org.eclipse.bpel.ui/"> - <extensions> - <extendedObject href="Salutations.bpel#//@variables/(a)children.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@variables/(a)children.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/(a)activities.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/(a)activities.4"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#/"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ProcessExtension" modificationStamp="1273066670000"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/(a)activities.3"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/(a)activities.2"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@variables/(a)children.2"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.3/(a)copy.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.3/(a)copy.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.2/(a)elseIf.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CaseExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.2/@elseIf.0/(a)activity"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.2/@elseIf.0/@activity/(a)copy.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.2/(a)elseIf.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CaseExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.2/@elseIf.1/(a)activity"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.2/@elseIf.1/@activity/(a)copy.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.2/@else/(a)activity"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.2/@else/@activity/(a)copy.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.2/(a)activity"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.2/@activity/(a)copy.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/(a)activities.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@activity/@activities.1/(a)copy.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="Salutations.bpel#//@variables/(a)children.3"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> -</extensionmodel:ExtensionMap> Deleted: trunk/samples/quickstart/say_hello/bpelContent/SayHello.bpelex =================================================================== --- trunk/samples/quickstart/say_hello/bpelContent/SayHello.bpelex 2010-07-06 15:58:49 UTC (rev 840) +++ trunk/samples/quickstart/say_hello/bpelContent/SayHello.bpelex 2010-07-07 08:26:58 UTC (rev 841) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<extensionmodel:ExtensionMap xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:extensionmodel="http:///extensionmodel.ecore" xmlns:org.eclipse.bpel.ui.uiextensionmodel="http:///org/eclipse/bpel/ui/uiextensionmodel.ecore" namespace="http://org.eclipse.bpel.ui/"> - <extensions> - <extendedObject href="SayHello.bpel#//@variables/(a)children.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="SayHello.bpel#//@variables/(a)children.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="SayHello.bpel#//@activity"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="SayHello.bpel#//@activity/(a)activities.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="SayHello.bpel#//@activity/(a)activities.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="SayHello.bpel#//@activity/@activities.1/(a)copy.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="SayHello.bpel#//@activity/@activities.1/(a)copy.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="SayHello.bpel#//@activity/(a)activities.2"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="SayHello.bpel#/"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ProcessExtension" modificationStamp="1273664549000"/> - </extensions> -</extensionmodel:ExtensionMap>

13 years, 10 months

1
0
0 / 0

Hudson build became unstable: RiftSaw-postgres-2.1.x #17

by jboss-qa-internal＠redhat.com

See <http://hudson.qa.jboss.com/hudson/job/RiftSaw-postgres-2.1.x/17/changes>

13 years, 10 months

1
2
0 / 0

riftsaw SVN: r840 - branches/RiftSaw-2.1.x/samples/quickstart/secure_service and 4 other directories.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2010-07-06 11:58:49 -0400 (Tue, 06 Jul 2010) New Revision: 840 Removed: branches/RiftSaw-2.1.x/samples/quickstart/secure_service/bpelContent/HelloWorld.bpelex trunk/samples/quickstart/secure_service/bpelContent/HelloWorld.bpelex Modified: branches/RiftSaw-2.1.x/samples/quickstart/secure_invoke/readme.txt branches/RiftSaw-2.1.x/samples/quickstart/secure_service/readme.txt trunk/samples/quickstart/secure_invoke/readme.txt trunk/samples/quickstart/secure_service/readme.txt Log: RIFTSAW-235 - fix readme files. Modified: branches/RiftSaw-2.1.x/samples/quickstart/secure_invoke/readme.txt =================================================================== --- branches/RiftSaw-2.1.x/samples/quickstart/secure_invoke/readme.txt 2010-07-06 13:26:53 UTC (rev 839) +++ branches/RiftSaw-2.1.x/samples/quickstart/secure_invoke/readme.txt 2010-07-06 15:58:49 UTC (rev 840) @@ -1,14 +1,35 @@ -Quickstart Examples - Simple Invoke +Quickstart Examples - Secure Invoke =================================== -This is a simple echo example, used to respond to a sent message with a -modified version of the request message being returned in a response. The -difference with this example, compared to the Hello World sample, is -that the invoked service calls another JAX-WS based service to construct -the response message. The BPEL process in this example, is primarily -acting as a relay between the client and the invoked JAX-WS service, although -the BPEL process also appends some text to the response message aswell. +NOTE: This example can only be used if the JBossWS-CXF stack has been installed +into the JBossAS application server. This is because RiftSaw leverages +CXF to provide the security features. + +This is a slightly modified version of the simple_invoke example, which +sends a message to a BPEL process, which subsequently invokes a JAX-WS +based web service, before returning the response back to the client +application. This modified version adds security (authentication and +digital signature) to the invocation of the JAX-WS service. + +The BPEL process, which is performing the role of the secure client, +has an additional CXF based configuration file, specific to the +service and port being invoked. + +The configuration is named jbossws-cxf-{portname-localpart}.xml, +in this case jbossws-cxf-SecureHelloWorldPort.xml, and can be found +in the bpelContent sub-folder. The related signature properties and +keystore files can be found in the bpelContent/etc and bpelContent/keystore +sub-folders respectively. + +The security configuration for the JAX-WS service can be found in the +war/resources/WEB-INF sub-folder. The jbossws-cxf.xml file configures the +CXF service endpoint, with the related files being located in the +etc and keystore sub-folders. + +For further information on how to configure the security features, +please see the "Web Service Configuration" section of the User Guide. + To deploy the example, open a command line window in the example's folder, and simply type 'ant deploy'. To undeploy, use the command 'ant undeploy'. @@ -27,5 +48,5 @@ Some handy URLs: http://localhost:8080/bpel-console is the BPEL console -http://localhost:8080/Quickstart_bpel_simple_invokeWS?wsdl is the URL to the BPEL process' WSDL -http://localhost:8080/Quickstart_bpel_simple_invoke/HelloWorldWS?wsdl is the JBossWS endpoint's WSDL +http://localhost:8080/Quickstart_bpel_secure_invokeWS?wsdl is the URL to the BPEL process' WSDL +http://localhost:8080/Quickstart_bpel_secure_invoke/SecureHelloWorldWS?wsdl is the JBossWS endpoint's WSDL Deleted: branches/RiftSaw-2.1.x/samples/quickstart/secure_service/bpelContent/HelloWorld.bpelex =================================================================== --- branches/RiftSaw-2.1.x/samples/quickstart/secure_service/bpelContent/HelloWorld.bpelex 2010-07-06 13:26:53 UTC (rev 839) +++ branches/RiftSaw-2.1.x/samples/quickstart/secure_service/bpelContent/HelloWorld.bpelex 2010-07-06 15:58:49 UTC (rev 840) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<extensionmodel:ExtensionMap xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:extensionmodel="http:///extensionmodel.ecore" xmlns:org.eclipse.bpel.ui.uiextensionmodel="http:///org/eclipse/bpel/ui/uiextensionmodel.ecore" namespace="http://org.eclipse.bpel.ui/"> - <extensions> - <extendedObject href="HelloWorld.bpel#//@variables/(a)children.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="HelloWorld.bpel#//@variables/(a)children.2"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="HelloWorld.bpel#//@activity"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="HelloWorld.bpel#//@activity/(a)activities.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="HelloWorld.bpel#//@activity/(a)activities.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="HelloWorld.bpel#//@activity/@activities.1/(a)copy.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="HelloWorld.bpel#//@activity/@activities.1/(a)copy.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="HelloWorld.bpel#//@activity/(a)activities.2"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="HelloWorld.bpel#/"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ProcessExtension" modificationStamp="1274978025000"/> - </extensions> -</extensionmodel:ExtensionMap> Modified: branches/RiftSaw-2.1.x/samples/quickstart/secure_service/readme.txt =================================================================== --- branches/RiftSaw-2.1.x/samples/quickstart/secure_service/readme.txt 2010-07-06 13:26:53 UTC (rev 839) +++ branches/RiftSaw-2.1.x/samples/quickstart/secure_service/readme.txt 2010-07-06 15:58:49 UTC (rev 840) @@ -1,9 +1,28 @@ -Quickstart Examples - Hello World -================================= +Quickstart Examples - Secure Service +==================================== -This is a simple echo example, used to respond to a sent message with a -modified version of the request message being returned in a response. +NOTE: This example can only be used if the JBossWS-CXF stack has been installed +into the JBossAS application server. This is because RiftSaw leverages +CXF to provide the security features. + +This is a slightly modified version of the hello_world example, where the +BPEL process is providing a secure service. This example demonstrates the +use of username token based authentication with a digital signature. + +The security configuration for the service representing the BPEL process can +be found in the bpelContent sub-folder. The jbossws-cxf.xml file configures the +CXF service endpoint, with the related files being located in the +etc and keystore sub-folders. + +The test client application obtains its security configuration from the +client/resources/wssec.xml file, with associated properties and keystore +in the client/resources/etc and client/resources/keystore sub-folders +respectively. + +For further information on how to configure the security features, +please see the "Web Service Configuration" section of the User Guide. + To deploy the example, open a command line window in the example's folder, and simply type 'ant deploy'. To undeploy, use the command 'ant undeploy'. Modified: trunk/samples/quickstart/secure_invoke/readme.txt =================================================================== --- trunk/samples/quickstart/secure_invoke/readme.txt 2010-07-06 13:26:53 UTC (rev 839) +++ trunk/samples/quickstart/secure_invoke/readme.txt 2010-07-06 15:58:49 UTC (rev 840) @@ -1,14 +1,35 @@ -Quickstart Examples - Simple Invoke +Quickstart Examples - Secure Invoke =================================== -This is a simple echo example, used to respond to a sent message with a -modified version of the request message being returned in a response. The -difference with this example, compared to the Hello World sample, is -that the invoked service calls another JAX-WS based service to construct -the response message. The BPEL process in this example, is primarily -acting as a relay between the client and the invoked JAX-WS service, although -the BPEL process also appends some text to the response message aswell. +NOTE: This example can only be used if the JBossWS-CXF stack has been installed +into the JBossAS application server. This is because RiftSaw leverages +CXF to provide the security features. + +This is a slightly modified version of the simple_invoke example, which +sends a message to a BPEL process, which subsequently invokes a JAX-WS +based web service, before returning the response back to the client +application. This modified version adds security (authentication and +digital signature) to the invocation of the JAX-WS service. + +The BPEL process, which is performing the role of the secure client, +has an additional CXF based configuration file, specific to the +service and port being invoked. + +The configuration is named jbossws-cxf-{portname-localpart}.xml, +in this case jbossws-cxf-SecureHelloWorldPort.xml, and can be found +in the bpelContent sub-folder. The related signature properties and +keystore files can be found in the bpelContent/etc and bpelContent/keystore +sub-folders respectively. + +The security configuration for the JAX-WS service can be found in the +war/resources/WEB-INF sub-folder. The jbossws-cxf.xml file configures the +CXF service endpoint, with the related files being located in the +etc and keystore sub-folders. + +For further information on how to configure the security features, +please see the "Web Service Configuration" section of the User Guide. + To deploy the example, open a command line window in the example's folder, and simply type 'ant deploy'. To undeploy, use the command 'ant undeploy'. @@ -27,5 +48,5 @@ Some handy URLs: http://localhost:8080/bpel-console is the BPEL console -http://localhost:8080/Quickstart_bpel_simple_invokeWS?wsdl is the URL to the BPEL process' WSDL -http://localhost:8080/Quickstart_bpel_simple_invoke/HelloWorldWS?wsdl is the JBossWS endpoint's WSDL +http://localhost:8080/Quickstart_bpel_secure_invokeWS?wsdl is the URL to the BPEL process' WSDL +http://localhost:8080/Quickstart_bpel_secure_invoke/SecureHelloWorldWS?wsdl is the JBossWS endpoint's WSDL Deleted: trunk/samples/quickstart/secure_service/bpelContent/HelloWorld.bpelex =================================================================== --- trunk/samples/quickstart/secure_service/bpelContent/HelloWorld.bpelex 2010-07-06 13:26:53 UTC (rev 839) +++ trunk/samples/quickstart/secure_service/bpelContent/HelloWorld.bpelex 2010-07-06 15:58:49 UTC (rev 840) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<extensionmodel:ExtensionMap xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:extensionmodel="http:///extensionmodel.ecore" xmlns:org.eclipse.bpel.ui.uiextensionmodel="http:///org/eclipse/bpel/ui/uiextensionmodel.ecore" namespace="http://org.eclipse.bpel.ui/"> - <extensions> - <extendedObject href="HelloWorld.bpel#//@variables/(a)children.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="HelloWorld.bpel#//@variables/(a)children.2"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="HelloWorld.bpel#//@activity"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="HelloWorld.bpel#//@activity/(a)activities.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="HelloWorld.bpel#//@activity/(a)activities.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="HelloWorld.bpel#//@activity/@activities.1/(a)copy.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="HelloWorld.bpel#//@activity/@activities.1/(a)copy.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/> - </extensions> - <extensions> - <extendedObject href="HelloWorld.bpel#//@activity/(a)activities.2"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="HelloWorld.bpel#/"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ProcessExtension" modificationStamp="1274978025000"/> - </extensions> -</extensionmodel:ExtensionMap> Modified: trunk/samples/quickstart/secure_service/readme.txt =================================================================== --- trunk/samples/quickstart/secure_service/readme.txt 2010-07-06 13:26:53 UTC (rev 839) +++ trunk/samples/quickstart/secure_service/readme.txt 2010-07-06 15:58:49 UTC (rev 840) @@ -1,9 +1,28 @@ -Quickstart Examples - Hello World -================================= +Quickstart Examples - Secure Service +==================================== -This is a simple echo example, used to respond to a sent message with a -modified version of the request message being returned in a response. +NOTE: This example can only be used if the JBossWS-CXF stack has been installed +into the JBossAS application server. This is because RiftSaw leverages +CXF to provide the security features. + +This is a slightly modified version of the hello_world example, where the +BPEL process is providing a secure service. This example demonstrates the +use of username token based authentication with a digital signature. + +The security configuration for the service representing the BPEL process can +be found in the bpelContent sub-folder. The jbossws-cxf.xml file configures the +CXF service endpoint, with the related files being located in the +etc and keystore sub-folders. + +The test client application obtains its security configuration from the +client/resources/wssec.xml file, with associated properties and keystore +in the client/resources/etc and client/resources/keystore sub-folders +respectively. + +For further information on how to configure the security features, +please see the "Web Service Configuration" section of the User Guide. + To deploy the example, open a command line window in the example's folder, and simply type 'ant deploy'. To undeploy, use the command 'ant undeploy'.

13 years, 10 months

1
0
0 / 0

riftsaw SVN: r839 - branches/RiftSaw-2.1.x/stress-tests and 2 other directories.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2010-07-06 09:26:53 -0400 (Tue, 06 Jul 2010) New Revision: 839 Modified: branches/RiftSaw-2.1.x/integration-tests/build.xml branches/RiftSaw-2.1.x/stress-tests/build.xml trunk/integration-tests/build.xml trunk/stress-tests/build.xml Log: RIFTSAW-244 - fix build so ${org.jboss.as.config} property is used. Modified: branches/RiftSaw-2.1.x/integration-tests/build.xml =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/build.xml 2010-07-06 11:37:49 UTC (rev 838) +++ branches/RiftSaw-2.1.x/integration-tests/build.xml 2010-07-06 13:26:53 UTC (rev 839) @@ -71,8 +71,8 @@ <java classname="org.jboss.Main" fork="true" spawn="true" - dir="${org.jboss.as.home}/server/default" > - <arg line="-c default"/> + dir="${org.jboss.as.home}/server/${org.jboss.as.config}" > + <arg line="-c ${org.jboss.as.config}"/> <jvmarg value="-Djava.endorsed.dirs=${org.jboss.as.home}/lib/endorsed"/> <jvmarg value="-Xms128m"/> <jvmarg value="-Xmx512m"/> Modified: branches/RiftSaw-2.1.x/stress-tests/build.xml =================================================================== --- branches/RiftSaw-2.1.x/stress-tests/build.xml 2010-07-06 11:37:49 UTC (rev 838) +++ branches/RiftSaw-2.1.x/stress-tests/build.xml 2010-07-06 13:26:53 UTC (rev 839) @@ -69,8 +69,8 @@ <java classname="org.jboss.Main" fork="true" spawn="true" - dir="${org.jboss.as.home}/server/default" > - <arg line="-c default"/> + dir="${org.jboss.as.home}/server/${org.jboss.as.config}" > + <arg line="-c ${org.jboss.as.config}"/> <jvmarg value="-Djava.endorsed.dirs=${org.jboss.as.home}/lib/endorsed"/> <jvmarg value="-Xms128m"/> <jvmarg value="-Xmx512m"/> Modified: trunk/integration-tests/build.xml =================================================================== --- trunk/integration-tests/build.xml 2010-07-06 11:37:49 UTC (rev 838) +++ trunk/integration-tests/build.xml 2010-07-06 13:26:53 UTC (rev 839) @@ -71,8 +71,8 @@ <java classname="org.jboss.Main" fork="true" spawn="true" - dir="${org.jboss.as.home}/server/default" > - <arg line="-c default"/> + dir="${org.jboss.as.home}/server/${org.jboss.as.config}" > + <arg line="-c ${org.jboss.as.config}"/> <jvmarg value="-Djava.endorsed.dirs=${org.jboss.as.home}/lib/endorsed"/> <jvmarg value="-Xms128m"/> <jvmarg value="-Xmx512m"/> Modified: trunk/stress-tests/build.xml =================================================================== --- trunk/stress-tests/build.xml 2010-07-06 11:37:49 UTC (rev 838) +++ trunk/stress-tests/build.xml 2010-07-06 13:26:53 UTC (rev 839) @@ -69,8 +69,8 @@ <java classname="org.jboss.Main" fork="true" spawn="true" - dir="${org.jboss.as.home}/server/default" > - <arg line="-c default"/> + dir="${org.jboss.as.home}/server/${org.jboss.as.config}" > + <arg line="-c ${org.jboss.as.config}"/> <jvmarg value="-Djava.endorsed.dirs=${org.jboss.as.home}/lib/endorsed"/> <jvmarg value="-Xms128m"/> <jvmarg value="-Xmx512m"/>

13 years, 10 months

1
0
0 / 0

riftsaw SVN: r838 - in trunk/runtime: engine/src/main/java/org/apache/ode/store and 1 other directory.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2010-07-06 07:37:49 -0400 (Tue, 06 Jul 2010) New Revision: 838 Modified: trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentUnit.java trunk/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java Log: RIFTSAW-243 - fixed auto-increment of version number, so now uses the explicit version number specified. Modified: trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentUnit.java =================================================================== --- trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentUnit.java 2010-07-06 11:35:18 UTC (rev 837) +++ trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentUnit.java 2010-07-06 11:37:49 UTC (rev 838) @@ -36,6 +36,11 @@ public BPELDeploymentUnit(String name, long lastModified) { m_name = name; m_lastModified = lastModified; + + // Remove any .jar suffix + if (m_name != null && m_name.endsWith(".jar")) { + m_name = m_name.substring(0, m_name.length()-4); + } } /** Modified: trunk/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java =================================================================== --- trunk/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java 2010-07-06 11:35:18 UTC (rev 837) +++ trunk/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java 2010-07-06 11:37:49 UTC (rev 838) @@ -73,7 +73,8 @@ public void undeploy(BPELDeploymentUnit bdu) { __log.debug("Undeploy "+bdu); - undeploy(bdu.getDeploymentDescriptor().getParentFile()); + + undeploy(bdu.getName()); } /* @@ -86,23 +87,7 @@ return(m_extensionValidators); } */ - - // https://jira.jboss.org/browse/RIFTSAW-155 - protected void retirePreviousPackageVersions(DeploymentUnitDir du) { - //retire all the other versions of the same DU - // Riftsaw deployment units are slightly different - String name = du.getName(); - name = name.replaceAll("-(\\d)+\\.jar", "-(\\\\d)+\\\\.jar"); - Pattern duNamePattern = Pattern.compile(name); - for (String deployedDUname : _deploymentUnits.keySet()) { - Matcher matcher = duNamePattern.matcher(deployedDUname); - if (matcher.matches()) { - setRetiredPackage(deployedDUname, true); - } - } - } - public class DeployScheduler extends Thread { public DeployScheduler() { @@ -160,6 +145,8 @@ __log.debug("Re-compiling: "+bdu.getDeploymentDescriptor().getParentFile()); DeploymentUnitDir du=new DeploymentUnitDir(bdu.getDeploymentDescriptor().getParentFile()); + + du.setName(bdu.getName()); // Create the DU and compile it before acquiring lock. //du.setExtensionValidators(getExtensionValidators()); @@ -186,7 +173,7 @@ if (deploy) { __log.debug("Deploy new version: "+bdu.getDeploymentDescriptor().getParentFile()); - deploy(bdu.getDeploymentDescriptor().getParentFile()); + deploy(bdu.getDeploymentDescriptor().getParentFile(), true, bdu.getName(), false); } else { __log.debug("Trigger Integration Layer to use existing version: "+bdu.getDeploymentDescriptor().getParentFile());

13 years, 10 months

1
0
0 / 0

riftsaw SVN: r837 - in branches/RiftSaw-2.1.x/runtime: engine/src/main/java/org/apache/ode/store and 1 other directory.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2010-07-06 07:35:18 -0400 (Tue, 06 Jul 2010) New Revision: 837 Modified: branches/RiftSaw-2.1.x/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentUnit.java branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java Log: RIFTSAW-243 - fixed auto-increment of version number, so now uses the explicit version number specified. Modified: branches/RiftSaw-2.1.x/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentUnit.java =================================================================== --- branches/RiftSaw-2.1.x/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentUnit.java 2010-07-06 09:29:45 UTC (rev 836) +++ branches/RiftSaw-2.1.x/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentUnit.java 2010-07-06 11:35:18 UTC (rev 837) @@ -36,6 +36,11 @@ public BPELDeploymentUnit(String name, long lastModified) { m_name = name; m_lastModified = lastModified; + + // Remove any .jar suffix + if (m_name != null && m_name.endsWith(".jar")) { + m_name = m_name.substring(0, m_name.length()-4); + } } /** Modified: branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java =================================================================== --- branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java 2010-07-06 09:29:45 UTC (rev 836) +++ branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java 2010-07-06 11:35:18 UTC (rev 837) @@ -73,7 +73,8 @@ public void undeploy(BPELDeploymentUnit bdu) { __log.debug("Undeploy "+bdu); - undeploy(bdu.getDeploymentDescriptor().getParentFile()); + + undeploy(bdu.getName()); } /* @@ -86,23 +87,7 @@ return(m_extensionValidators); } */ - - // https://jira.jboss.org/browse/RIFTSAW-155 - protected void retirePreviousPackageVersions(DeploymentUnitDir du) { - //retire all the other versions of the same DU - // Riftsaw deployment units are slightly different - String name = du.getName(); - name = name.replaceAll("-(\\d)+\\.jar", "-(\\\\d)+\\\\.jar"); - Pattern duNamePattern = Pattern.compile(name); - for (String deployedDUname : _deploymentUnits.keySet()) { - Matcher matcher = duNamePattern.matcher(deployedDUname); - if (matcher.matches()) { - setRetiredPackage(deployedDUname, true); - } - } - } - public class DeployScheduler extends Thread { public DeployScheduler() { @@ -160,6 +145,8 @@ __log.debug("Re-compiling: "+bdu.getDeploymentDescriptor().getParentFile()); DeploymentUnitDir du=new DeploymentUnitDir(bdu.getDeploymentDescriptor().getParentFile()); + + du.setName(bdu.getName()); // Create the DU and compile it before acquiring lock. //du.setExtensionValidators(getExtensionValidators()); @@ -186,7 +173,7 @@ if (deploy) { __log.debug("Deploy new version: "+bdu.getDeploymentDescriptor().getParentFile()); - deploy(bdu.getDeploymentDescriptor().getParentFile()); + deploy(bdu.getDeploymentDescriptor().getParentFile(), true, bdu.getName(), false); } else { __log.debug("Trigger Integration Layer to use existing version: "+bdu.getDeploymentDescriptor().getParentFile());

13 years, 10 months

1
0
0 / 0

Build failed in Hudson: RiftSaw-mysql #129

by jboss-qa-internal＠redhat.com

See <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/129/changes> Changes: [objectiser] RIFTSAW-241 - added documentation on activate/retire and the stable interface property. [heiko.braun(a)jboss.com] set console version 2.1.1-SNAPSHOT ------------------------------------------ [...truncated 125 lines...] [echo] =============================== [echo] database.......... mysql [echo] riftsaw.version...... 2.2.0-SNAPSHOT [echo] riftsaw.home......... <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [echo] jboss.home.. <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [echo] org.jboss.esb.home .. <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [echo] =============================== get.jboss: get.jbossesb: install.jbossesb: [unzip] Expanding: <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/downloads/jboss-5....> into <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [unzip] Expanding: <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/downloads/jbossesb...> into <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> check.deploy.props: dependencies.source: dependencies.jbossesb: dependencies: init.bindings.props: undeploy.bindings: undeploy.jbossas5: undeploy: jms.config.check: [echo] deploy.dir : <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> jbmq.config: jbm.config: jms.config: internal.deploy: internal.deploy.jbossas5: [echo] Deploy to JBossAS5 [mkdir] Created dir: <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [copy] Copying 53 files to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [copy] Copying 2 files to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [copy] Copying 4 files to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [copy] Copying 8 files to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [copy] Copying 1 file to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [copy] Copying 1 file to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [copy] Copying 12 files to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [copy] Copying 2 files to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [copy] Copying 1 file to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [copy] Copying 1 file to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [copy] Copying 26 files to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [copy] Copying 62 files to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [copy] Copying 18 files to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [copy] Copying 6 files to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [copy] Copying 13 files to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [copy] Copying 14 files to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [copy] Copying 3 files to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [copy] Copying 17 files to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [copy] Copying 1 file to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [copy] Copying 1 file to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [copy] Copying 1 file to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> replace: install.base.console: deploy.console: [copy] Copying 1 file to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> deploy.bindings.as4: deploy.bindings.as5: [xslt] Processing <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [xslt] Loading stylesheet <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [move] Moving 1 file to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [move] Moving 1 file to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> deploy.bindings: update.modfilter: apply.modfilter.replace: [copy] Copying 1 file to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> deploy: [echo] =============================== [echo] database.......... mysql [echo] riftsaw.version...... 2.2.0-SNAPSHOT [echo] riftsaw.home......... <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [echo] jboss.home.. <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [echo] org.jboss.esb.home .. <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [echo] =============================== get.ojdbc: BUILD SUCCESSFUL Total time: 1 minute 5 seconds Buildfile: build.xml [echo] =============================== [echo] database.......... mysql [echo] riftsaw.version...... 2.2.0-SNAPSHOT [echo] riftsaw.home......... <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [echo] jboss.home.. <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [echo] org.jboss.esb.home .. <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [echo] =============================== unpack-riftsaw: [unzip] Expanding: /qa/services/hudson/hudson_workspace/workspace/RiftSaw-mysql/riftsaw-mysql/distribution/target/riftsaw-2.2.0-SNAPSHOT.zip into /qa/services/hudson/hudson_workspace/workspace/RiftSaw-mysql/riftsaw-mysql/distribution/target [echo] =============================== [echo] database.......... mysql [echo] riftsaw.version...... 2.2.0-SNAPSHOT [echo] riftsaw.home......... <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [echo] jboss.home.. <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [echo] org.jboss.esb.home .. <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [echo] =============================== replace.jdbc.files: [echo] Replacing the QA's Lab jdbc files [copy] Copying 6 files to /qa/services/hudson/hudson_workspace/workspace/RiftSaw-mysql/riftsaw-mysql/distribution/target/riftsaw-2.2.0-SNAPSHOT/db/jdbc drop.riftsaw.schema: [echo] clean the riftsaw database schema... log.properties: [echo] database....... mysql [echo] jdbc driver.... com.mysql.jdbc.Driver [echo] connection url....... jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com:3306/riftsaw [echo] username.. riftsaw copy.ojdbc: drop.riftsaw.schema: [sql] Executing file: /qa/services/hudson/hudson_workspace/workspace/RiftSaw-mysql/riftsaw-mysql/distribution/target/riftsaw-2.2.0-SNAPSHOT/db/sql/mysql.drop.sql [sql] Failed to execute: drop table ODE_SCHEMA_VERSION [sql] com.mysql.jdbc.exceptions.MySQLSyntaxErrorException: Unknown table 'ODE_SCHEMA_VERSION' [sql] Failed to execute: drop table ODE_JOB [sql] com.mysql.jdbc.exceptions.MySQLSyntaxErrorException: Unknown table 'ODE_JOB' [sql] 21 of 23 SQL statements executed successfully BUILD SUCCESSFUL Total time: 10 seconds [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [ERROR] FATAL ERROR [INFO] ------------------------------------------------------------------------ [INFO] Error building POM (may not be this project's POM). Project ID: org.jboss.soa.bpel:integration-tests POM Location: /qa/services/hudson/hudson_workspace/workspace/RiftSaw-mysql/riftsaw-mysql/pom.xml Reason: Parse error reading POM. Reason: expected name start and not < (position: TEXT seen ...<bpel.console.version>2.1.1-SNAPSHOT</<... @77:44) for project org.jboss.soa.bpel:integration-tests at /qa/services/hudson/hudson_workspace/workspace/RiftSaw-mysql/riftsaw-mysql/pom.xml [INFO] ------------------------------------------------------------------------ [INFO] Trace org.apache.maven.reactor.MavenExecutionException: Parse error reading POM. Reason: expected name start and not < (position: TEXT seen ...<bpel.console.version>2.1.1-SNAPSHOT</<... @77:44) for project org.jboss.soa.bpel:integration-tests at /qa/services/hudson/hudson_workspace/workspace/RiftSaw-mysql/riftsaw-mysql/pom.xml at org.apache.maven.DefaultMaven.getProjects(DefaultMaven.java:378) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:292) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:129) at org.apache.maven.cli.MavenCli.main(MavenCli.java:301) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315) at org.codehaus.classworlds.Launcher.launch(Launcher.java:255) at org.codehaus.classworlds.Launcher.mainWithExitCode(Launcher.java:430) at org.codehaus.classworlds.Launcher.main(Launcher.java:375) Caused by: org.apache.maven.project.InvalidProjectModelException: Parse error reading POM. Reason: expected name start and not < (position: TEXT seen ...<bpel.console.version>2.1.1-SNAPSHOT</<... @77:44) for project org.jboss.soa.bpel:integration-tests at /qa/services/hudson/hudson_workspace/workspace/RiftSaw-mysql/riftsaw-mysql/pom.xml at org.apache.maven.project.DefaultMavenProjectBuilder.readModel(DefaultMavenProjectBuilder.java:1591) at org.apache.maven.project.DefaultMavenProjectBuilder.readModel(DefaultMavenProjectBuilder.java:1552) at org.apache.maven.project.DefaultMavenProjectBuilder.assembleLineage(DefaultMavenProjectBuilder.java:1293) at org.apache.maven.project.DefaultMavenProjectBuilder.buildInternal(DefaultMavenProjectBuilder.java:820) at org.apache.maven.project.DefaultMavenProjectBuilder.buildFromSourceFileInternal(DefaultMavenProjectBuilder.java:505) at org.apache.maven.project.DefaultMavenProjectBuilder.build(DefaultMavenProjectBuilder.java:197) at org.apache.maven.DefaultMaven.getProject(DefaultMaven.java:583) at org.apache.maven.DefaultMaven.collectProjects(DefaultMaven.java:461) at org.apache.maven.DefaultMaven.getProjects(DefaultMaven.java:365) ... 11 more Caused by: org.codehaus.plexus.util.xml.pull.XmlPullParserException: expected name start and not < (position: TEXT seen ...<bpel.console.version>2.1.1-SNAPSHOT</<... @77:44) at hidden.org.codehaus.plexus.util.xml.pull.MXParser.parseEndTag(MXParser.java:1665) at hidden.org.codehaus.plexus.util.xml.pull.MXParser.nextImpl(MXParser.java:1131) at hidden.org.codehaus.plexus.util.xml.pull.MXParser.next(MXParser.java:1093) at hidden.org.codehaus.plexus.util.xml.pull.MXParser.nextText(MXParser.java:1061) at org.apache.maven.model.io.xpp3.MavenXpp3Reader.parseModel(MavenXpp3Reader.java:2720) at org.apache.maven.model.io.xpp3.MavenXpp3Reader.read(MavenXpp3Reader.java:4998) at org.apache.maven.project.DefaultMavenProjectBuilder.readModel(DefaultMavenProjectBuilder.java:1587) ... 19 more [INFO] ------------------------------------------------------------------------ [INFO] Total time: < 1 second [INFO] Finished at: Mon Jul 05 14:24:45 EDT 2010 [INFO] Final Memory: 4M/490M [INFO] ------------------------------------------------------------------------ Buildfile: build.xml [echo] =============================== [echo] database.......... mysql [echo] riftsaw.version...... 2.2.0-SNAPSHOT [echo] riftsaw.home......... <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [echo] jboss.home.. <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [echo] org.jboss.esb.home .. <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [echo] =============================== unpack-riftsaw: [unzip] Expanding: /qa/services/hudson/hudson_workspace/workspace/RiftSaw-mysql/riftsaw-mysql/distribution/target/riftsaw-2.2.0-SNAPSHOT.zip into /qa/services/hudson/hudson_workspace/workspace/RiftSaw-mysql/riftsaw-mysql/distribution/target [echo] =============================== [echo] database.......... mysql [echo] riftsaw.version...... 2.2.0-SNAPSHOT [echo] riftsaw.home......... <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [echo] jboss.home.. <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [echo] org.jboss.esb.home .. <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.2.0-SNAP...> [echo] =============================== replace.jdbc.files: [echo] Replacing the QA's Lab jdbc files [copy] Copying 6 files to /qa/services/hudson/hudson_workspace/workspace/RiftSaw-mysql/riftsaw-mysql/distribution/target/riftsaw-2.2.0-SNAPSHOT/db/jdbc drop.riftsaw.schema: [echo] clean the riftsaw database schema... log.properties: [echo] database....... mysql [echo] jdbc driver.... com.mysql.jdbc.Driver [echo] connection url....... jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com:3306/riftsaw [echo] username.. riftsaw copy.ojdbc: drop.riftsaw.schema: [sql] Executing file: /qa/services/hudson/hudson_workspace/workspace/RiftSaw-mysql/riftsaw-mysql/distribution/target/riftsaw-2.2.0-SNAPSHOT/db/sql/mysql.drop.sql [sql] Failed to execute: drop table ODE_SCHEMA_VERSION [sql] com.mysql.jdbc.exceptions.MySQLSyntaxErrorException: Unknown table 'ODE_SCHEMA_VERSION' [sql] Failed to execute: drop table ODE_JOB [sql] com.mysql.jdbc.exceptions.MySQLSyntaxErrorException: Unknown table 'ODE_JOB' [sql] 21 of 23 SQL statements executed successfully BUILD SUCCESSFUL Total time: 7 seconds Archiving artifacts Recording test results Test reports were found but none of them are new. Did tests run? For example, <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-mysql/inte...> is 2 days 23 hr old

13 years, 10 months

1
1
0 / 0

riftsaw SVN: r836 - branches/RiftSaw-ODE-2.1.x/bpel-store/src/main/java/org/apache/ode/store.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2010-07-06 05:29:45 -0400 (Tue, 06 Jul 2010) New Revision: 836 Modified: branches/RiftSaw-ODE-2.1.x/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java Log: RIFTSAW-243 - name was being derived from the deployment archive, which had a suffix of '.jar', which was causing problems deriving the version number. Need to use an explicit provided name instead, which has the suffix removed. Modified: branches/RiftSaw-ODE-2.1.x/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java 2010-07-06 07:56:08 UTC (rev 835) +++ branches/RiftSaw-ODE-2.1.x/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java 2010-07-06 09:29:45 UTC (rev 836) @@ -146,7 +146,7 @@ String getName() { - return _duDirectory.getName(); + return _name; } void setName(String name) {

13 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

riftsaw-commits July 2010