February 2010 - riftsaw-commits - Jboss List Archives

by jboss-qa-internal＠redhat.com

RiftSaw Build number 105 status: Still Failing Details available at http://hudson.jboss.org/hudson/job/RiftSaw/105/ JBoss server log can be found at workspace, http://hudson.qa.jboss.com/hudson/view/RiftSaw/job/RiftSaw/ws/

14 years, 10 months

1
0
0 / 0

riftsaw SVN: r501 - trunk/console/integration/src/main/java/org/jboss/soa/bpel/console.

by riftsaw-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2010-02-16 11:33:05 -0500 (Tue, 16 Feb 2010) New Revision: 501 Modified: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ModelAdaptor.java trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessMgmtImpl.java Log: Fix for https://jira.jboss.org/jira/browse/RIFTSAW-136 Modified: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ModelAdaptor.java =================================================================== --- trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ModelAdaptor.java 2010-02-16 15:29:58 UTC (rev 500) +++ trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ModelAdaptor.java 2010-02-16 16:33:05 UTC (rev 501) @@ -60,21 +60,25 @@ return results; } - public static List<ProcessInstanceRef> adoptInstances(InstanceInfoListDocument instanceListDocument) + public static List<ProcessInstanceRef> adoptInstances( + QName procesQName, InstanceInfoListDocument instanceListDocument) { List<ProcessInstanceRef> results = new ArrayList<ProcessInstanceRef>(); for(TInstanceInfo i0 : instanceListDocument.getInstanceInfoList().getInstanceInfoList()) { - ProcessInstanceRef ref = new ProcessInstanceRef( - i0.getIid(), - encodeId(i0.getPid()), - i0.getDtStarted().getTime(), - null, - false // see filter criteria when selecting instances - ); - - results.add(ref); + if(i0.getPid().equals(procesQName.toString())) + { + ProcessInstanceRef ref = new ProcessInstanceRef( + i0.getIid(), + encodeId(i0.getPid()), + i0.getDtStarted().getTime(), + null, + false // see filter criteria when selecting instances + ); + + results.add(ref); + } } return results; Modified: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessMgmtImpl.java =================================================================== --- trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessMgmtImpl.java 2010-02-16 15:29:58 UTC (rev 500) +++ trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessMgmtImpl.java 2010-02-16 16:33:05 UTC (rev 501) @@ -80,15 +80,16 @@ public List<ProcessInstanceRef> getProcessInstances(String definitionId) { String actualId = ModelAdaptor.decodeId(definitionId); - QName qname = QName.valueOf(actualId); + QName processQName = QName.valueOf(actualId); - //TODO: qname.getLocalPart() includes the version number. - String instanceName = qname.getLocalPart().substring(0, qname.getLocalPart().indexOf("-")); + //TODO: processQName.getLocalPart() includes the version number. + String instanceName = processQName.getLocalPart().substring(0, processQName.getLocalPart().indexOf("-")); InstanceInfoListDocument result = getMgmtFacade().listInstances( // filter, order, limit - "name="+ instanceName +" namespace=" + qname.getNamespaceURI()+" status=active", "name", 1000); - - return ModelAdaptor.adoptInstances(result); + "name="+ instanceName +" namespace=" + processQName.getNamespaceURI()+" status=active", "name", 1000); + + + return ModelAdaptor.adoptInstances(processQName, result); } public ProcessInstanceRef getProcessInstance(String instanceId)

14 years, 10 months

1
0
0 / 0

