Author: mriou
Date: Wed Apr 16 16:28:20 2008
New Revision: 648894
URL: http://svn.apache.org/viewvc?rev=648894&view=rev
Log:
Working on my karma. Fixed a routing test that was broken in all sort of tricky
ways. I'll need those to work on routing.
Modified:
ode/branches/APACHE_ODE_1.1/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/ProbeService/probeService.wsdl
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/deploy.xml
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test1.properties
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test2.properties
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.bpel
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.wsdl
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/log4j.properties
Modified:
ode/branches/APACHE_ODE_1.1/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java?rev=648894&r1=648893&r2=648894&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.1/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
(original)
+++
ode/branches/APACHE_ODE_1.1/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
Wed Apr 16 16:28:20 2008
@@ -62,7 +62,7 @@
public abstract class BPELTestAbstract {
private static final String SHOW_EVENTS_ON_CONSOLE = "no";
-
+
protected BpelServerImpl _server;
protected ProcessStore store;
@@ -162,19 +162,16 @@
System.err.println("Error undeploying " + d);
}
}
-
- if (em != null)
- em.close();
- if (emf != null)
- emf.close();
-
+ if (em != null) em.close();
+ if (emf != null) emf.close();
+
_server.stop();
_failures = null;
_deployed = null;
_deployments = null;
_invocations = null;
-
+
}
protected void negative(String deployDir) throws Throwable {
@@ -259,7 +256,7 @@
_invocations.add(inv);
return inv;
}
-
+
protected void go() throws Exception {
try {
doDeployments();
@@ -271,23 +268,23 @@
protected void checkFailure() {
StringBuffer sb = new StringBuffer("Failure report:\n");
- for (Failure failure : _failures) {
+ for (Failure failure : _failures) {
sb.append(failure);
sb.append('\n');
}
- if (_failures.size() != 0) {
- System.err.println(sb.toString());
+ if (_failures.size() != 0) {
+ System.err.println(sb.toString());
Assert.fail(sb.toString());
- }
+ }
}
-
+
protected Deployment deploy(String location) {
Deployment deployment = new Deployment(makeDeployDir(location));
doDeployment(deployment);
return deployment;
}
-
+
protected void doDeployments() {
for (Deployment d : _deployments)
doDeployment(d);
@@ -295,7 +292,7 @@
/**
* Do all the registered deployments.
- *
+ *
* @param d
*/
protected void doDeployment(Deployment d) {
@@ -303,7 +300,7 @@
try {
procs = store.deploy(d.deployDir);
-
+
_deployed.add(d);
} catch (Exception ex) {
if (d.expectedException == null) {
@@ -311,7 +308,7 @@
failure(d, "DEPLOY: Unexpected exception: " + ex, ex);
} else if (!d.expectedException.isAssignableFrom(ex.getClass())) {
ex.printStackTrace();
- failure(d, "DEPLOY: Wrong exception; expected " +
d.expectedException + " but got " + ex.getClass(), ex);
+ failure(d, "DEPLOY: Wrong exception; expected " +
d.expectedException + " but got " + ex.getClass(), ex);
}
@@ -342,7 +339,7 @@
failure(d, "Undeployment failed.", ex);
}
}
-
+
_deployments.clear();
}
@@ -359,8 +356,10 @@
testThreads.add(t);
}
- for (Thread testThread : testThreads)
+ for (Thread testThread : testThreads) {
testThread.start();
+ if (testThreads.size() > 0) Thread.sleep(2000);
+ }
for (Thread testThread : testThreads)
testThread.join();
@@ -394,28 +393,28 @@
Assert.fail("Resource not found: " + deployxml);
}
try {
- return new
File(deployxmlurl.toURI().getPath()).getParentFile();
- } catch (URISyntaxException e) {
- e.printStackTrace();
- Assert.fail(e.getMessage());
- return null;
- }
+ return new File(deployxmlurl.toURI().getPath()).getParentFile();
+ } catch (URISyntaxException e) {
+ e.printStackTrace();
+ Assert.fail(e.getMessage());
+ return null;
+ }
}
/**
* Override this to provide configuration properties for Ode extensions
* like BpelEventListeners.
- *
+ *
* @return
*/
protected Properties getConfigProperties() {
- // could also return null, returning an empty properties
- // object is more fail-safe.
- Properties p = new Properties();
- p.setProperty("debugeventlistener.dumpToStdOut",
SHOW_EVENTS_ON_CONSOLE);
- return p;
+ // could also return null, returning an empty properties
+ // object is more fail-safe.
+ Properties p = new Properties();
+ p.setProperty("debugeventlistener.dumpToStdOut",
SHOW_EVENTS_ON_CONSOLE);
+ return p;
}
-
+
protected static class Failure {
Object where;
@@ -442,7 +441,7 @@
public String toString() {
StringBuffer sbuf = new StringBuffer(where + ": " + msg);
if (ex != null) {
- sbuf.append("; got exception msg: " + ex.getMessage());
+ sbuf.append("; got exception msg: " + ex.getMessage());
}
if (actual != null)
sbuf.append("; got " + actual + ", expected " + expected);
@@ -452,9 +451,9 @@
/**
* Represents a test deployement.
- *
+ *
* @author mszefler
- *
+ *
*/
public static class Deployment {
/** The directory containing the deploy.xml and artefacts. */
@@ -474,7 +473,7 @@
/**
* Represents an test invocation of the BPEL engine.
- *
+ *
* @author mszefler
*/
public static class Invocation {
@@ -600,23 +599,23 @@
if (isFailed())
return;
- scheduler.begin();
- try {
- Status finalstat = mex.getStatus();
- if (_invocation.expectedFinalStatus != null &&
!_invocation.expectedFinalStatus.equals(finalstat))
- if (finalstat.equals(Status.FAULT)) {
- failure(_invocation, "Unexpected final message exchange
status", _invocation.expectedFinalStatus, "FAULT: "
- + mex.getFault() + " | " +
mex.getFaultExplanation());
- } else {
- failure(_invocation, "Unexpected final message exchange
status", _invocation.expectedFinalStatus, finalstat);
+ if (_invocation.expectedResponsePattern != null) {
+ scheduler.begin();
+ try {
+ Status finalstat = mex.getStatus();
+ if (_invocation.expectedFinalStatus != null &&
!_invocation.expectedFinalStatus.equals(finalstat))
+ if (finalstat.equals(Status.FAULT)) {
+ failure(_invocation, "Unexpected final message
exchange status", _invocation.expectedFinalStatus, "FAULT: "
+ + mex.getFault() + " | " +
mex.getFaultExplanation());
+ } else {
+ failure(_invocation, "Unexpected final message
exchange status", _invocation.expectedFinalStatus, finalstat);
+ }
+
+ if (_invocation.expectedFinalCorrelationStatus != null
+ &&
!_invocation.expectedFinalCorrelationStatus.equals(mex.getCorrelationStatus()))
{
+ failure(_invocation, "Unexpected final correlation
status", _invocation.expectedFinalCorrelationStatus, mex
+ .getCorrelationStatus());
}
-
- if (_invocation.expectedFinalCorrelationStatus != null
- &&
!_invocation.expectedFinalCorrelationStatus.equals(mex.getCorrelationStatus()))
{
- failure(_invocation, "Unexpected final correlation
status", _invocation.expectedFinalCorrelationStatus, mex
- .getCorrelationStatus());
- }
- if (_invocation.expectedResponsePattern != null) {
if (mex.getResponse() == null)
failure(_invocation, "Expected response, but got
none.", null);
String responseStr =
DOMUtils.domToString(mex.getResponse().getMessage());
@@ -624,9 +623,9 @@
Matcher matcher =
_invocation.expectedResponsePattern.matcher(responseStr);
if (!matcher.matches())
failure(_invocation, "Response does not match expected
pattern", _invocation.expectedResponsePattern, responseStr);
+ } finally {
+ scheduler.commit();
}
- } finally {
- scheduler.commit();
}
}
}
Modified:
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java?rev=648894&r1=648893&r2=648894&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java
(original)
+++
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java
Wed Apr 16 16:28:20 2008
@@ -23,7 +23,7 @@
public class MessageRouting20Test extends BPELTestAbstract {
- @Ignore("fix test bed for handling ASYNC mex") @Test public void
testCorrelation() throws Throwable {
+ @Test public void testCorrelation() throws Throwable {
go("/bpel/2.0/TestCorrelation");
}
Modified:
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/ProbeService/probeService.wsdl
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/ProbeService/probeService.wsdl?rev=648894&r1=648893&r2=648894&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/ProbeService/probeService.wsdl
(original)
+++
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/ProbeService/probeService.wsdl
Wed Apr 16 16:28:20 2008
@@ -18,24 +18,32 @@
-->
<wsdl:definitions targetNamespace="http://ode/bpel/unit-test/ProbeService.wsdl";
- xmlns:tns="http://ode/bpel/unit-test/ProbeService.wsdl";
- xmlns:xsd="http://www.w3.org/2001/XMLSchema";
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
- xmlns="http://ode/bpel/unit-test/ProbeService.wsdl";>
+ xmlns:tns="http://ode/bpel/unit-test/ProbeService.wsdl";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
+ xmlns="http://ode/bpel/unit-test/ProbeService.wsdl";>
+ <wsdl:message name="probeMessage">
+ <wsdl:part name="probeName" type="xsd:string"/>
+ <wsdl:part name="probeData" type="xsd:string"/>
+ </wsdl:message>
- <wsdl:message name="probeMessage">
- <wsdl:part name="probeName" type="xsd:string"/>
- <wsdl:part name="probeData" type="xsd:string"/>
- </wsdl:message>
+ <wsdl:portType name="probeMessagePT">
+ <wsdl:operation name="probe">
+ <wsdl:input name="ProbeInputMessage" message="tns:probeMessage"/>
+ <wsdl:output name="ProbeOutputMessage" message="tns:probeMessage"/>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="probeBinding" type="tns:probeMessagePT">
+ <wsdl:operation name="probe">
+ </wsdl:operation>
+ </wsdl:binding>
- <wsdl:portType name="probeMessagePT">
- <wsdl:operation name="probe">
- <wsdl:input name="ProbeInputMessage" message="tns:probeMessage"/>
- <wsdl:output name="ProbeOutputMessage" message="tns:probeMessage"/>
- </wsdl:operation>
- </wsdl:portType>
+ <wsdl:service name="ProbeService">
+ <wsdl:port name="ProbePort" binding="tns:probeBinding">
+ </wsdl:port>
+ </wsdl:service>
</wsdl:definitions>
Modified:
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/deploy.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/deploy.xml?rev=648894&r1=648893&r2=648894&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/deploy.xml
(original)
+++
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/deploy.xml
Wed Apr 16 16:28:20 2008
@@ -19,6 +19,7 @@
<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03";
xmlns:pns="http://ode/bpel/unit-test/testCorrelation";
+ xmlns:prns="http://ode/bpel/unit-test/ProbeService.wsdl";
xmlns:wns="http://ode/bpel/unit-test/testCorrelation.wsdl";>
@@ -27,5 +28,8 @@
<provide partnerLink="request">
<service name="wns:testCorrelationService"
port="wns:testCorrelationPort"/>
</provide>
+ <invoke partnerLink="probe">
+ <service name="prns:testCorrelationService"
port="prns:testCorrelationPort"/>
+ </invoke>
</process>
</deploy>
Modified:
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test1.properties
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test1.properties?rev=648894&r1=648893&r2=648894&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test1.properties
(original)
+++
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test1.properties
Wed Apr 16 16:28:20 2008
@@ -18,5 +18,5 @@
namespace=http://ode/bpel/unit-test/testCorrelation.wsdl
service=testCorrelationService
operation=request
-request1=<message><requestMessageData><testMessage><requestID>Start
Test5.1</requestID><requestText>Event Start
Test5.1</requestText><requestEnd>no</requestEnd></testMessage></requestMessageData></message>
-response1=ASYNC
\ No newline at end of file
+request1=<message><requestMessageData><requestID>Start
Test5.1</requestID><requestText>Event Start
Test5.1</requestText><requestEnd>no</requestEnd></requestMessageData></message>
+response1=.*Event Start Test5.1 -> loop on receive until message includes
requestEnd = yes -> received message -> process complete.*
Modified:
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test2.properties
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test2.properties?rev=648894&r1=648893&r2=648894&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test2.properties
(original)
+++
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test2.properties
Wed Apr 16 16:28:20 2008
@@ -18,5 +18,4 @@
namespace=http://ode/bpel/unit-test/testCorrelation.wsdl
service=testCorrelationService
operation=continue
-request1=<message><requestMessageData><testMessage><requestID>Start
Test5.1</requestID><requestText>Event Start
Test5.2.1</requestText><requestEnd>yes</requestEnd></testMessage></requestMessageData></message>
-response1=.*Event Start Test5.1 -> loop on receive until message includes
requestEnd = yes -> received message -> process complete.*
+request1=<message><requestMessageData><requestID>Start
Test5.1</requestID><requestText>Event Start
Test5.2.1</requestText><requestEnd>yes</requestEnd></requestMessageData></message>
Modified:
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.bpel
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.bpel?rev=648894&r1=648893&r2=648894&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.bpel
(original)
+++
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.bpel
Wed Apr 16 16:28:20 2008
@@ -1,118 +1,118 @@
-<!--
- ~ 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 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable
../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
- xmlns:tns="http://ode/bpel/unit-test/testCorrelation";
- xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl";
- xmlns:wns="http://ode/bpel/unit-test/testCorrelation.wsdl";
- xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable";
- name="TestCorrelationProcess"
- targetNamespace="http://ode/bpel/unit-test/testCorrelation";
- queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- suppressJoinFailure="yes">
-
- <import location="testCorrelation.wsdl"
- namespace="http://ode/bpel/unit-test/testCorrelation.wsdl";
- importType="http://schemas.xmlsoap.org/wsdl/"; />
- <import location="../ProbeService/probeService.wsdl"
- namespace="http://ode/bpel/unit-test/ProbeService.wsdl";
- importType="http://schemas.xmlsoap.org/wsdl/"/>
-
- <!-- test correlated receive -->
- <partnerLinks>
- <partnerLink name="request"
partnerLinkType="wns:testCorrelationRequest" myRole="testCorrelationService"/>
- <partnerLink name="probe" partnerLinkType="wns:probeRequest"
partnerRole="probeService" initializePartnerRole="yes"/>
- </partnerLinks>
- <variables>
- <variable name="request" messageType="wns:requestMessage"/>
- <variable name="probeInput" messageType="prb:probeMessage"/>
- <variable name="reply" messageType="wns:replyMessage"/>
- </variables>
- <correlationSets>
- <correlationSet name="testCorr1" properties="wns:testProbeID"/>
- </correlationSets>
- <sequence>
- <receive name="receive1" partnerLink="request"
portType="wns:testCorrelationPT" operation="request" variable="request"
createInstance="yes">
- <correlations>
- <correlation set="testCorr1" initiate="yes"/>
- </correlations>
- </receive>
- <!-- Copy input variables to internal accumulators -->
- <assign name="assign1">
- <copy>
- <from variable="request"
property="wns:testProbeID"/>
- <to variable="probeInput" part="probeName"/>
- </copy>
- <copy>
- <from variable="request"
property="wns:testProbeData"/>
- <to variable="probeInput" part="probeData"/>
- </copy>
- </assign>
- <assign>
- <copy>
- <from>
- <literal><![CDATA[loop on receive until
message includes requestEnd = yes]]></literal>
- </from>
- <to variable="probeInput" part="probeName"/>
- </copy>
- </assign>
- <invoke name="probe" partnerLink="probe"
portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput"
outputVariable="probeInput"> </invoke>
- <while>
- <condition>$request.requestMessageData/requestEnd =
'no'</condition>
- <sequence>
- <receive name="receive2" partnerLink="request"
portType="wns:testCorrelationPT" operation="continue" variable="request">
- <correlations>
- <correlation set="testCorr1"/>
- </correlations>
- </receive>
- <assign>
- <copy>
- <from>
-
<literal><![CDATA[received message]]></literal>
- </from>
- <to variable="probeInput"
part="probeName"/>
- </copy>
- </assign>
- <invoke name="probe" partnerLink="probe"
portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput"
outputVariable="probeInput"> </invoke>
- </sequence>
- </while>
- <assign>
- <copy>
- <from>
- <literal><![CDATA[process
complete]]></literal>
- </from>
- <to variable="probeInput" part="probeName"/>
- </copy>
- </assign>
- <invoke name="probe" partnerLink="probe"
portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput"
outputVariable="probeInput"> </invoke>
- <assign name="assign2">
- <copy>
- <from variable="probeInput" part="probeName"/>
- <to variable="reply" part="replyID"/>
- </copy>
- <copy>
- <from variable="probeInput" part="probeData"/>
- <to variable="reply" part="replyText"/>
- </copy>
- </assign>
- <reply name="reply" partnerLink="request"
portType="wns:testCorrelationPT" operation="continue" variable="reply"> </reply>
- </sequence>
+<!--
+ ~ 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 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable
../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
+ xmlns:tns="http://ode/bpel/unit-test/testCorrelation";
+ xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl";
+ xmlns:wns="http://ode/bpel/unit-test/testCorrelation.wsdl";
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable";
+ name="TestCorrelationProcess"
+ targetNamespace="http://ode/bpel/unit-test/testCorrelation";
+ queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ suppressJoinFailure="yes">
+
+ <import location="testCorrelation.wsdl"
+ namespace="http://ode/bpel/unit-test/testCorrelation.wsdl";
+ importType="http://schemas.xmlsoap.org/wsdl/"; />
+ <import location="../ProbeService/probeService.wsdl"
+ namespace="http://ode/bpel/unit-test/ProbeService.wsdl";
+ importType="http://schemas.xmlsoap.org/wsdl/"/>
+
+ <!-- test correlated receive -->
+ <partnerLinks>
+ <partnerLink name="request"
partnerLinkType="wns:testCorrelationRequest" myRole="testCorrelationService"/>
+ <partnerLink name="probe" partnerLinkType="wns:probeRequest"
partnerRole="probeService" initializePartnerRole="yes"/>
+ </partnerLinks>
+ <variables>
+ <variable name="request" messageType="wns:requestMessage"/>
+ <variable name="probeInput" messageType="prb:probeMessage"/>
+ <variable name="reply" messageType="wns:replyMessage"/>
+ </variables>
+ <correlationSets>
+ <correlationSet name="testCorr1" properties="wns:testProbeID"/>
+ </correlationSets>
+ <sequence>
+ <receive name="receive1" partnerLink="request"
portType="wns:testCorrelationPT" operation="request" variable="request"
createInstance="yes">
+ <correlations>
+ <correlation set="testCorr1" initiate="yes"/>
+ </correlations>
+ </receive>
+ <!-- Copy input variables to internal accumulators -->
+ <assign name="assign1">
+ <copy>
+ <from variable="request"
property="wns:testProbeID"/>
+ <to variable="probeInput" part="probeName"/>
+ </copy>
+ <copy>
+ <from variable="request"
property="wns:testProbeData"/>
+ <to variable="probeInput" part="probeData"/>
+ </copy>
+ </assign>
+ <assign>
+ <copy>
+ <from>
+ <literal><![CDATA[loop on receive until
message includes requestEnd = yes]]></literal>
+ </from>
+ <to variable="probeInput" part="probeName"/>
+ </copy>
+ </assign>
+ <invoke name="probe" partnerLink="probe"
portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput"
outputVariable="probeInput"> </invoke>
+ <while>
+ <condition>$request.requestMessageData/requestEnd =
'no'</condition>
+ <sequence>
+ <receive name="receive2" partnerLink="request"
portType="wns:testCorrelationPT" operation="continue" variable="request">
+ <correlations>
+ <correlation set="testCorr1"/>
+ </correlations>
+ </receive>
+ <assign>
+ <copy>
+ <from>
+
<literal><![CDATA[received message]]></literal>
+ </from>
+ <to variable="probeInput"
part="probeName"/>
+ </copy>
+ </assign>
+ <invoke name="probe" partnerLink="probe"
portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput"
outputVariable="probeInput"> </invoke>
+ </sequence>
+ </while>
+ <assign>
+ <copy>
+ <from>
+ <literal><![CDATA[process
complete]]></literal>
+ </from>
+ <to variable="probeInput" part="probeName"/>
+ </copy>
+ </assign>
+ <invoke name="probe" partnerLink="probe"
portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput"
outputVariable="probeInput"> </invoke>
+ <assign name="assign2">
+ <copy>
+ <from variable="probeInput" part="probeName"/>
+ <to variable="reply" part="replyID"/>
+ </copy>
+ <copy>
+ <from variable="probeInput" part="probeData"/>
+ <to variable="reply" part="replyText"/>
+ </copy>
+ </assign>
+ <reply name="reply" partnerLink="request"
portType="wns:testCorrelationPT" operation="request" variable="reply"> </reply>
+ </sequence>
</process>
Modified:
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.wsdl
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.wsdl?rev=648894&r1=648893&r2=648894&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.wsdl
(original)
+++
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.wsdl
Wed Apr 16 16:28:20 2008
@@ -17,86 +17,87 @@
~ under the License.
-->
-<wsdl:definitions
- targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl";
- xmlns:tns="http://ode/bpel/unit-test/testCorrelation.wsdl";
- xmlns:typens="http://ode/bpel/unit-test/testCorrelation.wsdl.types";
- xmlns="http://ode/bpel/unit-test/testCorrelation.wsdl";
- xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype";
- xmlns:xsd="http://www.w3.org/2001/XMLSchema";
- xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl";
- xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable";
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";>
-
-
- <!-- type defs -->
- <wsdl:types>
- <xsd:schema
- targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl.types";
+<wsdl:definitions
+ targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl";
+ xmlns:tns="http://ode/bpel/unit-test/testCorrelation.wsdl";
+ xmlns:typens="http://ode/bpel/unit-test/testCorrelation.wsdl.types";
+ xmlns="http://ode/bpel/unit-test/testCorrelation.wsdl";
+ xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl";
+ xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable";
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
+ xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop";>
+
+
+ <!-- type defs -->
+ <wsdl:types>
+ <xsd:schema
+
targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl.types";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
- <xsd:complexType name="testMessage">
- <xsd:sequence>
- <xsd:element name="requestID" type="xsd:string"/>
- <xsd:element name="requestText" type="xsd:string"/>
- <xsd:element name="requestEnd" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:schema>
- </wsdl:types>
-
-
- <wsdl:message name="requestMessage">
- <wsdl:part name="requestMessageData" type="typens:testMessage"/>
- </wsdl:message>
-
- <wsdl:message name="replyMessage">
- <wsdl:part name="replyID" type="xsd:string"/>
- <wsdl:part name="replyText" type="xsd:string"/>
- </wsdl:message>
-
-
- <wsdl:portType name="testCorrelationPT">
- <wsdl:operation name="request">
- <wsdl:input message="requestMessage"/>
- </wsdl:operation>
- <wsdl:operation name="continue">
- <wsdl:input message="requestMessage"/>
- <wsdl:output message="replyMessage"/>
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:binding name="TestCorrelationBinding" type="tns:testCorrelationPT">
- <wsdl:operation name="request">
- </wsdl:operation>
- <wsdl:operation name="continue">
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="TestCorrelationService">
- <wsdl:port name="TestCorrelationPort" binding="tns:TestCorrelationBinding">
- </wsdl:port>
- </wsdl:service>
-
- <plnk:partnerLinkType name="testCorrelationRequest">
- <plnk:role name="testCorrelationService" portType="testCorrelationPT"/>
- </plnk:partnerLinkType>
-
- <plnk:partnerLinkType name="probeRequest">
- <plnk:role name="probeService" portType="prb:probeMessagePT"/>
- </plnk:partnerLinkType>
-
- <bpws:property name="testProbeID" type="xsd:string"/>
- <bpws:propertyAlias propertyName="tns:testProbeID"
messageType="tns:requestMessage" part="requestMessageData">
- <bpws:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
- testMessage/requestID
- </bpws:query>
- </bpws:propertyAlias>
-
- <bpws:property name="testProbeData" type="xsd:string"/>
- <bpws:propertyAlias propertyName="tns:testProbeData"
messageType="tns:requestMessage" part="requestMessageData">
- <bpws:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
- testMessage/requestText
- </bpws:query>
- </bpws:propertyAlias>
+ <xsd:complexType name="testMessage">
+ <xsd:sequence>
+ <xsd:element name="requestID" type="xsd:string"/>
+ <xsd:element name="requestText" type="xsd:string"/>
+ <xsd:element name="requestEnd" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:schema>
+ </wsdl:types>
+
+
+ <wsdl:message name="requestMessage">
+ <wsdl:part name="requestMessageData" type="typens:testMessage"/>
+ </wsdl:message>
+
+ <wsdl:message name="replyMessage">
+ <wsdl:part name="replyID" type="xsd:string"/>
+ <wsdl:part name="replyText" type="xsd:string"/>
+ </wsdl:message>
+
+
+ <wsdl:portType name="testCorrelationPT">
+ <wsdl:operation name="request">
+ <wsdl:input message="requestMessage"/>
+ <wsdl:output message="replyMessage"/>
+ </wsdl:operation>
+ <wsdl:operation name="continue">
+ <wsdl:input message="requestMessage"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:binding name="TestCorrelationBinding" type="tns:testCorrelationPT">
+ <wsdl:operation name="request">
+ </wsdl:operation>
+ <wsdl:operation name="continue">
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="TestCorrelationService">
+ <wsdl:port name="TestCorrelationPort"
binding="tns:TestCorrelationBinding">
+ </wsdl:port>
+ </wsdl:service>
+
+ <plnk:partnerLinkType name="testCorrelationRequest">
+ <plnk:role name="testCorrelationService" portType="testCorrelationPT"/>
+ </plnk:partnerLinkType>
+
+ <plnk:partnerLinkType name="probeRequest">
+ <plnk:role name="probeService" portType="prb:probeMessagePT"/>
+ </plnk:partnerLinkType>
+
+ <prop:property name="testProbeID" type="xsd:string"/>
+ <prop:propertyAlias propertyName="tns:testProbeID"
messageType="tns:requestMessage" part="requestMessageData">
+ <prop:query
queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+ requestID
+ </prop:query>
+ </prop:propertyAlias>
+
+ <prop:property name="testProbeData" type="xsd:string"/>
+ <prop:propertyAlias propertyName="tns:testProbeData"
messageType="tns:requestMessage" part="requestMessageData">
+ <prop:query
queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+ requestText
+ </prop:query>
+ </prop:propertyAlias>
</wsdl:definitions>
Modified:
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/log4j.properties?rev=648894&r1=648893&r2=648894&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/log4j.properties
(original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/log4j.properties
Wed Apr 16 16:28:20 2008
@@ -15,17 +15,19 @@
# limitations under the License.
#
-# Set root logger level to WARN and its only appender to CONSOLE
-log4j.rootLogger=WARN, CONSOLE
-
-# log4j properties to work with commandline tools.
-log4j.category.org.mortbay=ERROR
-log4j.category.org.hibernate.type=WARN
-log4j.category.org.objectweb=ERROR
-log4j.category.org.apache.ode=DEBUG
-log4j.category.org.apache.ode.bpel.runtime=DEBUG
-
-# Console appender
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%p - %C{1}.%M(%L) | %m%n
+# Set root logger level to WARN and its only appender to CONSOLE
+log4j.rootLogger=WARN, CONSOLE
+
+# log4j properties to work with commandline tools.
+log4j.category.org.mortbay=ERROR
+log4j.category.org.hibernate.type=WARN
+log4j.category.org.objectweb=ERROR
+log4j.category.org.apache.ode.axis2=DEBUG
+log4j.category.org.apache.ode.bpel.engine=DEBUG
+log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=DEBUG
+log4j.category.org.apache.ode.bpel.epr=INFO
+
+# Console appender
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%p - %C{1}.%M(%L) | %m%n
