Author: rr
Date: Mon Sep 21 16:18:43 2009
New Revision: 817310
URL: http://svn.apache.org/viewvc?rev=817310&view=rev
Log:
ODE-614: Fixed resolving WSA EPR in JBI
Added:
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/EPRTest.bpel
(with props)
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/EPRTest2.bpel
(with props)
Removed:
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionExternalJbiTest/ws-addr.xsd
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionJbiTest/ws-addr.xsd
Modified:
ode/branches/APACHE_ODE_1.X/Rakefile
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/EndpointReferenceContextImpl.java
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/deploy.xml
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/smx.xml
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/test.properties
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionExternalJbiTest/Main.bpel
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionExternalJbiTest/Main.wsdl
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionExternalJbiTest/Responder.bpel
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionJbiTest/Main.bpel
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionJbiTest/Main.wsdl
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionJbiTest/Responder.bpel
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/log4j.properties
Modified: ode/branches/APACHE_ODE_1.X/Rakefile
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/Rakefile?rev=817310&r1=817309&r2=817310&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/Rakefile (original)
+++ ode/branches/APACHE_ODE_1.X/Rakefile Mon Sep 21 16:18:43 2009
@@ -102,6 +102,7 @@
group("servicemix-utils",
:under=>"org.apache.servicemix",
:version=>"1.0.0"),
"commons-httpclient:commons-httpclient:jar:3.0",
+ "commons-codec:commons-codec:jar:1.2",
"org.mortbay.jetty:jetty:jar:6.1.12rc1",
"org.mortbay.jetty:jetty-client:jar:6.1.12rc1",
"org.mortbay.jetty:jetty-sslengine:jar:6.1.12rc1",
@@ -517,7 +518,7 @@
jbi.include path_to("src/main/jbi/ode-jbi.properties")
end
- test.using :properties=>{ "java.naming.factory.initial" =>
"org.apache.xbean.spring.jndi.SpringInitialContextFactory"}
+ test.using :properties=>{ "java.naming.factory.initial" =>
"org.apache.xbean.spring.jndi.SpringInitialContextFactory"},
:java_args=>ENV['TEST_JVM_ARGS']
test.with projects("dao-jpa", "dao-hibernate", "bpel-compiler",
"bpel-api-jca", "jca-ra",
"jca-server", "jacob"),
BACKPORT, COMMONS.lang, COMMONS.collections, DERBY, GERONIMO.connector,
GERONIMO.kernel,
Modified:
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java?rev=817310&r1=817309&r2=817310&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
(original)
+++
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
Mon Sep 21 16:18:43 2009
@@ -1104,13 +1104,15 @@
// OPartnerLink, PartnerLinkPartnerRoleImpl
final PartnerLinkPartnerRoleImpl linkPartnerRole =
_partnerRoles.get(partnerLink);
long timeout = Properties.DEFAULT_MEX_TIMEOUT;
- String timeout_property =
_pconf.getEndpointProperties(linkPartnerRole._initialEPR).get(Properties.PROP_MEX_TIMEOUT);
- if (timeout_property != null) {
- try {
- timeout = Long.parseLong(timeout_property);
- } catch (NumberFormatException e) {
- if (__log.isWarnEnabled())
- __log.warn("Mal-formatted Property: [" +
Properties.PROP_MEX_TIMEOUT + "=" + timeout_property + "] Default value (" +
timeout + ") will be used");
+ if (linkPartnerRole._initialEPR != null) {
+ String timeout_property =
_pconf.getEndpointProperties(linkPartnerRole._initialEPR).get(Properties.PROP_MEX_TIMEOUT);
+ if (timeout_property != null) {
+ try {
+ timeout = Long.parseLong(timeout_property);
+ } catch (NumberFormatException e) {
+ if (__log.isWarnEnabled())
+ __log.warn("Mal-formatted Property: [" +
Properties.PROP_MEX_TIMEOUT + "=" + timeout_property + "] Default value (" +
timeout + ") will be used");
+ }
}
}
Modified:
ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/EndpointReferenceContextImpl.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/EndpointReferenceContextImpl.java?rev=817310&r1=817309&r2=817310&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/EndpointReferenceContextImpl.java
(original)
+++
ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/EndpointReferenceContextImpl.java
Mon Sep 21 16:18:43 2009
@@ -71,20 +71,17 @@
Document doc = DOMUtils.newDocument();
DocumentFragment fragment = doc.createDocumentFragment();
- Element e = DOMUtils.findChildByName(epr, JBI_EPR, true);
- if (e != null) {
- fragment.appendChild(doc.importNode(e, true));
- }
-
+ NodeList children = epr.getChildNodes();
+ for (int i = 0 ; i < children.getLength(); ++i)
+ if (children.item(i) instanceof Element)
+ fragment.appendChild(doc.importNode(children.item(i), true));
ServiceEndpoint se = _ode.getContext().resolveEndpointReference(fragment);
- if (__log.isDebugEnabled()) {
- __log.debug("resolveEndpointReference2 jbiepr:" +
DOMUtils.domToString(fragment) + " se:" + se);
- }
if (se == null)
return null;
return new JbiEndpointReference(se);
}
+
public EndpointReference convertEndpoint(QName eprType, Element epr) {
Document doc = DOMUtils.newDocument();
DocumentFragment fragment = doc.createDocumentFragment();
Added:
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/EPRTest.bpel
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/EPRTest.bpel?rev=817310&view=auto
==============================================================================
---
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/EPRTest.bpel
(added)
+++
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/EPRTest.bpel
Mon Sep 21 16:18:43 2009
@@ -0,0 +1,93 @@
+<?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.
+ -->
+<bpws:process
xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:ns="http://sample.bpel.org/bpel/sampleArtifacts";
xmlns:tns="http://sample.bpel.org/bpel/sample"; exitOnStandardFault="yes"
name="EPRTest" suppressJoinFailure="yes"
targetNamespace="http://sample.bpel.org/bpel/sample";
expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable
/usr/share/bpel-schema/ws-bpel_executable.xsd">
+ <bpws:import importType="http://schemas.xmlsoap.org/wsdl/";
location="OnEventCorrelation.wsdl"
namespace="http://sample.bpel.org/bpel/sample"/>
+ <bpws:import importType="http://schemas.xmlsoap.org/wsdl/";
location="OnEventCorrelationArtifacts.wsdl"
namespace="http://sample.bpel.org/bpel/sampleArtifacts"/>
+ <bpws:partnerLinks>
+ <bpws:partnerLink myRole="OnEventCorrelationProvider"
partnerRole="OnEventCorrelationProvider" name="client"
partnerLinkType="tns:OnEventCorrelation" initializePartnerRole="no"/>
+ </bpws:partnerLinks>
+ <bpws:variables>
+ <bpws:variable messageType="tns:OnEventCorrelationMessage" name="input"/>
+ <bpws:variable messageType="tns:OnEventCorrelationMessage" name="output"/>
+ <bpws:variable messageType="tns:OnEventCorrelationMessage" name="output2"/>
+ <bpws:variable type="xsd:string" name="s"/>
+ </bpws:variables>
+ <bpws:correlationSets>
+ <bpws:correlationSet name="CorrelationSet" properties="ns:input"/>
+ </bpws:correlationSets>
+ <bpws:sequence name="main">
+ <bpws:receive createInstance="yes" operation="opInOut"
partnerLink="client" portType="tns:OnEventCorrelation" variable="input"/>
+
+ <bpws:assign>
+ <bpws:copy>
+ <bpws:from>
+ <bpws:literal>
+<sref:service-ref
xmlns:sref="http://docs.oasis-open.org/wsbpel/2.0/serviceref";>
+ <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing";>
+
<wsa:Address>http://localhost:8192/EPRTest2/?http.soap=true&http.soapVersion=1.1</wsa:Address>
+ </wsa:EndpointReference>
+</sref:service-ref>
+ </bpws:literal>
+ </bpws:from>
+ <bpws:to partnerLink="client"/>
+ </bpws:copy>
+ </bpws:assign>
+
+ <bpws:invoke partnerLink="client" operation="opInOut"
inputVariable="input" outputVariable="output"/>
+
+ <bpws:assign>
+ <bpws:copy>
+ <bpws:from>$output</bpws:from>
+ <bpws:to>$output2</bpws:to>
+ </bpws:copy>
+ </bpws:assign>
+
+ <bpws:assign>
+ <bpws:copy>
+ <bpws:from>
+ <bpws:literal>
+<sref:service-ref
xmlns:sref="http://docs.oasis-open.org/wsbpel/2.0/serviceref";>
+<jbi:end-point-reference jbi:end-point-name="default"
+ jbi:service-name="bpel:EPRTest2"
+ xmlns:jbi="http://java.sun.com/jbi/end-point-reference";
xmlns:bpel="http://sample.bpel.org/bpel/sample"/>
+</sref:service-ref>
+ </bpws:literal>
+ </bpws:from>
+ <bpws:to partnerLink="client"/>
+ </bpws:copy>
+ <bpws:copy>
+ <bpws:from>''</bpws:from>
+ <bpws:to>$input.data</bpws:to>
+ </bpws:copy>
+ </bpws:assign>
+
+ <bpws:invoke partnerLink="client" operation="opInOut"
inputVariable="input" outputVariable="output"/>
+ <bpws:assign>
+ <bpws:copy>
+ <bpws:from>concat($output2.data, $output.data)</bpws:from>
+ <bpws:to>$output2.data</bpws:to>
+ </bpws:copy>
+ </bpws:assign>
+
+ <bpws:reply operation="opInOut" partnerLink="client" variable="output2"/>
+ </bpws:sequence>
+</bpws:process>
+
+
Propchange:
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/EPRTest.bpel
------------------------------------------------------------------------------
svn:eol-style = native
Added:
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/EPRTest2.bpel
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/EPRTest2.bpel?rev=817310&view=auto
==============================================================================
---
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/EPRTest2.bpel
(added)
+++
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/EPRTest2.bpel
Mon Sep 21 16:18:43 2009
@@ -0,0 +1,53 @@
+<?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.
+ -->
+<bpws:process
xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:ns="http://sample.bpel.org/bpel/sampleArtifacts";
xmlns:tns="http://sample.bpel.org/bpel/sample"; exitOnStandardFault="yes"
name="EPRTest2" suppressJoinFailure="yes"
targetNamespace="http://sample.bpel.org/bpel/sample";
expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+ <bpws:import importType="http://schemas.xmlsoap.org/wsdl/";
location="OnEventCorrelation.wsdl"
namespace="http://sample.bpel.org/bpel/sample"/>
+ <bpws:import importType="http://schemas.xmlsoap.org/wsdl/";
location="OnEventCorrelationArtifacts.wsdl"
namespace="http://sample.bpel.org/bpel/sampleArtifacts"/>
+ <bpws:partnerLinks>
+ <bpws:partnerLink myRole="OnEventCorrelationProvider" name="client"
partnerLinkType="tns:OnEventCorrelation"/>
+ </bpws:partnerLinks>
+ <bpws:variables>
+ <bpws:variable messageType="tns:OnEventCorrelationMessage" name="input"/>
+ <bpws:variable messageType="tns:OnEventCorrelationMessage" name="output"/>
+ <bpws:variable type="xsd:string" name="s"/>
+ </bpws:variables>
+ <bpws:correlationSets>
+ <bpws:correlationSet name="CorrelationSet" properties="ns:input"/>
+ </bpws:correlationSets>
+ <bpws:sequence name="main">
+
+ <bpws:receive createInstance="yes" operation="opInOut"
partnerLink="client" portType="tns:OnEventCorrelation" variable="input">
+ </bpws:receive>
+
+ <bpws:assign>
+ <bpws:copy>
+ <bpws:from>$input.payload</bpws:from>
+ <bpws:to>$output.payload</bpws:to>
+ </bpws:copy>
+ <bpws:copy>
+ <bpws:from>concat($input.data, '-EPRTest2')</bpws:from>
+ <bpws:to>$output.data</bpws:to>
+ </bpws:copy>
+ </bpws:assign>
+
+ <bpws:reply operation="opInOut" partnerLink="client" variable="output"/>
+ </bpws:sequence>
+</bpws:process>
+
Propchange:
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/EPRTest2.bpel
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/deploy.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/deploy.xml?rev=817310&r1=817309&r2=817310&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/deploy.xml
(original)
+++
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/deploy.xml
Mon Sep 21 16:18:43 2009
@@ -159,5 +159,18 @@
</dd:process>
+ <dd:process name="bpel:EPRTest" fileName="EPRTest.bpel">
+ <!--dd:process-events generate="none"/-->
+ <dd:provide partnerLink="client">
+ <dd:service name="bpel:EPRTest" port="default" />
+ </dd:provide>
+ </dd:process>
+
+ <dd:process name="bpel:EPRTest2" fileName="EPRTest2.bpel">
+ <dd:provide partnerLink="client">
+ <dd:service name="bpel:EPRTest2" port="default" />
+ </dd:provide>
+ </dd:process>
+
</dd:deploy>
Modified:
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/smx.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/smx.xml?rev=817310&r1=817309&r2=817310&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/smx.xml
(original)
+++
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/smx.xml
Mon Sep 21 16:18:43 2009
@@ -135,10 +135,27 @@
</eip:rules>
</eip:content-based-router>
+
</eip:endpoints>
</eip:component>
</sm:component>
</sm:activationSpec>
+ <sm:activationSpec id="http">
+ <sm:component>
+ <http:component>
+ <http:endpoints>
+ <http:endpoint
+ service="bpel:EPRTest2"
+ endpoint="http"
+ role="consumer"
+ locationURI="http://localhost:8192/EPRTest2/";
+
defaultMep="http://www.w3.org/2004/08/wsdl/in-out";
+ defaultOperation="opInOut"
+ soap="true" />
+ </http:endpoints>
+ </http:component>
+ </sm:component>
+ </sm:activationSpec>
</sm:activationSpecs>
</sm:container>
</beans>
Modified:
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/test.properties
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/test.properties?rev=817310&r1=817309&r2=817310&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/test.properties
(original)
+++
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/CommunicationJbiTest/test.properties
Mon Sep 21 16:18:43 2009
@@ -15,8 +15,13 @@
# limitations under the License.
#
-nmr.service={http://sample.bpel.org/bpel/sample}OnEventCorrelation010
-nmr.operation=opInOut
-request=<msg><payload>abc3-010</payload><data>t3-010</data></msg>
-response=.*result-r1tIn1tIn2tInOut3tInOut4.*
+1nmr.service={http://sample.bpel.org/bpel/sample}OnEventCorrelation010
+1nmr.operation=opInOut
+1request=<msg><payload>abc3-010</payload><data>t3-010</data></msg>
+1response=.*result-r1tIn1tIn2tInOut3tInOut4.*
+
+2nmr.service={http://sample.bpel.org/bpel/sample}EPRTest
+2nmr.operation=opInOut
+2request=<msg><payload>test</payload><data>EPRTest</data></msg>
+2response=.*EPRTest-EPRTest2-EPRTest2.*
Modified:
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionExternalJbiTest/Main.bpel
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionExternalJbiTest/Main.bpel?rev=817310&r1=817309&r2=817310&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionExternalJbiTest/Main.bpel
(original)
+++
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionExternalJbiTest/Main.bpel
Mon Sep 21 16:18:43 2009
@@ -55,9 +55,9 @@
<!-- Initializing message, starting the responder process with the magic
session
and expecting a callback -->
<assign>
- <copy>
+ <copy keepSrcElementName="yes">
<from partnerLink="responderPartnerLink" endpointReference="myRole"/>
- <to variable="dummy2" part="reply-to"/>
+ <to>$dummy2.reply-to/*</to>
</copy>
<copy>
<from>123</from>
@@ -86,9 +86,9 @@
<!-- Sending our endpoint explicitly to have our partner calling us back
using it
(demonstrating assignment) -->
<assign>
- <copy>
+ <copy keepSrcElementName="yes">
<from partnerLink="responderPartnerLink" endpointReference="myRole"/>
- <to variable="eprmessage" part="payload"/>
+ <to>$eprmessage.payload/*</to>
</copy>
</assign>
<invoke name="eprPassing" partnerLink="responderPartnerLink"
portType="test:MSResponderPortType"
Modified:
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionExternalJbiTest/Main.wsdl
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionExternalJbiTest/Main.wsdl?rev=817310&r1=817309&r2=817310&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionExternalJbiTest/Main.wsdl
(original)
+++
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionExternalJbiTest/Main.wsdl
Mon Sep 21 16:18:43 2009
@@ -25,15 +25,8 @@
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";>
- <wsdl:types>
- <xsd:schema>
- <xsd:import namespace="http://www.w3.org/2005/08/addressing";
schemaLocation="ws-addr.xsd"/>
- </xsd:schema>
- </wsdl:types>
-
<wsdl:message name="ExecuteMessage">
<wsdl:part name="payload" type="xsd:string"/>
</wsdl:message>
@@ -56,7 +49,7 @@
<wsdl:message name="InitiateMessage">
<wsdl:part name="payload" type="xsd:string"/>
- <wsdl:part name="reply-to" type="wsa:EndpointReferenceType"/>
+ <wsdl:part name="reply-to" type="xsd:anyType"/>
</wsdl:message>
<wsdl:message name="DoubleCallMessage">
@@ -64,7 +57,7 @@
</wsdl:message>
<wsdl:message name="TripleCallMessage">
- <wsdl:part name="payload" type="wsa:EndpointReferenceType"/>
+ <wsdl:part name="payload" type="xsd:anyType"/>
</wsdl:message>
<wsdl:portType name="MSExecutePortType">
Modified:
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionExternalJbiTest/Responder.bpel
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionExternalJbiTest/Responder.bpel?rev=817310&r1=817309&r2=817310&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionExternalJbiTest/Responder.bpel
(original)
+++
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionExternalJbiTest/Responder.bpel
Mon Sep 21 16:18:43 2009
@@ -48,7 +48,7 @@
portType="resp:MSResponderPortType" operation="initiate"
createInstance="yes"/>
<assign>
<copy>
- <from variable="dummy2" part="reply-to"/>
+ <from>$dummy2.reply-to/*</from>
<to partnerLink="mainPartnerLink"/>
</copy>
<copy>
@@ -77,7 +77,7 @@
portType="resp:MSResponderPortType"
operation="EndpointReference"/>
<assign>
<copy>
- <from variable="eprmessage" part="payload"/>
+ <from>$eprmessage.payload/*</from>
<to partnerLink="mainPartnerLink"/>
</copy>
<copy>
Modified:
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionJbiTest/Main.bpel
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionJbiTest/Main.bpel?rev=817310&r1=817309&r2=817310&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionJbiTest/Main.bpel
(original)
+++
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionJbiTest/Main.bpel
Mon Sep 21 16:18:43 2009
@@ -55,6 +55,10 @@
<!-- Initializing message, starting the responder process with the magic
session
and expecting a callback -->
<assign>
+ <copy keepSrcElementName="yes">
+ <from partnerLink="responderPartnerLink" endpointReference="myRole"/>
+ <to>$dummy2.reply-to/*</to>
+ </copy>
<copy>
<from>123</from>
<to variable="dummy2" part="payload"/>
@@ -82,9 +86,9 @@
<!-- Sending our endpoint explicitly to have our partner calling us back
using it
(demonstrating assignment) -->
<assign>
- <copy>
+ <copy keepSrcElementName="yes">
<from partnerLink="responderPartnerLink" endpointReference="myRole"/>
- <to variable="eprmessage" part="payload"/>
+ <to>$eprmessage.payload/*</to>
</copy>
</assign>
<invoke name="eprPassing" partnerLink="responderPartnerLink"
portType="test:MSResponderPortType"
@@ -104,4 +108,4 @@
portType="test:MSExecutePortType" operation="execute"
variable="result"/>
</sequence>
-</process>
\ No newline at end of file
+</process>
Modified:
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionJbiTest/Main.wsdl
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionJbiTest/Main.wsdl?rev=817310&r1=817309&r2=817310&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionJbiTest/Main.wsdl
(original)
+++
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionJbiTest/Main.wsdl
Mon Sep 21 16:18:43 2009
@@ -25,15 +25,8 @@
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";>
- <wsdl:types>
- <xsd:schema>
- <xsd:import namespace="http://www.w3.org/2005/08/addressing";
schemaLocation="ws-addr.xsd"/>
- </xsd:schema>
- </wsdl:types>
-
<wsdl:message name="ExecuteMessage">
<wsdl:part name="payload" type="xsd:string"/>
</wsdl:message>
@@ -56,7 +49,7 @@
<wsdl:message name="InitiateMessage">
<wsdl:part name="payload" type="xsd:string"/>
- <wsdl:part name="reply-to" type="wsa:EndpointReferenceType"/>
+ <wsdl:part name="reply-to" type="xsd:anyType"/>
</wsdl:message>
<wsdl:message name="DoubleCallMessage">
@@ -64,7 +57,7 @@
</wsdl:message>
<wsdl:message name="TripleCallMessage">
- <wsdl:part name="payload" type="wsa:EndpointReferenceType"/>
+ <wsdl:part name="payload" type="xsd:anyType"/>
</wsdl:message>
<wsdl:portType name="MSExecutePortType">
Modified:
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionJbiTest/Responder.bpel
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionJbiTest/Responder.bpel?rev=817310&r1=817309&r2=817310&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionJbiTest/Responder.bpel
(original)
+++
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/MagicSessionJbiTest/Responder.bpel
Mon Sep 21 16:18:43 2009
@@ -30,7 +30,7 @@
<partnerLinks>
<partnerLink name="mainPartnerLink"
partnerLinkType="resp:ResponderPartnerLinkType"
- myRole="responder" partnerRole="main"
initializePartnerRole="yes"/>
+ myRole="responder" partnerRole="main"
initializePartnerRole="no"/>
</partnerLinks>
<variables>
@@ -48,6 +48,10 @@
portType="resp:MSResponderPortType" operation="initiate"
createInstance="yes"/>
<assign>
<copy>
+ <from>$dummy2.reply-to/*</from>
+ <to partnerLink="mainPartnerLink"/>
+ </copy>
+ <copy>
<from>123</from>
<to variable="dummy3" part="payload"/>
</copy>
@@ -73,7 +77,7 @@
portType="resp:MSResponderPortType"
operation="EndpointReference"/>
<assign>
<copy>
- <from variable="eprmessage" part="payload"/>
+ <from>$eprmessage.payload/*</from>
<to partnerLink="mainPartnerLink"/>
</copy>
<copy>
@@ -85,4 +89,4 @@
portType="resp:MSMainPortType" operation="tripleCallback"
inputVariable="dummy6"/>
</sequence>
-</process>
\ No newline at end of file
+</process>
Modified: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/log4j.properties?rev=817310&r1=817309&r2=817310&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/log4j.properties
(original)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/log4j.properties Mon Sep
21 16:18:43 2009
@@ -34,6 +34,8 @@
log4j.appender.stdout.layout.conversionpattern=%d{mm...@hh:mm:ss} %-5p
(%13F:%L) %3x - %m%n
log4j.category.org.apache.servicemix.jbi.nmr.flow.seda=DEBUG
+log4j.category.org.apache.ode.jbi.EndpointReferenceContextImpl=DEBUG
+#log4j.category.org.apache.ode.bpel=DEBUG
log4j.category.httpclient=DEBUG
log4j.category.httpclient.Wire=DEBUG