riftsaw SVN: r500 - in trunk/samples/quickstart/simple_correlation: messages and 1 other directory.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2010-02-16 10:29:58 -0500 (Tue, 16 Feb 2010) New Revision: 500 Added: trunk/samples/quickstart/simple_correlation/messages/goodbye_request2.xml trunk/samples/quickstart/simple_correlation/messages/goodbye_request3.xml trunk/samples/quickstart/simple_correlation/messages/hello_request2.xml trunk/samples/quickstart/simple_correlation/messages/hello_request3.xml Modified: trunk/samples/quickstart/simple_correlation/build.xml Log: Added more example messages for the simple_correlation example. Modified: trunk/samples/quickstart/simple_correlation/build.xml =================================================================== --- trunk/samples/quickstart/simple_correlation/build.xml 2010-02-16 12:55:31 UTC (rev 499) +++ trunk/samples/quickstart/simple_correlation/build.xml 2010-02-16 15:29:58 UTC (rev 500) @@ -54,4 +54,60 @@ </classpath> </java> </target> + + <target name="sendhello2"> + <echo>Send test message to: ${ant.project.name}</echo> + <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> + <arg value="http://localhost:8080/Quickstart_bpel_simple_correlationWS"/> + <arg value="messages/hello_request2.xml"/> + <classpath> + <fileset dir="../../common/lib"> + <include name="**/*.jar"/> + </fileset> + <pathelement path="${java.class.path}"/> + </classpath> + </java> + </target> + + <target name="sendgoodbye2"> + <echo>Send test message to: ${ant.project.name}</echo> + <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> + <arg value="http://localhost:8080/Quickstart_bpel_simple_correlationWS"/> + <arg value="messages/goodbye_request2.xml"/> + <classpath> + <fileset dir="../../common/lib"> + <include name="**/*.jar"/> + </fileset> + <pathelement path="${java.class.path}"/> + </classpath> + </java> + </target> + + <target name="sendhello3"> + <echo>Send test message to: ${ant.project.name}</echo> + <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> + <arg value="http://localhost:8080/Quickstart_bpel_simple_correlationWS"/> + <arg value="messages/hello_request3.xml"/> + <classpath> + <fileset dir="../../common/lib"> + <include name="**/*.jar"/> + </fileset> + <pathelement path="${java.class.path}"/> + </classpath> + </java> + </target> + + <target name="sendgoodbye3"> + <echo>Send test message to: ${ant.project.name}</echo> + <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> + <arg value="http://localhost:8080/Quickstart_bpel_simple_correlationWS"/> + <arg value="messages/goodbye_request3.xml"/> + <classpath> + <fileset dir="../../common/lib"> + <include name="**/*.jar"/> + </fileset> + <pathelement path="${java.class.path}"/> + </classpath> + </java> + </target> </project> Added: trunk/samples/quickstart/simple_correlation/messages/goodbye_request2.xml =================================================================== --- trunk/samples/quickstart/simple_correlation/messages/goodbye_request2.xml (rev 0) +++ trunk/samples/quickstart/simple_correlation/messages/goodbye_request2.xml 2010-02-16 15:29:58 UTC (rev 500) @@ -0,0 +1,11 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> + <soapenv:Header/> + <soapenv:Body> + <wsdl:goodbye> + <ID> + <id>2</id> + </ID> + <Message>Goodbye</Message> + </wsdl:goodbye> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file Added: trunk/samples/quickstart/simple_correlation/messages/goodbye_request3.xml =================================================================== --- trunk/samples/quickstart/simple_correlation/messages/goodbye_request3.xml (rev 0) +++ trunk/samples/quickstart/simple_correlation/messages/goodbye_request3.xml 2010-02-16 15:29:58 UTC (rev 500) @@ -0,0 +1,11 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> + <soapenv:Header/> + <soapenv:Body> + <wsdl:goodbye> + <ID> + <id>3</id> + </ID> + <Message>Goodbye</Message> + </wsdl:goodbye> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file Added: trunk/samples/quickstart/simple_correlation/messages/hello_request2.xml =================================================================== --- trunk/samples/quickstart/simple_correlation/messages/hello_request2.xml (rev 0) +++ trunk/samples/quickstart/simple_correlation/messages/hello_request2.xml 2010-02-16 15:29:58 UTC (rev 500) @@ -0,0 +1,11 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> + <soapenv:Header/> + <soapenv:Body> + <wsdl:hello> + <ID> + <id>2</id> + </ID> + <Message>Hello</Message> + </wsdl:hello> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file Added: trunk/samples/quickstart/simple_correlation/messages/hello_request3.xml =================================================================== --- trunk/samples/quickstart/simple_correlation/messages/hello_request3.xml (rev 0) +++ trunk/samples/quickstart/simple_correlation/messages/hello_request3.xml 2010-02-16 15:29:58 UTC (rev 500) @@ -0,0 +1,11 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> + <soapenv:Header/> + <soapenv:Body> + <wsdl:hello> + <ID> + <id>3</id> + </ID> + <Message>Hello</Message> + </wsdl:hello> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file

