riftsaw SVN: r1201 - in branches/RiftSaw-2.1.x: integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases and 6 other directories.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-12-09 08:55:39 -0500 (Thu, 09 Dec 2010)
New Revision: 1201
Added:
branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw326TestCase.java
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerMain.bpel
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerResponder.bpel
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Main.wsdl
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Responder.wsdl
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/deploy.xml
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/build.xml
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/request.xml
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/response.xml
Modified:
branches/RiftSaw-2.1.x/integration-tests/build.xml
branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/EndpointReferenceContextImpl.java
branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ServiceEndpointReference.java
Log:
RIFTSAW-326 - fixed npe associated with ODE DynPartner example.
Modified: branches/RiftSaw-2.1.x/integration-tests/build.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/build.xml 2010-12-09 11:21:36 UTC (rev 1200)
+++ branches/RiftSaw-2.1.x/integration-tests/build.xml 2010-12-09 13:55:39 UTC (rev 1201)
@@ -194,6 +194,7 @@
<ant antfile="src/test/resources/testcases/RiftSaw_299_peer/build.xml" />
<ant antfile="src/test/resources/testcases/RiftSaw_299_ws/build.xml" />
<ant antfile="src/test/resources/testcases/RiftSaw_312/build.xml" />
+ <ant antfile="src/test/resources/testcases/RiftSaw_326/build.xml" />
<ant antfile="src/test/resources/tutorials/BluePrint1/build.xml" />
<ant antfile="src/test/resources/tutorials/BluePrint2/build.xml" />
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw326TestCase.java
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw326TestCase.java (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw326TestCase.java 2010-12-09 13:55:39 UTC (rev 1201)
@@ -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.testcases;
+
+import org.jboss.soa.bpel.tests.RiftSawTest;
+import org.jboss.soa.bpel.tests.RiftSawTestSetup;
+
+import junit.framework.Test;
+
+/**
+ * Test case for running the RiftSaw_326 testcase.
+ */
+public class RiftSaw326TestCase extends RiftSawTest {
+
+ private static final String TEST_NAME = "RiftSaw_326";
+
+ public RiftSaw326TestCase() {
+ super(TEST_NAME);
+ }
+
+ public static Test suite() {
+ return(new RiftSawTestSetup(RiftSaw326TestCase.class,
+ TEST_NAME, "RiftSaw_326-1.jar"));
+ }
+
+ public void testSendHello() throws Exception {
+ String result=sendSOAPMessage("request.xml",
+ "http://localhost:8080/dynpartner/DynMainService");
+
+ result = processResult(result);
+
+ assertMessageFromFile(result, "response.xml");
+ }
+}
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerMain.bpel
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerMain.bpel (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerMain.bpel 2010-12-09 13:55:39 UTC (rev 1201)
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<process name="DynPartnerMain"
+ targetNamespace="http://ode/bpel/unit-test"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ xmlns:sref="http://docs.oasis-open.org/wsbpel/2.0/serviceref"
+ xmlns:tns="http://ode/bpel/unit-test"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:test="http://ode/bpel/unit-test.wsdl"
+ xmlns:resp="http://ode/bpel/responder.wsdl"
+ queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+
+ <import location="Main.wsdl" namespace="http://ode/bpel/unit-test.wsdl"
+ importType="http://schemas.xmlsoap.org/wsdl/" />
+
+ <partnerLinks>
+ <partnerLink name="initiatorPartnerLink" partnerLinkType="test:InitiatorPartnerLinkType"
+ myRole="me"/>
+ <partnerLink name="responderPartnerLink" partnerLinkType="resp:ResponderPartnerLinkType"
+ partnerRole="responder" initializePartnerRole="yes"/>
+ </partnerLinks>
+
+ <variables>
+ <variable name="dummy" messageType="resp:DummyMessage"/>
+ <variable name="dummy2" messageType="resp:Dummy2Message"/>
+ <variable name="partnerEndpoint" messageType="resp:EndpointMessage"/>
+ <variable name="partnerAck" messageType="resp:AcknowledgementMessage"/>
+ <variable name="result" messageType="test:ResultMessage"/>
+ <!-- <variable name="wsaVar" messageType="resp:WSAEndpointMessage"/> -->
+ </variables>
+
+ <correlationSets>
+ <correlationSet name="dummyCorr" properties="test:dummyProp" />
+ </correlationSets>
+
+ <sequence>
+ <receive name="start" partnerLink="initiatorPartnerLink"
+ portType="test:DynMainPortType" operation="execute" createInstance="yes" variable="dummy"/>
+
+ <invoke name="get-endpoint" partnerLink="responderPartnerLink" portType="resp:DynResponderPortType"
+ operation="getDynamicEndpoint" inputVariable="dummy" outputVariable="partnerEndpoint">
+ <correlations>
+ <correlation set="dummyCorr" initiate="yes" pattern="request"/>
+ </correlations>
+ </invoke>
+
+ <assign>
+ <copy>
+ <!-- Partner link assignment using the value returned by previous invoke -->
+ <from>$partnerEndpoint.payload</from>
+ <to partnerLink="responderPartnerLink"/>
+ </copy>
+ <copy>
+ <!-- Just needed for correlation -->
+ <from>$dummy.payload</from>
+ <to variable="dummy2" part="payload"/>
+ </copy>
+ </assign>
+
+ <!-- Invoking the partner link service endpoint that has just been assigned -->
+ <invoke name="dynamic-invoke" partnerLink="responderPartnerLink" portType="resp:DynResponderPortType"
+ operation="acknowledge" inputVariable="dummy2" outputVariable="partnerAck">
+ <correlations>
+ <correlation set="dummyCorr" initiate="no" pattern="request"/>
+ </correlations>
+ </invoke>
+
+ <!-- Playing around with epr conversion (url to wsa) -->
+ <assign>
+ <copy>
+ <from>
+ <literal>http://localhost:8080/dynpartner/DynResponderService</literal>
+ </from>
+ <to partnerLink="responderPartnerLink"/>
+ </copy>
+ <copy>
+ <from>
+ <literal>
+ <sref:service-ref>
+ <soap:address location="http://localhost:8080/dynpartner/DynResponderService"/>
+ </sref:service-ref>
+ </literal>
+ </from>
+ <to partnerLink="responderPartnerLink"/>
+ </copy>
+<!--
+ <copy>
+ <from partnerLink="responderPartnerLink" endpointReference="partnerRole"/>
+ <to variable="wsaVar" part="payload"/>
+ </copy>
+ <copy>
+ <from variable="wsaVar" part="payload"/>
+ <to partnerLink="responderPartnerLink"/>
+ </copy>
+-->
+ </assign>
+
+ <!-- Invoking the partner link service endpoint that has just been explicitly assigned -->
+ <invoke name="dynamic-invoke" partnerLink="responderPartnerLink" portType="resp:DynResponderPortType"
+ operation="acknowledge" inputVariable="dummy2" outputVariable="partnerAck">
+ <correlations>
+ <correlation set="dummyCorr" initiate="no" pattern="request"/>
+ </correlations>
+ </invoke>
+
+ <assign>
+ <copy>
+ <from variable="partnerAck" part="payload"/>
+ <to variable="result" part="ack"/>
+ </copy>
+ </assign>
+
+ <reply name="end" partnerLink="initiatorPartnerLink"
+ portType="test:DynMainPortType" operation="execute" variable="result">
+ </reply>
+
+ </sequence>
+</process>
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerResponder.bpel
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerResponder.bpel (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerResponder.bpel 2010-12-09 13:55:39 UTC (rev 1201)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<process name="DynPartnerResponder"
+ targetNamespace="http://ode/bpel/responder"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ xmlns:tns="http://ode/bpel/responder"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:resp="http://ode/bpel/responder.wsdl">
+
+ <import location="Responder.wsdl" namespace="http://ode/bpel/responder.wsdl"
+ importType="http://schemas.xmlsoap.org/wsdl/" />
+
+ <partnerLinks>
+ <partnerLink name="mainPartnerLink" partnerLinkType="resp:ResponderPartnerLinkType"
+ myRole="responder"/>
+ </partnerLinks>
+
+ <variables>
+ <variable name="dummy" messageType="resp:DummyMessage"/>
+ <variable name="dummy2" messageType="resp:Dummy2Message"/>
+ <variable name="myEndpoint" messageType="resp:EndpointMessage"/>
+ <variable name="ack" messageType="resp:AcknowledgementMessage"/>
+ </variables>
+
+ <correlationSets>
+ <correlationSet name="dummyCorr" properties="resp:dummyProp" />
+ </correlationSets>
+
+ <sequence>
+ <receive name="start" partnerLink="mainPartnerLink" variable="dummy"
+ portType="resp:DynResponderPortType" operation="getDynamicEndpoint" createInstance="yes">
+ <correlations>
+ <correlation set="dummyCorr" initiate="yes"/>
+ </correlations>
+ </receive>
+ <assign>
+ <copy>
+ <from partnerLink="mainPartnerLink" endpointReference="myRole"/>
+ <to>$myEndpoint.payload</to>
+ </copy>
+ </assign>
+ <reply name="reply-endpoint" partnerLink="mainPartnerLink"
+ portType="resp:DynResponderPortType" operation="getDynamicEndpoint" variable="myEndpoint"/>
+
+ <receive name="dyn-invoke" partnerLink="mainPartnerLink" variable="dummy2"
+ portType="resp:DynResponderPortType" operation="acknowledge">
+ <correlations>
+ <correlation set="dummyCorr" initiate="no"/>
+ </correlations>
+ </receive>
+ <assign>
+ <copy>
+ <from>'OK'</from>
+ <to variable="ack" part="payload"/>
+ </copy>
+ </assign>
+ <reply name="reply-ack" partnerLink="mainPartnerLink"
+ portType="resp:DynResponderPortType" operation="acknowledge" variable="ack"/>
+
+ <receive name="dyn-invoke2" partnerLink="mainPartnerLink" variable="dummy2"
+ portType="resp:DynResponderPortType" operation="acknowledge">
+ <correlations>
+ <correlation set="dummyCorr" initiate="no"/>
+ </correlations>
+ </receive>
+ <reply name="reply-ack" partnerLink="mainPartnerLink"
+ portType="resp:DynResponderPortType" operation="acknowledge" variable="ack"/>
+
+ </sequence>
+</process>
\ No newline at end of file
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Main.wsdl
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Main.wsdl (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Main.wsdl 2010-12-09 13:55:39 UTC (rev 1201)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<wsdl:definitions
+ targetNamespace="http://ode/bpel/unit-test.wsdl"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://ode/bpel/unit-test.wsdl"
+ xmlns:resp="http://ode/bpel/responder.wsdl"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
+ xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
+
+ <import namespace="http://ode/bpel/responder.wsdl" location="Responder.wsdl"/>
+
+ <wsdl:types>
+ <xsd:schema targetNamespace="http://ode/bpel/unit-test.wsdl">
+ <xsd:element name="result" type="xsd:string"/>
+ </xsd:schema>
+ </wsdl:types>
+
+ <wsdl:message name="ResultMessage">
+ <wsdl:part name="ack" element="tns:result"/>
+ </wsdl:message>
+
+ <wsdl:portType name="DynMainPortType">
+ <wsdl:operation name="execute">
+ <wsdl:input message="resp:DummyMessage" name="dummy"/>
+ <wsdl:output message="tns:ResultMessage" name="result"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:binding name="DynMainBinding" type="tns:DynMainPortType">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="execute">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input>
+ <soap:body namespace="http://ode/bpel/unit-test.wsdl" use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body namespace="http://ode/bpel/unit-test.wsdl" use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:service name="DynMainService">
+ <wsdl:port name="DynMainPort" binding="tns:DynMainBinding">
+ <soap:address location="http://localhost:8080/dynpartner/DynMainService"/>
+ </wsdl:port>
+ </wsdl:service>
+
+ <plnk:partnerLinkType name="InitiatorPartnerLinkType">
+ <plnk:role name="me" portType="tns:DynMainPortType"/>
+ </plnk:partnerLinkType>
+
+ <prop:property name="dummyProp" type="xsd:string"/>
+ <prop:propertyAlias propertyName="tns:dummyProp" messageType="resp:DummyMessage"
+ part="payload"/>
+ <prop:propertyAlias propertyName="tns:dummyProp" messageType="resp:Dummy2Message"
+ part="payload"/>
+
+</wsdl:definitions>
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Responder.wsdl
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Responder.wsdl (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Responder.wsdl 2010-12-09 13:55:39 UTC (rev 1201)
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<wsdl:definitions
+ targetNamespace="http://ode/bpel/responder.wsdl"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://ode/bpel/responder.wsdl"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
+ xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
+ xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
+
+ <wsdl:types>
+ <xsd:schema targetNamespace="http://ode/bpel/responder.wsdl">
+ <xsd:element name="dummy" type="xsd:string"/>
+ <xsd:element name="dummy2" type="xsd:string"/>
+ <xsd:element name="acknowledgement" type="xsd:string"/>
+ <xsd:element name="url" type="xsd:string"/>
+ </xsd:schema>
+ </wsdl:types>
+
+ <wsdl:message name="DummyMessage">
+ <wsdl:part name="payload" element="tns:dummy"/>
+ </wsdl:message>
+
+ <wsdl:message name="Dummy2Message">
+ <wsdl:part name="payload" element="tns:dummy2"/>
+ </wsdl:message>
+
+ <wsdl:message name="EndpointMessage">
+ <wsdl:part name="payload" element="tns:url"/>
+ </wsdl:message>
+
+<!--
+ <wsdl:message name="WSAEndpointMessage">
+ <wsdl:part name="payload" element="wsa:EndpointReference"/>
+ </wsdl:message>
+-->
+
+ <wsdl:message name="AcknowledgementMessage">
+ <wsdl:part name="payload" element="tns:acknowledgement"/>
+ </wsdl:message>
+
+ <wsdl:portType name="DynResponderPortType">
+ <wsdl:operation name="getDynamicEndpoint">
+ <wsdl:input message="tns:DummyMessage" name="dummy"/>
+ <wsdl:output message="tns:EndpointMessage" name="endpoint"/>
+ </wsdl:operation>
+ <wsdl:operation name="acknowledge">
+ <wsdl:input message="tns:Dummy2Message" name="dummy2"/>
+ <wsdl:output message="tns:AcknowledgementMessage" name="ack"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:binding name="DynResponderBinding" type="tns:DynResponderPortType">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="getDynamicEndpoint">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input>
+ <soap:body namespace="http://ode/bpel/responder.wsdl" use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body namespace="http://ode/bpel/responder.wsdl" use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="acknowledge">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input>
+ <soap:body namespace="http://ode/bpel/responder.wsdl" use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body namespace="http://ode/bpel/responder.wsdl" use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:service name="DynResponderService">
+ <wsdl:port name="DynResponderPort" binding="tns:DynResponderBinding">
+ <soap:address location="http://localhost:8080/dynpartner/DynResponderService"/>
+ </wsdl:port>
+ </wsdl:service>
+
+ <plnk:partnerLinkType name="ResponderPartnerLinkType">
+ <plnk:role name="responder" portType="tns:DynResponderPortType"/>
+ </plnk:partnerLinkType>
+
+ <prop:property name="dummyProp" type="xsd:string"/>
+ <prop:propertyAlias propertyName="tns:dummyProp" messageType="tns:DummyMessage"
+ part="payload"/>
+ <prop:propertyAlias propertyName="tns:dummyProp" messageType="tns:Dummy2Message"
+ part="payload"/>
+
+</wsdl:definitions>
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/deploy.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/deploy.xml (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/deploy.xml 2010-12-09 13:55:39 UTC (rev 1201)
@@ -0,0 +1,40 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
+ xmlns:main="http://ode/bpel/unit-test"
+ xmlns:mws="http://ode/bpel/unit-test.wsdl"
+ xmlns:resp="http://ode/bpel/responder"
+ xmlns:rws="http://ode/bpel/responder.wsdl">
+
+ <process name="main:DynPartnerMain">
+ <provide partnerLink="initiatorPartnerLink">
+ <service name="mws:DynMainService" port="DynMainPort"/>
+ </provide>
+ <invoke partnerLink="responderPartnerLink">
+ <service name="rws:DynResponderService" port="DynResponderPort"/>
+ </invoke>
+ </process>
+ <process name="resp:DynPartnerResponder">
+ <in-memory>true</in-memory>
+ <type>resp:DynPartnerResponder</type>
+ <provide partnerLink="mainPartnerLink">
+ <service name="rws:DynResponderService" port="DynResponderPort"/>
+ </provide>
+ </process>
+</deploy>
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/build.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/build.xml (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/build.xml 2010-12-09 13:55:39 UTC (rev 1201)
@@ -0,0 +1,30 @@
+<project name="RiftSaw_326" 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/testcases/${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/testcases/RiftSaw_326/messages/request.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/request.xml (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/request.xml 2010-12-09 13:55:39 UTC (rev 1201)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
+ <!-- test soap message -->
+ <SOAP-ENV:Body>
+ <ns2:dummy xmlns:ns2="http://ode/bpel/responder.wsdl">fire!</ns2:dummy>
+ </SOAP-ENV:Body>
+</SOAP-ENV:Envelope>
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/response.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/response.xml (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/response.xml 2010-12-09 13:55:39 UTC (rev 1201)
@@ -0,0 +1 @@
+<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><result xmlns='http://ode/bpel/unit-test.wsdl'>OK</result></env:Body></env:Envelope>
\ No newline at end of file
Modified: branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/EndpointReferenceContextImpl.java
===================================================================
--- branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/EndpointReferenceContextImpl.java 2010-12-09 11:21:36 UTC (rev 1200)
+++ branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/EndpointReferenceContextImpl.java 2010-12-09 13:55:39 UTC (rev 1201)
@@ -45,6 +45,8 @@
}
public EndpointReference convertEndpoint(QName qName, Element element) {
+ if (log.isDebugEnabled())
+ log.debug("Convert endpoint reference: qname="+qName+" element="+DOMUtils.domToString(element));
EndpointReference endpoint = EndpointFactory.convert(qName, element);
return endpoint;
}
Modified: branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ServiceEndpointReference.java
===================================================================
--- branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ServiceEndpointReference.java 2010-12-09 11:21:36 UTC (rev 1200)
+++ branches/RiftSaw-2.1.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ServiceEndpointReference.java 2010-12-09 13:55:39 UTC (rev 1201)
@@ -22,6 +22,7 @@
package org.jboss.soa.bpel.runtime.ws;
import org.apache.ode.bpel.iapi.EndpointReference;
+import org.apache.ode.utils.Namespaces;
import org.w3c.dom.Document;
/**
@@ -59,7 +60,7 @@
try {
ret = javax.xml.parsers.DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
- org.w3c.dom.Element elem=ret.createElement("attr");
+ org.w3c.dom.Element elem=ret.createElementNS(Namespaces.SOAP_NS, "address");
elem.setAttribute("location", serviceUrl);
elem.setAttribute("endpointId", endpointId);
elem.setAttribute("deploymentName", deploymentName);
13 years, 6 months
- 1
- 0
Hudson build became unstable: RiftSaw #310
by jboss-qa-internal＠redhat.com
See <http://hudson.qa.jboss.com/hudson/job/RiftSaw/310/changes>
13 years, 6 months
- 1
- 14
riftsaw SVN: r1200 - trunk/qa.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-12-09 06:21:36 -0500 (Thu, 09 Dec 2010)
New Revision: 1200
Modified:
trunk/qa/hudson-riftsaw-jboss-no-esb.sh
trunk/qa/hudson-riftsaw-jboss.sh
trunk/qa/hudson-riftsaw-local.sh
trunk/qa/hudson-riftsaw-soa-p.sh
trunk/qa/hudson-riftsaw-ws.sh
Log:
* added 'download.dir' value into the bash script parameters.
Modified: trunk/qa/hudson-riftsaw-jboss-no-esb.sh
===================================================================
--- trunk/qa/hudson-riftsaw-jboss-no-esb.sh 2010-12-08 14:01:08 UTC (rev 1199)
+++ trunk/qa/hudson-riftsaw-jboss-no-esb.sh 2010-12-09 11:21:36 UTC (rev 1200)
@@ -20,7 +20,7 @@
WS_VERSION="3.2.2.GA"
WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads"
-ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY -Dtestesb=false"
+ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dstartup.time=$STARTUP_TIME -Ddownload.dir=$DOWNLOAD_DIR -Dtest.delay=$TEST_DELAY -Dtestesb=false"
echo ANT_PROPERTIES=${ANT_PROPERTIES}
# build RiftSaw and running unit test
Modified: trunk/qa/hudson-riftsaw-jboss.sh
===================================================================
--- trunk/qa/hudson-riftsaw-jboss.sh 2010-12-08 14:01:08 UTC (rev 1199)
+++ trunk/qa/hudson-riftsaw-jboss.sh 2010-12-09 11:21:36 UTC (rev 1200)
@@ -22,7 +22,7 @@
WS_VERSION="3.2.2.GA"
WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads"
-ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg_jboss_esb_home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY"
+ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg_jboss_esb_home=$JBOSS_ESB_HOME -Ddownload.dir=$DOWNLOAD_DIR -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY"
echo ANT_PROPERTIES=${ANT_PROPERTIES}
# build RiftSaw and running unit test
Modified: trunk/qa/hudson-riftsaw-local.sh
===================================================================
--- trunk/qa/hudson-riftsaw-local.sh 2010-12-08 14:01:08 UTC (rev 1199)
+++ trunk/qa/hudson-riftsaw-local.sh 2010-12-09 11:21:36 UTC (rev 1200)
@@ -22,7 +22,7 @@
WS_VERSION="3.2.2.GA"
WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads"
-ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Ddownload.dir=$DOWNLOAD_DIR -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg_jboss_esb_home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME"
+ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Ddownload.dir=$DOWNLOAD_DIR -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg_jboss_esb_home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME -Ddownload.dir=$DOWNLOAD_DIR"
echo ANT_PROPERTIES=${ANT_PROPERTIES}
# build RiftSaw and running unit test
Modified: trunk/qa/hudson-riftsaw-soa-p.sh
===================================================================
--- trunk/qa/hudson-riftsaw-soa-p.sh 2010-12-08 14:01:08 UTC (rev 1199)
+++ trunk/qa/hudson-riftsaw-soa-p.sh 2010-12-09 11:21:36 UTC (rev 1200)
@@ -25,7 +25,7 @@
STARTUP_TIME="6"
TEST_DELAY="40000"
-ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg_jboss_esb_home=$JBOSS_ESB_HOME -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dstartup.time=$STARTUP_TIME -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY"
+ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg_jboss_esb_home=$JBOSS_ESB_HOME -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dstartup.time=$STARTUP_TIME -Ddownload.dir=$DOWNLOAD_DIR -Dtest.delay=$TEST_DELAY"
echo ANT_PROPERTIES=${ANT_PROPERTIES}
#build RiftSaw and running unit tests
Modified: trunk/qa/hudson-riftsaw-ws.sh
===================================================================
--- trunk/qa/hudson-riftsaw-ws.sh 2010-12-08 14:01:08 UTC (rev 1199)
+++ trunk/qa/hudson-riftsaw-ws.sh 2010-12-09 11:21:36 UTC (rev 1200)
@@ -23,7 +23,7 @@
STARTUP_TIME="6"
TEST_DELAY="40000"
-ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Dws.stack=$WS_STACK -Dws.stack.dir=$WS_STACK_DIR -Dws.version=$WS_VERSION -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg_jboss_esb_home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY"
+ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Dws.stack=$WS_STACK -Dws.stack.dir=$WS_STACK_DIR -Dws.version=$WS_VERSION -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg_jboss_esb_home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME -Ddownload.dir=$DOWNLOAD_DIR -Dtest.delay=$TEST_DELAY"
echo ANT_PROPERTIES=${ANT_PROPERTIES}
#build RiftSaw and running unit test
13 years, 6 months
- 1
- 0
Hudson build became unstable: RiftSaw-jbossws-cxf-2.2.x #9
by jboss-qa-internal＠redhat.com
See <http://hudson.qa.jboss.com/hudson/job/RiftSaw-jbossws-cxf-2.2.x/9/changes>
13 years, 6 months
- 1
- 1
RiftSaw-oracle - Build # 136 - Failure!
by jboss-qa-internal＠redhat.com
RiftSaw-oracle - Build # 136 - Failure:
Check console output at http://hudson.qa.jboss.com/hudson/job/RiftSaw-oracle/136/ to view the results.
13 years, 6 months
- 1
- 3
Hudson build is unstable: RiftSaw-mysql-2.2.x #10
by jboss-qa-internal＠redhat.com
See <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql-2.2.x/10/changes>
13 years, 6 months
- 1
- 0
Hudson build is unstable: RiftSaw-db2-2.2.x #9
by jboss-qa-internal＠redhat.com
See <http://hudson.qa.jboss.com/hudson/job/RiftSaw-db2-2.2.x/9/changes>
13 years, 6 months
- 1
- 0
riftsaw SVN: r1199 - in branches/RiftSaw-2.2.x: integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases and 6 other directories.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-12-08 09:01:08 -0500 (Wed, 08 Dec 2010)
New Revision: 1199
Added:
branches/RiftSaw-2.2.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw326TestCase.java
branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/
branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/
branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerMain.bpel
branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerResponder.bpel
branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Main.wsdl
branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Responder.wsdl
branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/deploy.xml
branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/build.xml
branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/
branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/request.xml
branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/response.xml
Modified:
branches/RiftSaw-2.2.x/integration-tests/build.xml
branches/RiftSaw-2.2.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/EndpointReferenceContextImpl.java
branches/RiftSaw-2.2.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ServiceEndpointReference.java
Log:
RIFTSAW-326 - fixed npe associated with DynPartner ODE example.
Modified: branches/RiftSaw-2.2.x/integration-tests/build.xml
===================================================================
--- branches/RiftSaw-2.2.x/integration-tests/build.xml 2010-12-08 12:03:32 UTC (rev 1198)
+++ branches/RiftSaw-2.2.x/integration-tests/build.xml 2010-12-08 14:01:08 UTC (rev 1199)
@@ -201,6 +201,7 @@
<ant antfile="src/test/resources/testcases/RiftSaw_299_peer/build.xml" />
<ant antfile="src/test/resources/testcases/RiftSaw_299_ws/build.xml" />
<ant antfile="src/test/resources/testcases/RiftSaw_312/build.xml" />
+ <ant antfile="src/test/resources/testcases/RiftSaw_326/build.xml" />
<ant antfile="src/test/resources/management/RiftSaw_238/build.xml" />
Added: branches/RiftSaw-2.2.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw326TestCase.java
===================================================================
--- branches/RiftSaw-2.2.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw326TestCase.java (rev 0)
+++ branches/RiftSaw-2.2.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw326TestCase.java 2010-12-08 14:01:08 UTC (rev 1199)
@@ -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.testcases;
+
+import org.jboss.soa.bpel.tests.RiftSawTest;
+import org.jboss.soa.bpel.tests.RiftSawTestSetup;
+
+import junit.framework.Test;
+
+/**
+ * Test case for running the RiftSaw_326 testcase.
+ */
+public class RiftSaw326TestCase extends RiftSawTest {
+
+ private static final String TEST_NAME = "RiftSaw_326";
+
+ public RiftSaw326TestCase() {
+ super(TEST_NAME);
+ }
+
+ public static Test suite() {
+ return(new RiftSawTestSetup(RiftSaw326TestCase.class,
+ TEST_NAME, "RiftSaw_326-1.jar"));
+ }
+
+ public void testSendHello() throws Exception {
+ String result=sendSOAPMessage("request.xml",
+ "http://localhost:8080/dynpartner/DynMainService");
+
+ result = processResult(result);
+
+ assertMessageFromFile(result, "response.xml");
+ }
+}
Added: branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerMain.bpel
===================================================================
--- branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerMain.bpel (rev 0)
+++ branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerMain.bpel 2010-12-08 14:01:08 UTC (rev 1199)
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<process name="DynPartnerMain"
+ targetNamespace="http://ode/bpel/unit-test"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ xmlns:sref="http://docs.oasis-open.org/wsbpel/2.0/serviceref"
+ xmlns:tns="http://ode/bpel/unit-test"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:test="http://ode/bpel/unit-test.wsdl"
+ xmlns:resp="http://ode/bpel/responder.wsdl"
+ queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+
+ <import location="Main.wsdl" namespace="http://ode/bpel/unit-test.wsdl"
+ importType="http://schemas.xmlsoap.org/wsdl/" />
+
+ <partnerLinks>
+ <partnerLink name="initiatorPartnerLink" partnerLinkType="test:InitiatorPartnerLinkType"
+ myRole="me"/>
+ <partnerLink name="responderPartnerLink" partnerLinkType="resp:ResponderPartnerLinkType"
+ partnerRole="responder" initializePartnerRole="yes"/>
+ </partnerLinks>
+
+ <variables>
+ <variable name="dummy" messageType="resp:DummyMessage"/>
+ <variable name="dummy2" messageType="resp:Dummy2Message"/>
+ <variable name="partnerEndpoint" messageType="resp:EndpointMessage"/>
+ <variable name="partnerAck" messageType="resp:AcknowledgementMessage"/>
+ <variable name="result" messageType="test:ResultMessage"/>
+ <!-- <variable name="wsaVar" messageType="resp:WSAEndpointMessage"/> -->
+ </variables>
+
+ <correlationSets>
+ <correlationSet name="dummyCorr" properties="test:dummyProp" />
+ </correlationSets>
+
+ <sequence>
+ <receive name="start" partnerLink="initiatorPartnerLink"
+ portType="test:DynMainPortType" operation="execute" createInstance="yes" variable="dummy"/>
+
+ <invoke name="get-endpoint" partnerLink="responderPartnerLink" portType="resp:DynResponderPortType"
+ operation="getDynamicEndpoint" inputVariable="dummy" outputVariable="partnerEndpoint">
+ <correlations>
+ <correlation set="dummyCorr" initiate="yes" pattern="request"/>
+ </correlations>
+ </invoke>
+
+ <assign>
+ <copy>
+ <!-- Partner link assignment using the value returned by previous invoke -->
+ <from>$partnerEndpoint.payload</from>
+ <to partnerLink="responderPartnerLink"/>
+ </copy>
+ <copy>
+ <!-- Just needed for correlation -->
+ <from>$dummy.payload</from>
+ <to variable="dummy2" part="payload"/>
+ </copy>
+ </assign>
+
+ <!-- Invoking the partner link service endpoint that has just been assigned -->
+ <invoke name="dynamic-invoke" partnerLink="responderPartnerLink" portType="resp:DynResponderPortType"
+ operation="acknowledge" inputVariable="dummy2" outputVariable="partnerAck">
+ <correlations>
+ <correlation set="dummyCorr" initiate="no" pattern="request"/>
+ </correlations>
+ </invoke>
+
+ <!-- Playing around with epr conversion (url to wsa) -->
+ <assign>
+ <copy>
+ <from>
+ <literal>http://localhost:8080/dynpartner/DynResponderService</literal>
+ </from>
+ <to partnerLink="responderPartnerLink"/>
+ </copy>
+ <copy>
+ <from>
+ <literal>
+ <sref:service-ref>
+ <soap:address location="http://localhost:8080/dynpartner/DynResponderService"/>
+ </sref:service-ref>
+ </literal>
+ </from>
+ <to partnerLink="responderPartnerLink"/>
+ </copy>
+<!--
+ <copy>
+ <from partnerLink="responderPartnerLink" endpointReference="partnerRole"/>
+ <to variable="wsaVar" part="payload"/>
+ </copy>
+ <copy>
+ <from variable="wsaVar" part="payload"/>
+ <to partnerLink="responderPartnerLink"/>
+ </copy>
+-->
+ </assign>
+
+ <!-- Invoking the partner link service endpoint that has just been explicitly assigned -->
+ <invoke name="dynamic-invoke" partnerLink="responderPartnerLink" portType="resp:DynResponderPortType"
+ operation="acknowledge" inputVariable="dummy2" outputVariable="partnerAck">
+ <correlations>
+ <correlation set="dummyCorr" initiate="no" pattern="request"/>
+ </correlations>
+ </invoke>
+
+ <assign>
+ <copy>
+ <from variable="partnerAck" part="payload"/>
+ <to variable="result" part="ack"/>
+ </copy>
+ </assign>
+
+ <reply name="end" partnerLink="initiatorPartnerLink"
+ portType="test:DynMainPortType" operation="execute" variable="result">
+ </reply>
+
+ </sequence>
+</process>
Added: branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerResponder.bpel
===================================================================
--- branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerResponder.bpel (rev 0)
+++ branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerResponder.bpel 2010-12-08 14:01:08 UTC (rev 1199)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<process name="DynPartnerResponder"
+ targetNamespace="http://ode/bpel/responder"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ xmlns:tns="http://ode/bpel/responder"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:resp="http://ode/bpel/responder.wsdl">
+
+ <import location="Responder.wsdl" namespace="http://ode/bpel/responder.wsdl"
+ importType="http://schemas.xmlsoap.org/wsdl/" />
+
+ <partnerLinks>
+ <partnerLink name="mainPartnerLink" partnerLinkType="resp:ResponderPartnerLinkType"
+ myRole="responder"/>
+ </partnerLinks>
+
+ <variables>
+ <variable name="dummy" messageType="resp:DummyMessage"/>
+ <variable name="dummy2" messageType="resp:Dummy2Message"/>
+ <variable name="myEndpoint" messageType="resp:EndpointMessage"/>
+ <variable name="ack" messageType="resp:AcknowledgementMessage"/>
+ </variables>
+
+ <correlationSets>
+ <correlationSet name="dummyCorr" properties="resp:dummyProp" />
+ </correlationSets>
+
+ <sequence>
+ <receive name="start" partnerLink="mainPartnerLink" variable="dummy"
+ portType="resp:DynResponderPortType" operation="getDynamicEndpoint" createInstance="yes">
+ <correlations>
+ <correlation set="dummyCorr" initiate="yes"/>
+ </correlations>
+ </receive>
+ <assign>
+ <copy>
+ <from partnerLink="mainPartnerLink" endpointReference="myRole"/>
+ <to>$myEndpoint.payload</to>
+ </copy>
+ </assign>
+ <reply name="reply-endpoint" partnerLink="mainPartnerLink"
+ portType="resp:DynResponderPortType" operation="getDynamicEndpoint" variable="myEndpoint"/>
+
+ <receive name="dyn-invoke" partnerLink="mainPartnerLink" variable="dummy2"
+ portType="resp:DynResponderPortType" operation="acknowledge">
+ <correlations>
+ <correlation set="dummyCorr" initiate="no"/>
+ </correlations>
+ </receive>
+ <assign>
+ <copy>
+ <from>'OK'</from>
+ <to variable="ack" part="payload"/>
+ </copy>
+ </assign>
+ <reply name="reply-ack" partnerLink="mainPartnerLink"
+ portType="resp:DynResponderPortType" operation="acknowledge" variable="ack"/>
+
+ <receive name="dyn-invoke2" partnerLink="mainPartnerLink" variable="dummy2"
+ portType="resp:DynResponderPortType" operation="acknowledge">
+ <correlations>
+ <correlation set="dummyCorr" initiate="no"/>
+ </correlations>
+ </receive>
+ <reply name="reply-ack" partnerLink="mainPartnerLink"
+ portType="resp:DynResponderPortType" operation="acknowledge" variable="ack"/>
+
+ </sequence>
+</process>
\ No newline at end of file
Added: branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Main.wsdl
===================================================================
--- branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Main.wsdl (rev 0)
+++ branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Main.wsdl 2010-12-08 14:01:08 UTC (rev 1199)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<wsdl:definitions
+ targetNamespace="http://ode/bpel/unit-test.wsdl"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://ode/bpel/unit-test.wsdl"
+ xmlns:resp="http://ode/bpel/responder.wsdl"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
+ xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
+
+ <import namespace="http://ode/bpel/responder.wsdl" location="Responder.wsdl"/>
+
+ <wsdl:types>
+ <xsd:schema targetNamespace="http://ode/bpel/unit-test.wsdl">
+ <xsd:element name="result" type="xsd:string"/>
+ </xsd:schema>
+ </wsdl:types>
+
+ <wsdl:message name="ResultMessage">
+ <wsdl:part name="ack" element="tns:result"/>
+ </wsdl:message>
+
+ <wsdl:portType name="DynMainPortType">
+ <wsdl:operation name="execute">
+ <wsdl:input message="resp:DummyMessage" name="dummy"/>
+ <wsdl:output message="tns:ResultMessage" name="result"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:binding name="DynMainBinding" type="tns:DynMainPortType">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="execute">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input>
+ <soap:body namespace="http://ode/bpel/unit-test.wsdl" use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body namespace="http://ode/bpel/unit-test.wsdl" use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:service name="DynMainService">
+ <wsdl:port name="DynMainPort" binding="tns:DynMainBinding">
+ <soap:address location="http://localhost:8080/dynpartner/DynMainService"/>
+ </wsdl:port>
+ </wsdl:service>
+
+ <plnk:partnerLinkType name="InitiatorPartnerLinkType">
+ <plnk:role name="me" portType="tns:DynMainPortType"/>
+ </plnk:partnerLinkType>
+
+ <prop:property name="dummyProp" type="xsd:string"/>
+ <prop:propertyAlias propertyName="tns:dummyProp" messageType="resp:DummyMessage"
+ part="payload"/>
+ <prop:propertyAlias propertyName="tns:dummyProp" messageType="resp:Dummy2Message"
+ part="payload"/>
+
+</wsdl:definitions>
Added: branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Responder.wsdl
===================================================================
--- branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Responder.wsdl (rev 0)
+++ branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Responder.wsdl 2010-12-08 14:01:08 UTC (rev 1199)
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<wsdl:definitions
+ targetNamespace="http://ode/bpel/responder.wsdl"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://ode/bpel/responder.wsdl"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
+ xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
+ xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
+
+ <wsdl:types>
+ <xsd:schema targetNamespace="http://ode/bpel/responder.wsdl">
+ <xsd:element name="dummy" type="xsd:string"/>
+ <xsd:element name="dummy2" type="xsd:string"/>
+ <xsd:element name="acknowledgement" type="xsd:string"/>
+ <xsd:element name="url" type="xsd:string"/>
+ </xsd:schema>
+ </wsdl:types>
+
+ <wsdl:message name="DummyMessage">
+ <wsdl:part name="payload" element="tns:dummy"/>
+ </wsdl:message>
+
+ <wsdl:message name="Dummy2Message">
+ <wsdl:part name="payload" element="tns:dummy2"/>
+ </wsdl:message>
+
+ <wsdl:message name="EndpointMessage">
+ <wsdl:part name="payload" element="tns:url"/>
+ </wsdl:message>
+
+<!--
+ <wsdl:message name="WSAEndpointMessage">
+ <wsdl:part name="payload" element="wsa:EndpointReference"/>
+ </wsdl:message>
+-->
+
+ <wsdl:message name="AcknowledgementMessage">
+ <wsdl:part name="payload" element="tns:acknowledgement"/>
+ </wsdl:message>
+
+ <wsdl:portType name="DynResponderPortType">
+ <wsdl:operation name="getDynamicEndpoint">
+ <wsdl:input message="tns:DummyMessage" name="dummy"/>
+ <wsdl:output message="tns:EndpointMessage" name="endpoint"/>
+ </wsdl:operation>
+ <wsdl:operation name="acknowledge">
+ <wsdl:input message="tns:Dummy2Message" name="dummy2"/>
+ <wsdl:output message="tns:AcknowledgementMessage" name="ack"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:binding name="DynResponderBinding" type="tns:DynResponderPortType">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="getDynamicEndpoint">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input>
+ <soap:body namespace="http://ode/bpel/responder.wsdl" use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body namespace="http://ode/bpel/responder.wsdl" use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="acknowledge">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input>
+ <soap:body namespace="http://ode/bpel/responder.wsdl" use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body namespace="http://ode/bpel/responder.wsdl" use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:service name="DynResponderService">
+ <wsdl:port name="DynResponderPort" binding="tns:DynResponderBinding">
+ <soap:address location="http://localhost:8080/dynpartner/DynResponderService"/>
+ </wsdl:port>
+ </wsdl:service>
+
+ <plnk:partnerLinkType name="ResponderPartnerLinkType">
+ <plnk:role name="responder" portType="tns:DynResponderPortType"/>
+ </plnk:partnerLinkType>
+
+ <prop:property name="dummyProp" type="xsd:string"/>
+ <prop:propertyAlias propertyName="tns:dummyProp" messageType="tns:DummyMessage"
+ part="payload"/>
+ <prop:propertyAlias propertyName="tns:dummyProp" messageType="tns:Dummy2Message"
+ part="payload"/>
+
+</wsdl:definitions>
Added: branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/deploy.xml
===================================================================
--- branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/deploy.xml (rev 0)
+++ branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/deploy.xml 2010-12-08 14:01:08 UTC (rev 1199)
@@ -0,0 +1,40 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
+ xmlns:main="http://ode/bpel/unit-test"
+ xmlns:mws="http://ode/bpel/unit-test.wsdl"
+ xmlns:resp="http://ode/bpel/responder"
+ xmlns:rws="http://ode/bpel/responder.wsdl">
+
+ <process name="main:DynPartnerMain">
+ <provide partnerLink="initiatorPartnerLink">
+ <service name="mws:DynMainService" port="DynMainPort"/>
+ </provide>
+ <invoke partnerLink="responderPartnerLink">
+ <service name="rws:DynResponderService" port="DynResponderPort"/>
+ </invoke>
+ </process>
+ <process name="resp:DynPartnerResponder">
+ <in-memory>true</in-memory>
+ <type>resp:DynPartnerResponder</type>
+ <provide partnerLink="mainPartnerLink">
+ <service name="rws:DynResponderService" port="DynResponderPort"/>
+ </provide>
+ </process>
+</deploy>
Added: branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/build.xml
===================================================================
--- branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/build.xml (rev 0)
+++ branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/build.xml 2010-12-08 14:01:08 UTC (rev 1199)
@@ -0,0 +1,30 @@
+<project name="RiftSaw_326" 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/testcases/${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.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/request.xml
===================================================================
--- branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/request.xml (rev 0)
+++ branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/request.xml 2010-12-08 14:01:08 UTC (rev 1199)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
+ <!-- test soap message -->
+ <SOAP-ENV:Body>
+ <ns2:dummy xmlns:ns2="http://ode/bpel/responder.wsdl">fire!</ns2:dummy>
+ </SOAP-ENV:Body>
+</SOAP-ENV:Envelope>
Added: branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/response.xml
===================================================================
--- branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/response.xml (rev 0)
+++ branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/response.xml 2010-12-08 14:01:08 UTC (rev 1199)
@@ -0,0 +1 @@
+<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><result xmlns='http://ode/bpel/unit-test.wsdl'>OK</result></env:Body></env:Envelope>
\ No newline at end of file
Modified: branches/RiftSaw-2.2.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/EndpointReferenceContextImpl.java
===================================================================
--- branches/RiftSaw-2.2.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/EndpointReferenceContextImpl.java 2010-12-08 12:03:32 UTC (rev 1198)
+++ branches/RiftSaw-2.2.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/EndpointReferenceContextImpl.java 2010-12-08 14:01:08 UTC (rev 1199)
@@ -45,6 +45,8 @@
}
public EndpointReference convertEndpoint(QName qName, Element element) {
+ if (log.isDebugEnabled())
+ log.debug("Convert endpoint reference: qname="+qName+" element="+DOMUtils.domToString(element));
EndpointReference endpoint = EndpointFactory.convert(qName, element);
return endpoint;
}
Modified: branches/RiftSaw-2.2.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ServiceEndpointReference.java
===================================================================
--- branches/RiftSaw-2.2.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ServiceEndpointReference.java 2010-12-08 12:03:32 UTC (rev 1198)
+++ branches/RiftSaw-2.2.x/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ServiceEndpointReference.java 2010-12-08 14:01:08 UTC (rev 1199)
@@ -22,6 +22,7 @@
package org.jboss.soa.bpel.runtime.ws;
import org.apache.ode.bpel.iapi.EndpointReference;
+import org.apache.ode.utils.Namespaces;
import org.w3c.dom.Document;
/**
@@ -59,7 +60,7 @@
try {
ret = javax.xml.parsers.DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
- org.w3c.dom.Element elem=ret.createElement("attr");
+ org.w3c.dom.Element elem=ret.createElementNS(Namespaces.SOAP_NS, "address");
elem.setAttribute("location", serviceUrl);
elem.setAttribute("endpointId", endpointId);
elem.setAttribute("deploymentName", deploymentName);
13 years, 6 months
- 1
- 0
riftsaw SVN: r1198 - in trunk/integration-tests/src/test/resources/testcases/RiftSaw_326: messages and 1 other directory.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-12-08 07:03:32 -0500 (Wed, 08 Dec 2010)
New Revision: 1198
Added:
trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerMain.bpel
trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerResponder.bpel
trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Main.wsdl
trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Responder.wsdl
trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/deploy.xml
trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/request.xml
trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/response.xml
Log:
RIFTSAW-326 - fix npe when running dynpartner ODE example in riftsaw.
Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerMain.bpel
===================================================================
--- trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerMain.bpel (rev 0)
+++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerMain.bpel 2010-12-08 12:03:32 UTC (rev 1198)
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<process name="DynPartnerMain"
+ targetNamespace="http://ode/bpel/unit-test"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ xmlns:sref="http://docs.oasis-open.org/wsbpel/2.0/serviceref"
+ xmlns:tns="http://ode/bpel/unit-test"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:test="http://ode/bpel/unit-test.wsdl"
+ xmlns:resp="http://ode/bpel/responder.wsdl"
+ queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+
+ <import location="Main.wsdl" namespace="http://ode/bpel/unit-test.wsdl"
+ importType="http://schemas.xmlsoap.org/wsdl/" />
+
+ <partnerLinks>
+ <partnerLink name="initiatorPartnerLink" partnerLinkType="test:InitiatorPartnerLinkType"
+ myRole="me"/>
+ <partnerLink name="responderPartnerLink" partnerLinkType="resp:ResponderPartnerLinkType"
+ partnerRole="responder" initializePartnerRole="yes"/>
+ </partnerLinks>
+
+ <variables>
+ <variable name="dummy" messageType="resp:DummyMessage"/>
+ <variable name="dummy2" messageType="resp:Dummy2Message"/>
+ <variable name="partnerEndpoint" messageType="resp:EndpointMessage"/>
+ <variable name="partnerAck" messageType="resp:AcknowledgementMessage"/>
+ <variable name="result" messageType="test:ResultMessage"/>
+ <!-- <variable name="wsaVar" messageType="resp:WSAEndpointMessage"/> -->
+ </variables>
+
+ <correlationSets>
+ <correlationSet name="dummyCorr" properties="test:dummyProp" />
+ </correlationSets>
+
+ <sequence>
+ <receive name="start" partnerLink="initiatorPartnerLink"
+ portType="test:DynMainPortType" operation="execute" createInstance="yes" variable="dummy"/>
+
+ <invoke name="get-endpoint" partnerLink="responderPartnerLink" portType="resp:DynResponderPortType"
+ operation="getDynamicEndpoint" inputVariable="dummy" outputVariable="partnerEndpoint">
+ <correlations>
+ <correlation set="dummyCorr" initiate="yes" pattern="request"/>
+ </correlations>
+ </invoke>
+
+ <assign>
+ <copy>
+ <!-- Partner link assignment using the value returned by previous invoke -->
+ <from>$partnerEndpoint.payload</from>
+ <to partnerLink="responderPartnerLink"/>
+ </copy>
+ <copy>
+ <!-- Just needed for correlation -->
+ <from>$dummy.payload</from>
+ <to variable="dummy2" part="payload"/>
+ </copy>
+ </assign>
+
+ <!-- Invoking the partner link service endpoint that has just been assigned -->
+ <invoke name="dynamic-invoke" partnerLink="responderPartnerLink" portType="resp:DynResponderPortType"
+ operation="acknowledge" inputVariable="dummy2" outputVariable="partnerAck">
+ <correlations>
+ <correlation set="dummyCorr" initiate="no" pattern="request"/>
+ </correlations>
+ </invoke>
+
+ <!-- Playing around with epr conversion (url to wsa) -->
+ <assign>
+ <copy>
+ <from>
+ <literal>http://localhost:8080/dynpartner/DynResponderService</literal>
+ </from>
+ <to partnerLink="responderPartnerLink"/>
+ </copy>
+ <copy>
+ <from>
+ <literal>
+ <sref:service-ref>
+ <soap:address location="http://localhost:8080/dynpartner/DynResponderService"/>
+ </sref:service-ref>
+ </literal>
+ </from>
+ <to partnerLink="responderPartnerLink"/>
+ </copy>
+<!--
+ <copy>
+ <from partnerLink="responderPartnerLink" endpointReference="partnerRole"/>
+ <to variable="wsaVar" part="payload"/>
+ </copy>
+ <copy>
+ <from variable="wsaVar" part="payload"/>
+ <to partnerLink="responderPartnerLink"/>
+ </copy>
+-->
+ </assign>
+
+ <!-- Invoking the partner link service endpoint that has just been explicitly assigned -->
+ <invoke name="dynamic-invoke" partnerLink="responderPartnerLink" portType="resp:DynResponderPortType"
+ operation="acknowledge" inputVariable="dummy2" outputVariable="partnerAck">
+ <correlations>
+ <correlation set="dummyCorr" initiate="no" pattern="request"/>
+ </correlations>
+ </invoke>
+
+ <assign>
+ <copy>
+ <from variable="partnerAck" part="payload"/>
+ <to variable="result" part="ack"/>
+ </copy>
+ </assign>
+
+ <reply name="end" partnerLink="initiatorPartnerLink"
+ portType="test:DynMainPortType" operation="execute" variable="result">
+ </reply>
+
+ </sequence>
+</process>
Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerResponder.bpel
===================================================================
--- trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerResponder.bpel (rev 0)
+++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerResponder.bpel 2010-12-08 12:03:32 UTC (rev 1198)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<process name="DynPartnerResponder"
+ targetNamespace="http://ode/bpel/responder"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ xmlns:tns="http://ode/bpel/responder"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:resp="http://ode/bpel/responder.wsdl">
+
+ <import location="Responder.wsdl" namespace="http://ode/bpel/responder.wsdl"
+ importType="http://schemas.xmlsoap.org/wsdl/" />
+
+ <partnerLinks>
+ <partnerLink name="mainPartnerLink" partnerLinkType="resp:ResponderPartnerLinkType"
+ myRole="responder"/>
+ </partnerLinks>
+
+ <variables>
+ <variable name="dummy" messageType="resp:DummyMessage"/>
+ <variable name="dummy2" messageType="resp:Dummy2Message"/>
+ <variable name="myEndpoint" messageType="resp:EndpointMessage"/>
+ <variable name="ack" messageType="resp:AcknowledgementMessage"/>
+ </variables>
+
+ <correlationSets>
+ <correlationSet name="dummyCorr" properties="resp:dummyProp" />
+ </correlationSets>
+
+ <sequence>
+ <receive name="start" partnerLink="mainPartnerLink" variable="dummy"
+ portType="resp:DynResponderPortType" operation="getDynamicEndpoint" createInstance="yes">
+ <correlations>
+ <correlation set="dummyCorr" initiate="yes"/>
+ </correlations>
+ </receive>
+ <assign>
+ <copy>
+ <from partnerLink="mainPartnerLink" endpointReference="myRole"/>
+ <to>$myEndpoint.payload</to>
+ </copy>
+ </assign>
+ <reply name="reply-endpoint" partnerLink="mainPartnerLink"
+ portType="resp:DynResponderPortType" operation="getDynamicEndpoint" variable="myEndpoint"/>
+
+ <receive name="dyn-invoke" partnerLink="mainPartnerLink" variable="dummy2"
+ portType="resp:DynResponderPortType" operation="acknowledge">
+ <correlations>
+ <correlation set="dummyCorr" initiate="no"/>
+ </correlations>
+ </receive>
+ <assign>
+ <copy>
+ <from>'OK'</from>
+ <to variable="ack" part="payload"/>
+ </copy>
+ </assign>
+ <reply name="reply-ack" partnerLink="mainPartnerLink"
+ portType="resp:DynResponderPortType" operation="acknowledge" variable="ack"/>
+
+ <receive name="dyn-invoke2" partnerLink="mainPartnerLink" variable="dummy2"
+ portType="resp:DynResponderPortType" operation="acknowledge">
+ <correlations>
+ <correlation set="dummyCorr" initiate="no"/>
+ </correlations>
+ </receive>
+ <reply name="reply-ack" partnerLink="mainPartnerLink"
+ portType="resp:DynResponderPortType" operation="acknowledge" variable="ack"/>
+
+ </sequence>
+</process>
\ No newline at end of file
Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Main.wsdl
===================================================================
--- trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Main.wsdl (rev 0)
+++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Main.wsdl 2010-12-08 12:03:32 UTC (rev 1198)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<wsdl:definitions
+ targetNamespace="http://ode/bpel/unit-test.wsdl"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://ode/bpel/unit-test.wsdl"
+ xmlns:resp="http://ode/bpel/responder.wsdl"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
+ xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
+
+ <import namespace="http://ode/bpel/responder.wsdl" location="Responder.wsdl"/>
+
+ <wsdl:types>
+ <xsd:schema targetNamespace="http://ode/bpel/unit-test.wsdl">
+ <xsd:element name="result" type="xsd:string"/>
+ </xsd:schema>
+ </wsdl:types>
+
+ <wsdl:message name="ResultMessage">
+ <wsdl:part name="ack" element="tns:result"/>
+ </wsdl:message>
+
+ <wsdl:portType name="DynMainPortType">
+ <wsdl:operation name="execute">
+ <wsdl:input message="resp:DummyMessage" name="dummy"/>
+ <wsdl:output message="tns:ResultMessage" name="result"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:binding name="DynMainBinding" type="tns:DynMainPortType">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="execute">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input>
+ <soap:body namespace="http://ode/bpel/unit-test.wsdl" use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body namespace="http://ode/bpel/unit-test.wsdl" use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:service name="DynMainService">
+ <wsdl:port name="DynMainPort" binding="tns:DynMainBinding">
+ <soap:address location="http://localhost:8080/dynpartner/DynMainService"/>
+ </wsdl:port>
+ </wsdl:service>
+
+ <plnk:partnerLinkType name="InitiatorPartnerLinkType">
+ <plnk:role name="me" portType="tns:DynMainPortType"/>
+ </plnk:partnerLinkType>
+
+ <prop:property name="dummyProp" type="xsd:string"/>
+ <prop:propertyAlias propertyName="tns:dummyProp" messageType="resp:DummyMessage"
+ part="payload"/>
+ <prop:propertyAlias propertyName="tns:dummyProp" messageType="resp:Dummy2Message"
+ part="payload"/>
+
+</wsdl:definitions>
Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Responder.wsdl
===================================================================
--- trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Responder.wsdl (rev 0)
+++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Responder.wsdl 2010-12-08 12:03:32 UTC (rev 1198)
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<wsdl:definitions
+ targetNamespace="http://ode/bpel/responder.wsdl"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://ode/bpel/responder.wsdl"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
+ xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
+ xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
+
+ <wsdl:types>
+ <xsd:schema targetNamespace="http://ode/bpel/responder.wsdl">
+ <xsd:element name="dummy" type="xsd:string"/>
+ <xsd:element name="dummy2" type="xsd:string"/>
+ <xsd:element name="acknowledgement" type="xsd:string"/>
+ <xsd:element name="url" type="xsd:string"/>
+ </xsd:schema>
+ </wsdl:types>
+
+ <wsdl:message name="DummyMessage">
+ <wsdl:part name="payload" element="tns:dummy"/>
+ </wsdl:message>
+
+ <wsdl:message name="Dummy2Message">
+ <wsdl:part name="payload" element="tns:dummy2"/>
+ </wsdl:message>
+
+ <wsdl:message name="EndpointMessage">
+ <wsdl:part name="payload" element="tns:url"/>
+ </wsdl:message>
+
+<!--
+ <wsdl:message name="WSAEndpointMessage">
+ <wsdl:part name="payload" element="wsa:EndpointReference"/>
+ </wsdl:message>
+-->
+
+ <wsdl:message name="AcknowledgementMessage">
+ <wsdl:part name="payload" element="tns:acknowledgement"/>
+ </wsdl:message>
+
+ <wsdl:portType name="DynResponderPortType">
+ <wsdl:operation name="getDynamicEndpoint">
+ <wsdl:input message="tns:DummyMessage" name="dummy"/>
+ <wsdl:output message="tns:EndpointMessage" name="endpoint"/>
+ </wsdl:operation>
+ <wsdl:operation name="acknowledge">
+ <wsdl:input message="tns:Dummy2Message" name="dummy2"/>
+ <wsdl:output message="tns:AcknowledgementMessage" name="ack"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:binding name="DynResponderBinding" type="tns:DynResponderPortType">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="getDynamicEndpoint">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input>
+ <soap:body namespace="http://ode/bpel/responder.wsdl" use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body namespace="http://ode/bpel/responder.wsdl" use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="acknowledge">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input>
+ <soap:body namespace="http://ode/bpel/responder.wsdl" use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body namespace="http://ode/bpel/responder.wsdl" use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:service name="DynResponderService">
+ <wsdl:port name="DynResponderPort" binding="tns:DynResponderBinding">
+ <soap:address location="http://localhost:8080/dynpartner/DynResponderService"/>
+ </wsdl:port>
+ </wsdl:service>
+
+ <plnk:partnerLinkType name="ResponderPartnerLinkType">
+ <plnk:role name="responder" portType="tns:DynResponderPortType"/>
+ </plnk:partnerLinkType>
+
+ <prop:property name="dummyProp" type="xsd:string"/>
+ <prop:propertyAlias propertyName="tns:dummyProp" messageType="tns:DummyMessage"
+ part="payload"/>
+ <prop:propertyAlias propertyName="tns:dummyProp" messageType="tns:Dummy2Message"
+ part="payload"/>
+
+</wsdl:definitions>
Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/deploy.xml
===================================================================
--- trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/deploy.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/deploy.xml 2010-12-08 12:03:32 UTC (rev 1198)
@@ -0,0 +1,40 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
+ xmlns:main="http://ode/bpel/unit-test"
+ xmlns:mws="http://ode/bpel/unit-test.wsdl"
+ xmlns:resp="http://ode/bpel/responder"
+ xmlns:rws="http://ode/bpel/responder.wsdl">
+
+ <process name="main:DynPartnerMain">
+ <provide partnerLink="initiatorPartnerLink">
+ <service name="mws:DynMainService" port="DynMainPort"/>
+ </provide>
+ <invoke partnerLink="responderPartnerLink">
+ <service name="rws:DynResponderService" port="DynResponderPort"/>
+ </invoke>
+ </process>
+ <process name="resp:DynPartnerResponder">
+ <in-memory>true</in-memory>
+ <type>resp:DynPartnerResponder</type>
+ <provide partnerLink="mainPartnerLink">
+ <service name="rws:DynResponderService" port="DynResponderPort"/>
+ </provide>
+ </process>
+</deploy>
Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/request.xml
===================================================================
--- trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/request.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/request.xml 2010-12-08 12:03:32 UTC (rev 1198)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
+ <!-- test soap message -->
+ <SOAP-ENV:Body>
+ <ns2:dummy xmlns:ns2="http://ode/bpel/responder.wsdl">fire!</ns2:dummy>
+ </SOAP-ENV:Body>
+</SOAP-ENV:Envelope>
Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/response.xml
===================================================================
--- trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/response.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/response.xml 2010-12-08 12:03:32 UTC (rev 1198)
@@ -0,0 +1 @@
+<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><result xmlns='http://ode/bpel/unit-test.wsdl'>OK</result></env:Body></env:Envelope>
\ No newline at end of file
13 years, 6 months
- 1
- 0
riftsaw SVN: r1197 - in trunk: integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases and 4 other directories.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-12-08 06:59:55 -0500 (Wed, 08 Dec 2010)
New Revision: 1197
Added:
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw326TestCase.java
trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/
trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/
trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/build.xml
trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/
Modified:
trunk/integration-tests/build.xml
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/EndpointReferenceContextImpl.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEServiceEndpointReference.java
Log:
RIFTSAW-326 - fix npe when running dynpartner ODE example in riftsaw.
Modified: trunk/integration-tests/build.xml
===================================================================
--- trunk/integration-tests/build.xml 2010-12-08 09:57:23 UTC (rev 1196)
+++ trunk/integration-tests/build.xml 2010-12-08 11:59:55 UTC (rev 1197)
@@ -201,6 +201,7 @@
<ant antfile="src/test/resources/testcases/RiftSaw_299_peer/build.xml" />
<ant antfile="src/test/resources/testcases/RiftSaw_299_ws/build.xml" />
<ant antfile="src/test/resources/testcases/RiftSaw_312/build.xml" />
+ <ant antfile="src/test/resources/testcases/RiftSaw_326/build.xml" />
<ant antfile="src/test/resources/management/RiftSaw_238/build.xml" />
Added: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw326TestCase.java
===================================================================
--- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw326TestCase.java (rev 0)
+++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw326TestCase.java 2010-12-08 11:59:55 UTC (rev 1197)
@@ -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.testcases;
+
+import org.jboss.soa.bpel.tests.RiftSawTest;
+import org.jboss.soa.bpel.tests.RiftSawTestSetup;
+
+import junit.framework.Test;
+
+/**
+ * Test case for running the RiftSaw_326 testcase.
+ */
+public class RiftSaw326TestCase extends RiftSawTest {
+
+ private static final String TEST_NAME = "RiftSaw_326";
+
+ public RiftSaw326TestCase() {
+ super(TEST_NAME);
+ }
+
+ public static Test suite() {
+ return(new RiftSawTestSetup(RiftSaw326TestCase.class,
+ TEST_NAME, "RiftSaw_326-1.jar"));
+ }
+
+ public void testSendHello() throws Exception {
+ String result=sendSOAPMessage("request.xml",
+ "http://localhost:8080/dynpartner/DynMainService");
+
+ result = processResult(result);
+
+ assertMessageFromFile(result, "response.xml");
+ }
+}
Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/build.xml
===================================================================
--- trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/build.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/build.xml 2010-12-08 11:59:55 UTC (rev 1197)
@@ -0,0 +1,30 @@
+<project name="RiftSaw_326" 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/testcases/${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>
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/EndpointReferenceContextImpl.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/EndpointReferenceContextImpl.java 2010-12-08 09:57:23 UTC (rev 1196)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/EndpointReferenceContextImpl.java 2010-12-08 11:59:55 UTC (rev 1197)
@@ -45,6 +45,8 @@
}
public EndpointReference convertEndpoint(QName qName, Element element) {
+ if (log.isDebugEnabled())
+ log.debug("Convert endpoint reference: qname="+qName+" element="+DOMUtils.domToString(element));
EndpointReference endpoint = EndpointFactory.convert(qName, element);
return endpoint;
}
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEServiceEndpointReference.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEServiceEndpointReference.java 2010-12-08 09:57:23 UTC (rev 1196)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEServiceEndpointReference.java 2010-12-08 11:59:55 UTC (rev 1197)
@@ -22,6 +22,7 @@
package org.jboss.soa.bpel.runtime.ws;
import org.apache.ode.bpel.iapi.EndpointReference;
+import org.apache.ode.utils.Namespaces;
import org.w3c.dom.Document;
import org.jboss.soa.dsp.ServiceEndpointReference;
@@ -44,7 +45,7 @@
try {
ret = javax.xml.parsers.DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
- org.w3c.dom.Element elem=ret.createElement("attr");
+ org.w3c.dom.Element elem=ret.createElementNS(Namespaces.SOAP_NS, "address");
elem.setAttribute("location", getServiceUrl().toExternalForm());
elem.setAttribute("endpointId", getEndpointId());
elem.setAttribute("deploymentName", getDeploymentName());
13 years, 6 months
- 1
- 0