Author: mriou
Date: Mon Apr 2 14:46:26 2007
New Revision: 524935
URL: http://svn.apache.org/viewvc?view=rev&rev=524935
Log:
One more test fixed, 3 to go.
Modified:
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenContexts.java
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/test.properties
Modified:
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenContexts.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenContexts.java?view=diff&rev=524935&r1=524934&r2=524935
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenContexts.java
(original)
+++
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenContexts.java
Mon Apr 2 14:46:26 2007
@@ -28,6 +28,7 @@
import org.apache.ode.bpel.o.OMessageVarType;
import org.apache.ode.bpel.o.OProcess;
import org.apache.ode.bpel.o.OScope;
+import org.apache.ode.bpel.o.OVarType;
import org.apache.ode.bpel.o.OXsdTypeVarType;
import org.apache.ode.bpel.o.OXslSheet;
import org.apache.ode.utils.DOMUtils;
@@ -170,7 +171,10 @@
if (variableNode == null)
throw new WrappedFaultException.JaxenUnresolvableException(
new
FaultException(variable.getOwner().constants.qnSelectionFailure, "Unknown
variable " + localName));
- if (variable.type instanceof OXsdTypeVarType &&
((OXsdTypeVarType)variable.type).simple) {
+ OVarType type = variable.type;
+ if (type instanceof OMessageVarType) type =
((OMessageVarType)type).parts.get(partName).type;
+
+ if (type instanceof OXsdTypeVarType &&
((OXsdTypeVarType)type).simple) {
String text = variableNode.getTextContent();
try {
return
XSTypes.toJavaObject(((OXsdTypeVarType)variable.type).xsdType,
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/test.properties
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/test.properties?view=diff&rev=524935&r1=524934&r2=524935
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/test.properties
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/test.properties
Mon Apr 2 14:46:26 2007
@@ -2,14 +2,14 @@
service=TestFlowActivityService
operation=request
request1=<message><requestMessageData><testMessage><requestID>Start
Test1.1</requestID><requestText>Event Start
Test1.1</requestText><flowIndicators><indicatorOne>yes</indicatorOne><indicatorTwo>yes</indicatorTwo></flowIndicators><loopIndicator>min</loopIndicator></testMessage></requestMessageData></message>
-response1=.*processes A and B merge on process C -> merge into root process
-> test switch statement -> case min: set loop iterations = 5 -> test
loop iterations -> 2 -> 3 -> 4 -> 5 -> 6 -> test1Process
complete.*
+response1=.*processes A and B merge on process C -> merge into root process
-> test switch statement -> case min: set loop iterations = 5 -> test
loop iterations -> 2\.0 -> 3\.0 -> 4\.0 -> 5\.0 -> 6\.0 ->
test1Process complete.*
request2=<message><requestMessageData><testMessage><requestID>Start
Test1.2</requestID><requestText>Event Start
Test1.2</requestText><flowIndicators><indicatorOne>yes</indicatorOne><indicatorTwo>no</indicatorTwo></flowIndicators><loopIndicator>min</loopIndicator></testMessage></requestMessageData></message>
-response2=.*merge into root process -> test switch statement -> case
min: set loop iterations = 5 -> test loop iterations -> 2 -> 3 -> 4
-> 5 -> 6 -> test1Process complete.*
+response2=.*merge into root process -> test switch statement -> case
min: set loop iterations = 5 -> test loop iterations -> 2\.0 -> 3\.0
-> 4\.0 -> 5\.0 -> 6\.0 -> test1Process complete.*
request3=<message><requestMessageData><testMessage><requestID>Start
Test1.3</requestID><requestText>Event Start
Test1.3</requestText><flowIndicators><indicatorOne>no</indicatorOne><indicatorTwo>yes</indicatorTwo></flowIndicators><loopIndicator>min</loopIndicator></testMessage></requestMessageData></message>
-response3=.*merge into root process -> test switch statement -> case
min: set loop iterations = 5 -> test loop iterations -> 2 -> 3 -> 4
-> 5 -> 6 -> test1Process complete.*
+response3=.*merge into root process -> test switch statement -> case
min: set loop iterations = 5 -> test loop iterations -> 2\.0 -> 3\.0
-> 4\.0 -> 5\.0 -> 6\.0 -> test1Process complete.*
request4=<message><requestMessageData><testMessage><requestID>Start
Test1.4</requestID><requestText>Event Start
Test1.4</requestText><flowIndicators><indicatorOne>no</indicatorOne><indicatorTwo>no</indicatorTwo></flowIndicators><loopIndicator>min</loopIndicator></testMessage></requestMessageData></message>
-response4=.*merge into root process -> test switch statement -> case
min: set loop iterations = 5 -> test loop iterations -> 2 -> 3 -> 4
-> 5 -> 6 -> test1Process complete.*
+response4=.*merge into root process -> test switch statement -> case
min: set loop iterations = 5 -> test loop iterations -> 2\.0 -> 3\.0
-> 4\.0 -> 5\.0 -> 6\.0 -> test1Process complete.*
request5=<message><requestMessageData><testMessage><requestID>Start
Test1.5</requestID><requestText>Event Start
Test1.5</requestText><flowIndicators><indicatorOne>yes</indicatorOne><indicatorTwo>yes</indicatorTwo></flowIndicators><loopIndicator>max</loopIndicator></testMessage></requestMessageData></message>
-response5=.*processes A and B merge on process C -> merge into root process
-> test switch statement -> case max: set loop iterations = 10 -> test
loop iterations -> 2 -> 3 -> 4 -> 5 -> 6 -> 7 -> 8 -> 9
-> 10 -> 11 -> test1Process complete.*
+response5=.*processes A and B merge on process C -> merge into root process
-> test switch statement -> case max: set loop iterations = 10 -> test
loop iterations -> 2\.0 -> 3\.0 -> 4\.0 -> 5\.0 -> 6\.0 ->
7\.0 -> 8\.0 -> 9\.0 -> 10\.0 -> 11\.0 -> test1Process complete.*
request6=<message><requestMessageData><testMessage><requestID>Start
Test1.6</requestID><requestText>Event Start
Test1.6</requestText><flowIndicators><indicatorOne>yes</indicatorOne><indicatorTwo>yes</indicatorTwo></flowIndicators><loopIndicator>default</loopIndicator></testMessage></requestMessageData></message>
response6=.*processes A and B merge on process C -> merge into root process
-> test switch statement -> otherwise: set loop iterations = 0 -> test
loop iterations -> test1Process complete.*