14 years, 10 months

1
0
0 / 0

riftsaw SVN: r499 - in trunk: integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages and 1 other directories.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2010-02-16 07:55:31 -0500 (Tue, 16 Feb 2010) New Revision: 499 Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp3-cxf.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp3-native.xml Removed: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp3.xml Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java Log: RIFTSAW-162 - fixed - fault returned via an exception, rather than a SOAP message, when using cxf. 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-02-15 14:57:38 UTC (rev 498) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java 2010-02-16 12:55:31 UTC (rev 499) @@ -78,13 +78,10 @@ // 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>"); + assertMessageFromFile(result, "loanresp3-cxf.xml"); + } else { + assertMessageFromFile(result, "loanresp3-native.xml"); } - - assertMessageFromFile(result, "loanresp3.xml"); } public void testSendLoanRequest4() throws Exception { Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp3-cxf.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp3-cxf.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp3-cxf.xml 2010-02-16 12:55:31 UTC (rev 499) @@ -0,0 +1 @@ +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Header /><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode xmlns:ns0="http://example.com/loan-approval/wsdl/">ns0:unableToHandleRequest</faultcode><faultstring>Fault string, and possibly fault code, not set</faultstring><detail><integer xmlns="http://example.com/loan-approval/xsd/error-messages/">21000</integer></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope> \ No newline at end of file Copied: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp3-native.xml (from rev 497, trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp3.xml) =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp3-native.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp3-native.xml 2010-02-16 12:55:31 UTC (rev 499) @@ -0,0 +1 @@ +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><faultcode xmlns:valueNS='http://example.com/loan-approval/wsdl/'>valueNS:unableToHandleRequest</faultcode><detail><ns1:integer xmlns:ns1='http://example.com/loan-approval/xsd/error-messages/'>21000</ns1:integer></detail></env:Fault></env:Body></env:Envelope> \ No newline at end of file Deleted: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp3.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp3.xml 2010-02-15 14:57:38 UTC (rev 498) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp3.xml 2010-02-16 12:55:31 UTC (rev 499) @@ -1 +0,0 @@ -<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><faultcode xmlns:valueNS='http://example.com/loan-approval/wsdl/'>valueNS:unableToHandleRequest</faultcode><detail><ns1:integer xmlns:ns1='http://example.com/loan-approval/xsd/error-messages/'>21000</ns1:integer></detail></env:Fault></env:Body></env:Envelope> \ No newline at end of file Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java 2010-02-15 14:57:38 UTC (rev 498) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java 2010-02-16 12:55:31 UTC (rev 499) @@ -37,6 +37,7 @@ import javax.wsdl.extensions.soap.SOAPHeader; import javax.xml.namespace.QName; import javax.xml.soap.*; + import java.util.*; /** @@ -552,6 +553,34 @@ return fdef; } + public Fault parseSoapFault( + Element odeMessage, + SOAPFault flt, + javax.wsdl.Operation operation) + { + Fault fault=inferFault(operation, flt); + + if(fault!=null) + { + Detail detail = flt.getDetail(); + Part pdef = (Part)fault.getMessage().getParts().values().iterator().next(); + Element partel = odeMessage.getOwnerDocument().createElementNS(null,pdef.getName()); + odeMessage.appendChild(partel); + + Element childByName = DOMUtils.findChildByName(detail, pdef.getElementName()); + if (childByName != null) + { + partel.appendChild(odeMessage.getOwnerDocument().importNode(childByName, true)); + } + else + { + partel.appendChild(odeMessage.getOwnerDocument().importNode(detail,true)); + } + } + + return fault; + } + private Fault inferFault(Operation operation, SOAPFault flt) { if (!flt.hasDetail()) return null; Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-02-15 14:57:38 UTC (rev 498) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-02-16 12:55:31 UTC (rev 499) @@ -135,53 +135,48 @@ // The actual WS invocation Dispatch proxy = getDispatcher(port); - SOAPMessage soapResponseMessage = (SOAPMessage)proxy.invoke(soapRequestMessage); + + try { + SOAPMessage soapResponseMessage = (SOAPMessage)proxy.invoke(soapRequestMessage); + + // Create ODE response + Message odeResponse = mex.createMessage(mex.getOperation().getOutput().getMessage().getQName()); + if(soapResponseMessage.getSOAPBody().hasFault()) + { + // fault handling + Document odeMsg = DOMUtils.newDocument(); + Element odeMsgEl = odeMsg.createElementNS(null, "message"); + odeMsg.appendChild(odeMsgEl); + + Fault fault = messageAdapter.parseSoapFault( + odeMsgEl, soapResponseMessage, mex.getOperation() + ); + + handleFault(mex, fault, soapResponseMessage.getSOAPBody().getFault(), odeMsgEl); + + } + else + { + messageAdapter.parseSoapResponse(odeResponse,soapResponseMessage,mex.getOperation()); + mex.reply(odeResponse); + } + + if(log.isDebugEnabled()) + log.debug( "ODE inbound message: \n" +DOMWriter.printNode(odeResponse.getMessage(), true) ); + + } catch(javax.xml.ws.soap.SOAPFaultException fe) { + + // fault handling + Document odeMsg = DOMUtils.newDocument(); + Element odeMsgEl = odeMsg.createElementNS(null, "message"); + odeMsg.appendChild(odeMsgEl); + + Fault fault=messageAdapter.parseSoapFault(odeMsgEl, fe.getFault(), + mex.getOperation()); - // Create ODE response - Message odeResponse = mex.createMessage(mex.getOperation().getOutput().getMessage().getQName()); - if(soapResponseMessage.getSOAPBody().hasFault()) - { - // fault handling - Document odeMsg = DOMUtils.newDocument(); - Element odeMsgEl = odeMsg.createElementNS(null, "message"); - odeMsg.appendChild(odeMsgEl); - - Fault fault = messageAdapter.parseSoapFault( - odeMsgEl, soapResponseMessage, mex.getOperation() - ); - - if (fault != null) - { - if (log.isWarnEnabled()) - log.warn("Fault response: faultName=" - + fault.getName() + " faultType=" + fault.getMessage().getQName() - + "\n" + DOMWriter.printNode(odeMsgEl, true)); - - QName faultType = fault.getMessage().getQName(); - QName faultName = new QName(wsdlDefintion.getTargetNamespace(), fault.getName()); - Message response = mex.createMessage(faultType); - response.setMessage(odeMsgEl); - - mex.replyWithFault(faultName, response); - } - else - { - if (log.isWarnEnabled()) - log.warn("Fault response: faultType=(unknown)"); - - SOAPFault f = soapResponseMessage.getSOAPBody().getFault(); - mex.replyWithFailure(MessageExchange.FailureType.OTHER, "Unspecified", f.getDetail()); - } + handleFault(mex, fault, fe.getFault(), odeMsgEl); } - else - { - messageAdapter.parseSoapResponse(odeResponse,soapResponseMessage,mex.getOperation()); - mex.reply(odeResponse); - } - if(log.isDebugEnabled()) - log.debug( "ODE inbound message: \n" +DOMWriter.printNode(odeResponse.getMessage(), true) ); - tx.commit(); } catch (Throwable e) @@ -242,7 +237,32 @@ mex.replyOneWayOk(); } } + + private void handleFault(PartnerRoleMessageExchange mex, Fault fault, SOAPFault soapFault, + Element odeMsgEl) { + if (fault != null) + { + if (log.isWarnEnabled()) + log.warn("Fault response: faultName=" + + fault.getName() + " faultType=" + fault.getMessage().getQName() + + "\n" + DOMWriter.printNode(odeMsgEl, true)); + QName faultType = fault.getMessage().getQName(); + QName faultName = new QName(wsdlDefintion.getTargetNamespace(), fault.getName()); + Message response = mex.createMessage(faultType); + response.setMessage(odeMsgEl); + + mex.replyWithFault(faultName, response); + } + else + { + if (log.isWarnEnabled()) + log.warn("Fault response: faultType=(unknown)"); + + mex.replyWithFailure(MessageExchange.FailureType.OTHER, "Unspecified", soapFault.getDetail()); + } + } + private UserTransaction getUserTransaction() throws NamingException {

14 years, 10 months

1
0
0 / 0

riftsaw SVN: r498 - trunk.

by riftsaw-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2010-02-15 09:57:38 -0500 (Mon, 15 Feb 2010) New Revision: 498 Modified: trunk/pom.xml Log: set bpm console version 2.0.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-02-12 17:43:58 UTC (rev 497) +++ trunk/pom.xml 2010-02-15 14:57:38 UTC (rev 498) @@ -68,7 +68,7 @@ <properties> <riftsaw.ode.version>2.0-SNAPSHOT</riftsaw.ode.version> <riftsaw.engine.version>2.0-SNAPSHOT</riftsaw.engine.version> - <bpm.console.version>2.0.0-SNAPSHOT</bpm.console.version> + <bpm.console.version>2.0.1-SNAPSHOT</bpm.console.version> <commons.logging.version>1.1.1</commons.logging.version> <junit.version>3.8.1</junit.version> <jboss.version>5.1.0.GA</jboss.version>

14 years, 10 months

1
0
0 / 0

RiftSaw - Build # 104 - Still Failing!

by jboss-qa-internal＠redhat.com

RiftSaw Build number 104 status: Still Failing Details available at http://hudson.jboss.org/hudson/job/RiftSaw/104/ JBoss server log can be found at workspace, http://hudson.qa.jboss.com/hudson/view/RiftSaw/job/RiftSaw/ws/

14 years, 10 months

1
0
0 / 0

RiftSaw - Build # 103 - Failure!

by jboss-qa-internal＠redhat.com

RiftSaw Build number 103 status: Failure Details available at http://hudson.jboss.org/hudson/job/RiftSaw/103/ JBoss server log can be found at workspace, http://hudson.qa.jboss.com/hudson/view/RiftSaw/job/RiftSaw/ws/

14 years, 10 months

1
0
0 / 0

riftsaw SVN: r497 - in trunk: integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_wsdl/messages and 1 other directories.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2010-02-12 12:43:58 -0500 (Fri, 12 Feb 2010) New Revision: 497 Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_wsdl/bpel/HelloWorld.bpel trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_wsdl/messages/hello_response1.xml trunk/samples/quickstart/hello_world_header_wsdl/bpelContent/HelloWorld.bpel Log: Updated WSDL header example and integration test to modify the returned header property. Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_wsdl/bpel/HelloWorld.bpel =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_wsdl/bpel/HelloWorld.bpel 2010-02-12 15:54:16 UTC (rev 496) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_wsdl/bpel/HelloWorld.bpel 2010-02-12 17:43:58 UTC (rev 497) @@ -63,6 +63,10 @@ <from>concat($mesgVar,' World', ' conversationId=', $conversationId)</from> <to variable="myVar" part="TestPart"/> </copy> + <copy> + <from>concat($conversationId,'6789')</from> + <to variable="myVar" part="conversationId"/> + </copy> </assign> <reply name="end" partnerLink="helloPartnerLink" Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_wsdl/messages/hello_response1.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_wsdl/messages/hello_response1.xml 2010-02-12 15:54:16 UTC (rev 496) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_header_wsdl/messages/hello_response1.xml 2010-02-12 17:43:58 UTC (rev 497) @@ -1 +1 @@ -<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header><ns:conversationId xmlns:ns='http://www.jboss.org/cid'>12345</ns:conversationId></env:Header><env:Body><odens:helloResponse xmlns:odens='http://www.jboss.org/bpel/examples/wsdl'><TestPart>Hello World conversationId=12345</TestPart></odens:helloResponse></env:Body></env:Envelope> \ No newline at end of file +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header><ns:conversationId xmlns:ns='http://www.jboss.org/cid'>123456789</ns:conversationId></env:Header><env:Body><odens:helloResponse xmlns:odens='http://www.jboss.org/bpel/examples/wsdl'><TestPart>Hello World conversationId=12345</TestPart></odens:helloResponse></env:Body></env:Envelope> \ No newline at end of file Modified: trunk/samples/quickstart/hello_world_header_wsdl/bpelContent/HelloWorld.bpel =================================================================== --- trunk/samples/quickstart/hello_world_header_wsdl/bpelContent/HelloWorld.bpel 2010-02-12 15:54:16 UTC (rev 496) +++ trunk/samples/quickstart/hello_world_header_wsdl/bpelContent/HelloWorld.bpel 2010-02-12 17:43:58 UTC (rev 497) @@ -63,6 +63,10 @@ <from>concat($mesgVar,' World', ' conversationId=', $conversationId)</from> <to variable="myVar" part="TestPart"/> </copy> + <copy> + <from>concat($conversationId,'6789')</from> + <to variable="myVar" part="conversationId"/> + </copy> </assign> <reply name="end" partnerLink="helloPartnerLink"

14 years, 10 months

1
0
0 / 0

riftsaw SVN: r496 - in trunk: integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages and 2 other directories.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2010-02-12 10:54:16 -0500 (Fri, 12 Feb 2010) New Revision: 496 Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp4-cxf.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp4-native.xml Removed: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp4.xml Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/war/src/com/example/loan_approval/wsdl/LoanApprovalPTImpl.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/war/src/com/example/loan_approval/wsdl/RiskAssessmentPTImpl.java trunk/samples/quickstart/loan_approval/war/src/com/example/loan_approval/wsdl/LoanApprovalPTImpl.java trunk/samples/quickstart/loan_approval/war/src/com/example/loan_approval/wsdl/RiskAssessmentPTImpl.java Log: Fixed three of the loan approval integration tests on CXF - fourth one still failing due to exception thrown from JAX-WS service not being interpreted as a SOAP/BPEL fault for receipt by the BPEL process. 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-02-11 11:27:57 UTC (rev 495) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java 2010-02-12 15:54:16 UTC (rev 496) @@ -39,13 +39,21 @@ public static Test suite() { return(new RiftSawTestSetup(QuickstartBPELLoanApprovalTestCase.class, - TEST_NAME, "Quickstart_bpel_loan_approval-1.jar,Quickstart_bpel_loan_approval.war")); + TEST_NAME, "Quickstart_bpel_loan_approval.war,Quickstart_bpel_loan_approval-1.jar")); } public void testSendLoanRequest1() throws Exception { 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>"); + } + assertMessageFromFile(result, "loanresp1.xml"); } @@ -53,6 +61,14 @@ 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>"); + } + assertMessageFromFile(result, "loanresp2.xml"); } @@ -60,6 +76,14 @@ String result=sendSOAPMessage("loanreq3.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>"); + } + assertMessageFromFile(result, "loanresp3.xml"); } @@ -67,6 +91,11 @@ String result=sendSOAPMessage("loanreq4.xml", "http://localhost:8080/Quickstart_bpel_loan_approvalWS"); - assertMessageFromFile(result, "loanresp4.xml"); + // If testing against cxf, then result is presented slightly differently + if (result.indexOf("SOAP-ENV") != -1) { + assertMessageFromFile(result, "loanresp4-cxf.xml"); + } else { + assertMessageFromFile(result, "loanresp4-native.xml"); + } } } Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp4-cxf.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp4-cxf.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp4-cxf.xml 2010-02-12 15:54:16 UTC (rev 496) @@ -0,0 +1 @@ +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Header /><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode xmlns:ns0="http://example.com/loan-approval/wsdl/">ns0:unableToHandleRequest</faultcode><faultstring>Fault string, and possibly fault code, not set</faultstring><detail><integer xmlns="http://example.com/loan-approval/xsd/error-messages/">1</integer></detail></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope> \ No newline at end of file Copied: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp4-native.xml (from rev 487, trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp4.xml) =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp4-native.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp4-native.xml 2010-02-12 15:54:16 UTC (rev 496) @@ -0,0 +1 @@ +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><faultcode xmlns:valueNS='http://example.com/loan-approval/wsdl/'>valueNS:unableToHandleRequest</faultcode><detail><integer xmlns='http://example.com/loan-approval/xsd/error-messages/'>1</integer></detail></env:Fault></env:Body></env:Envelope> \ No newline at end of file Deleted: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp4.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp4.xml 2010-02-11 11:27:57 UTC (rev 495) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp4.xml 2010-02-12 15:54:16 UTC (rev 496) @@ -1 +0,0 @@ -<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><faultcode xmlns:valueNS='http://example.com/loan-approval/wsdl/'>valueNS:unableToHandleRequest</faultcode><detail><integer xmlns='http://example.com/loan-approval/xsd/error-messages/'>1</integer></detail></env:Fault></env:Body></env:Envelope> \ No newline at end of file Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/war/src/com/example/loan_approval/wsdl/LoanApprovalPTImpl.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/war/src/com/example/loan_approval/wsdl/LoanApprovalPTImpl.java 2010-02-11 11:27:57 UTC (rev 495) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/war/src/com/example/loan_approval/wsdl/LoanApprovalPTImpl.java 2010-02-12 15:54:16 UTC (rev 496) @@ -10,7 +10,7 @@ @WebService(targetNamespace = "http://example.com/loan-approval/wsdl/", -endpointInterface="com.example.loan_approval.wsdl.LoanApprovalPT", portName="loanApprover_Port") +endpointInterface="com.example.loan_approval.wsdl.LoanApprovalPT", serviceName="loanApprover", portName="loanApprover_Port") public class LoanApprovalPTImpl implements LoanApprovalPT { public String approve(String firstName, String name, Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/war/src/com/example/loan_approval/wsdl/RiskAssessmentPTImpl.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/war/src/com/example/loan_approval/wsdl/RiskAssessmentPTImpl.java 2010-02-11 11:27:57 UTC (rev 495) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/war/src/com/example/loan_approval/wsdl/RiskAssessmentPTImpl.java 2010-02-12 15:54:16 UTC (rev 496) @@ -5,28 +5,29 @@ import javax.jws.WebService; @WebService( - endpointInterface="com.example.loan_approval.wsdl.RiskAssessmentPT", - targetNamespace = "http://example.com/loan-approval/wsdl/", - portName="riskAssessor_Port") + endpointInterface="com.example.loan_approval.wsdl.RiskAssessmentPT", + targetNamespace = "http://example.com/loan-approval/wsdl/", + serviceName="riskAssessor", + portName="riskAssessor_Port") public class RiskAssessmentPTImpl implements RiskAssessmentPT { - public String check( - String firstName, - String name, - BigInteger amount) - throws ErrorMessage { - System.out.println("\nRiskAssessmentPTImpl"); - System.out.println("*************************************************"); - System.out.println("firstName Parameter: " + firstName ); - System.out.println("name Parameter: " + name ); - System.out.println("amount Parameter: " + amount ); - System.out.println("*************************************************"); - System.out.println("\n"); - - if (amount.intValue() <= 10000) - return "low"; - else - return "high"; - } - + public String check( + String firstName, + String name, + BigInteger amount) + throws ErrorMessage { + System.out.println("\nRiskAssessmentPTImpl"); + System.out.println("*************************************************"); + System.out.println("firstName Parameter: " + firstName ); + System.out.println("name Parameter: " + name ); + System.out.println("amount Parameter: " + amount ); + System.out.println("*************************************************"); + System.out.println("\n"); + + if (amount.intValue() <= 10000) + return "low"; + else + return "high"; + } + } Modified: trunk/samples/quickstart/loan_approval/war/src/com/example/loan_approval/wsdl/LoanApprovalPTImpl.java =================================================================== --- trunk/samples/quickstart/loan_approval/war/src/com/example/loan_approval/wsdl/LoanApprovalPTImpl.java 2010-02-11 11:27:57 UTC (rev 495) +++ trunk/samples/quickstart/loan_approval/war/src/com/example/loan_approval/wsdl/LoanApprovalPTImpl.java 2010-02-12 15:54:16 UTC (rev 496) @@ -10,7 +10,7 @@ @WebService(targetNamespace = "http://example.com/loan-approval/wsdl/", -endpointInterface="com.example.loan_approval.wsdl.LoanApprovalPT", portName="loanApprover_Port") +endpointInterface="com.example.loan_approval.wsdl.LoanApprovalPT", serviceName="loanApprover", portName="loanApprover_Port") public class LoanApprovalPTImpl implements LoanApprovalPT { public String approve(String firstName, String name, Modified: trunk/samples/quickstart/loan_approval/war/src/com/example/loan_approval/wsdl/RiskAssessmentPTImpl.java =================================================================== --- trunk/samples/quickstart/loan_approval/war/src/com/example/loan_approval/wsdl/RiskAssessmentPTImpl.java 2010-02-11 11:27:57 UTC (rev 495) +++ trunk/samples/quickstart/loan_approval/war/src/com/example/loan_approval/wsdl/RiskAssessmentPTImpl.java 2010-02-12 15:54:16 UTC (rev 496) @@ -6,7 +6,8 @@ @WebService( endpointInterface="com.example.loan_approval.wsdl.RiskAssessmentPT", - targetNamespace = "http://example.com/loan-approval/wsdl/", + targetNamespace = "http://example.com/loan-approval/wsdl/", + serviceName="riskAssessor", portName="riskAssessor_Port") public class RiskAssessmentPTImpl implements RiskAssessmentPT {

14 years, 10 months

1
0
0 / 0

riftsaw SVN: r495 - in trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests: testcases and 1 other directory.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2010-02-11 06:27:57 -0500 (Thu, 11 Feb 2010) New Revision: 495 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/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/QuickstartBPELSimplePickTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw118TestCase.java Log: Updated integration tests to cope with the slightly different format of the messages when using CXF. Currently doing this work in each test, rather than in the message verification code, to make it explicit that this is happening. Later might want to move into the common code, or find a DOM comparison utility that can compare the messages to the necessary level of detail. 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-02-10 18:29:21 UTC (rev 494) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldExtendedTimeoutTestCase.java 2010-02-11 11:27:57 UTC (rev 495) @@ -46,6 +46,14 @@ 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>"); + } + 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-02-10 18:29:21 UTC (rev 494) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java 2010-02-11 11:27:57 UTC (rev 495) @@ -47,6 +47,13 @@ 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("\"","'"); + } + 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-02-10 18:29:21 UTC (rev 494) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java 2010-02-11 11:27:57 UTC (rev 495) @@ -46,6 +46,14 @@ 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>"); + } + 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-02-10 18:29:21 UTC (rev 494) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java 2010-02-11 11:27:57 UTC (rev 495) @@ -46,11 +46,27 @@ 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>"); + } + 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>"); + } + assertMessageFromFile(result2, "hello_response1.xml"); } @@ -58,11 +74,27 @@ 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>"); + } + 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>"); + } + assertMessageFromFile(result2, "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-02-10 18:29:21 UTC (rev 494) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw118TestCase.java 2010-02-11 11:27:57 UTC (rev 495) @@ -46,6 +46,14 @@ 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>"); + } + // Comment out until RIFTSAW-118 is fixed assertMessageFromFile(result, "hello_response1.xml"); }

14 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 February 2010