Author: lwaterman
Date: Sat Oct 28 10:57:31 2006
New Revision: 468711

URL: http://svn.apache.org/viewvc?view=rev&rev=468711
Log:
Refactor and add new tests.

Added:
    
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Tests.java
    
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Tests.java
    
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/FaultHandling20Tests.java
    
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Tests.java
    
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/StructuredActivities20Tests.java
    
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCatchFaultInFaultHandler/
    
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCatchFaultInFaultHandler/TestCatchFaultInFaultHandler.bpel
    
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCatchFaultInFaultHandler/TestCatchFaultInFaultHandler.wsdl
    
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCatchFaultInFaultHandler/deploy.xml
    
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCatchFaultInFaultHandler/test.properties
    incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/
    
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.bpel
    
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.wsdl
    
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/deploy.xml
    
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test1.properties
    
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test2.properties
    
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test3.properties
Modified:
    
incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java
    
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTest.java
    
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/FaultService/faultService.wsdl
    
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultWithVariable/test.properties

Modified: 
incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java?view=diff&rev=468711&r1=468710&r2=468711
==============================================================================
--- 
incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java
 (original)
+++ 
incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java
 Sat Oct 28 10:57:31 2006
@@ -165,7 +165,7 @@
                        if ( ind2.equals("yes")){
                                prmx.replyWithFault("FaultMessage2", faultMsg);
                        } else {
-                               prmx.reply(responseMsg);
+                               prmx.replyWithFault("UnKnownFault", faultMsg);
                        }
                }
 

Modified: 
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTest.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTest.java?view=diff&rev=468711&r1=468710&r2=468711
==============================================================================
--- 
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTest.java 
(original)
+++ 
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTest.java 
Sat Oct 28 10:57:31 2006
@@ -35,10 +35,11 @@
 import org.apache.ode.utils.DOMUtils;
 import org.w3c.dom.Element;
 
-public class BPELTest extends TestCase {
-       
+public abstract class BPELTest extends TestCase {
+
        private BpelServerImpl server;
-       private MessageExchangeContextImpl mexContext; 
+
+       private MessageExchangeContextImpl mexContext;
 
        @Override
        protected void setUp() throws Exception {
@@ -58,65 +59,67 @@
                server.stop();
        }
 
-  private void negative(String deployDir) throws Exception {
-      try {
-          go(deployDir);
-      } catch (junit.framework.AssertionFailedError ex) {
-          return;
-      }
-      fail("Expecting test to fail");
-  }
-       
-       private void go(String deployDir) throws Exception {
-               
+       protected void negative(String deployDir) throws Exception {
+               try {
+                       go(deployDir);
+               } catch (junit.framework.AssertionFailedError ex) {
+                       return;
+               }
+               fail("Expecting test to fail");
+       }
+
+       protected void go(String deployDir) throws Exception {
+
                /**
-                * The deploy directory must contain at least one
-                * "test.properties" file. 
+                * The deploy directory must contain at least one 
"test.properties"
+                * file.
+                * 
+                * The test.properties file identifies the service, operation 
and
+                * messages to be sent to the BPEL engine.
                 * 
-                * The test.properties file identifies the service, 
-                * operation and messages to be sent to the BPEL engine.
+                * The deploy directory may contain more than one file in the 
form of
+                * "testN.properties" where N represents a monotonic integer 
beginning
+                * with 1.
                 * 
-                * The deploy directory may contain more than
-                * one file in the form of "testN.properties" where N
-                * represents a monotonic integer beginning with 1.
-                *   
                 */
-               
+
                int propsFileCnt = 0;
-               File testPropsFile = new File(deployDir+"/test.properties");
-               
-               if ( !testPropsFile.exists()) {
+               File testPropsFile = new File(deployDir + "/test.properties");
+
+               if (!testPropsFile.exists()) {
                        propsFileCnt++;
-                       testPropsFile = new 
File(deployDir+"/test"+propsFileCnt+".properties");
-                       if ( !testPropsFile.exists()) {
-                               System.err.println("can't find "+ 
testPropsFile.toString());
+                       testPropsFile = new File(deployDir + "/test" + 
propsFileCnt
+                                       + ".properties");
+                       if (!testPropsFile.exists()) {
+                               System.err.println("can't find " + 
testPropsFile.toString());
                        }
                }
-               
+
                try {
                        server.getDeploymentService().deploy(new 
File(deployDir));
                } catch (BpelEngineException bpelE) {
                        Properties testProps = new Properties();
                        testProps.load(testPropsFile.toURL().openStream());
                        String responsePattern = 
testProps.getProperty("response1");
-                       testResponsePattern(bpelE.getMessage(),responsePattern);
+                       testResponsePattern(bpelE.getMessage(), 
responsePattern);
                        return;
                }
-               
-               while ( testPropsFile.exists() ) {
-               
+
+               while (testPropsFile.exists()) {
+
                        Properties testProps = new Properties();
                        testProps.load(testPropsFile.toURL().openStream());
-                       
+
                        QName serviceId = new 
QName(testProps.getProperty("namespace"),
                                        testProps.getProperty("service"));
                        String operation = testProps.getProperty("operation");
-       
-                       MyRoleMessageExchange mex = 
server.getEngine().createMessageExchange("",serviceId,operation);
-       
+
+                       MyRoleMessageExchange mex = server.getEngine()
+                                       .createMessageExchange("", serviceId, 
operation);
+
                        /**
-                        * Each property file must contain at least one 
-                        * request/response property tuple.
+                        * Each property file must contain at least one 
request/response
+                        * property tuple.
                         * 
                         * The request/response tuple should be in the form
                         * 
@@ -126,53 +129,54 @@
                         * Where N is a monotonic integer beginning with 1.
                         * 
                         * If a specific MEP is expected in lieu of a response 
message use:
-                        * responseN=ASYNC
-                        * responseN=ONE_WAY
-                        * responseN=COMPLETED_OK
+                        * responseN=ASYNC responseN=ONE_WAY 
responseN=COMPLETED_OK
                         * 
                         */
-                       
-                       for (int i=1; testProps.getProperty("request"+i) != 
null; i++) {
-       
-                               String in = testProps.getProperty("request"+i);
-                               String responsePattern = 
testProps.getProperty("response"+i);
-       
+
+                       for (int i = 1; testProps.getProperty("request" + i) != 
null; i++) {
+
+                               String in = testProps.getProperty("request" + 
i);
+                               String responsePattern = 
testProps.getProperty("response" + i);
+
                                mexContext.clearCurrentResponse();
-                               
+
                                Message request = mex.createMessage(null);
-       
+
                                Element elem = DOMUtils.stringToDOM(in);
                                request.setMessage(elem);
-       
+
+
                                mex.invoke(request);
-                               
+
                                switch (mex.getStatus()) {
                                case RESPONSE:
-                                       
testResponsePattern(mex.getResponse(),responsePattern);
+                                       testResponsePattern(mex.getResponse(), 
responsePattern);
                                        // TODO: test for response fault
                                        break;
                                case ASYNC:
 
                                        switch 
(mex.getMessageExchangePattern()) {
                                        case REQUEST_ONLY:
-                                               if ( 
!responsePattern.equals("ASYNC"))  
+                                               if 
(!responsePattern.equals("ASYNC"))
                                                        assertTrue(false);
                                                break;
                                        case REQUEST_RESPONSE:
-                                               
testResponsePattern(mexContext.getCurrentResponse(),responsePattern);
+                                               
testResponsePattern(mexContext.getCurrentResponse(),
+                                                               
responsePattern);
                                        default:
                                                break;
                                        }
 
                                        break;
                                case COMPLETED_OK:
-                                       if ( 
!responsePattern.equals("COMPLETED_OK")) 
-                                               
testResponsePattern(mexContext.getCurrentResponse(),responsePattern);
+                                       if 
(!responsePattern.equals("COMPLETED_OK"))
+                                               
testResponsePattern(mexContext.getCurrentResponse(),
+                                                               
responsePattern);
                                        break;
                                case FAULT:
                                        // TODO: handle Fault
-                    System.out.println("=> " + mex.getFaultExplanation());
-                    assertTrue(false);
+                                       System.out.println("=> " + 
mex.getFaultExplanation());
+                                       assertTrue(false);
                                        break;
                                case COMPLETED_FAILURE:
                                        // TODO: handle Failure
@@ -192,143 +196,40 @@
                                default:
                                        assertTrue(false);
                                        break;
-                               } 
+                               }
 
                        }
                        propsFileCnt++;
-                       testPropsFile = new 
File(deployDir+"/test"+propsFileCnt+".properties");
-               }
-       }
-       
-       private void testResponsePattern(Message response, String 
responsePattern){
-               String resp = ( response == null ) ? "null" : 
DOMUtils.domToString(response.getMessage());
-               testResponsePattern(resp,responsePattern);
-       }
-       
-       private void testResponsePattern(String resp, String responsePattern){
-               boolean testValue = 
Pattern.compile(responsePattern,Pattern.DOTALL).matcher(resp).matches();
-               
-               if ( !testValue ) {
-                       System.out.println("=> Expected Response Pattern >> " + 
responsePattern);
-                   System.out.println("=> Acutal Response >> " + resp);
+                       testPropsFile = new File(deployDir + "/test" + 
propsFileCnt
+                                       + ".properties");
                }
-               assertTrue(testValue);          
        }
 
-       public void testHelloWorld2() throws Exception {
-               go("target/test-classes/bpel/2.0/HelloWorld2");
-       }
-       public void testFlowActivity1() throws Exception {
-               // Test Flow with XPath20
-               go("target/test-classes/bpel/2.0/TestFlowActivity1");
-       }
-       public void testFlowActivity2() throws Exception {
-               // Test Flow with XPath10
-               go("target/test-classes/bpel/2.0/TestFlowActivity2");
-       }
-       public void testFaultHandlers() throws Exception {
-               go("target/test-classes/bpel/2.0/TestFaultHandlers");
-       }
-    public void testAssignActivity1() throws Exception {
-        go("target/test-classes/bpel/2.0/TestAssignActivity1");
-    }
-    public void testAssignActivity2() throws Exception {
-        go("target/test-classes/bpel/2.0/TestAssignActivity2");
-    }
-    public void testInstPick() throws Exception {
-        go("target/test-classes/bpel/2.0/TestInstantiatingPick");
-    }
-       public void testCorrelation() throws Exception {
-               go("target/test-classes/bpel/2.0/TestCorrelation");
-       }
-       public void testCorrelationAsync() throws Exception {
-               go("target/test-classes/bpel/2.0/TestCorrelationAsync");
-       }
-    public void testXslTransform() throws Exception {
-        go("target/test-classes/bpel/2.0/TestXslTransform");
-    }
-    public void testStaticPick() throws Exception {
-       go("target/test-classes/bpel/2.0/TestStaticPick");
-    }
-    public void testStaticOnMessage() throws Exception {
-       go("target/test-classes/bpel/2.0/TestStaticOnMessage");
-    }
-    public void testDynamicPick() throws Exception {
-       go("target/test-classes/bpel/2.0/TestDynamicPick");
-    }
-    public void testSimpleTypeParts() throws Exception {
-       go("target/test-classes/bpel/2.0/TestSimpleTypeParts");
-    }
-    public void testSimpleVariableType() throws Exception {
-       go("target/test-classes/bpel/2.0/TestSimpleVariableType");
-    }
-    public void testFaultWithVariable() throws Exception {
-       go("target/test-classes/bpel/2.0/TestFaultWithVariable");
-    }
-    public void testXPathNamespace1() throws Exception {
-       go("target/test-classes/bpel/2.0/TestXPathNamespace1");
-    }
-    public void testXPathNamespace2() throws Exception {
-       go("target/test-classes/bpel/2.0/TestXPathNamespace2");
-    }
-       public void testSubTreeAssign() throws Exception {
-               go("target/test-classes/bpel/2.0/TestSubTreeAssign");
+       private void testResponsePattern(Message response, String 
responsePattern) {
+               String resp = (response == null) ? "null" : DOMUtils
+                               .domToString(response.getMessage());
+               testResponsePattern(resp, responsePattern);
        }
-    
-    public void testNegativeTargetNS1() throws Exception {
-       /**
-        * Test for an invalid targetNamespace has been entered into
-        * the WSDL.
-        * 
-        * See JIRA ODE-67
-        * 
-        * Test for a specific exception message.
-        * 
-        */
-       
-       
-       go("target/test-classes/bpel/2.0/NegativeTargetNSTest1");
-    }
-    
-         public void testNegativeCorrelation() throws Exception {
-               /**
-                * This test contains invalid BPEL. There is an instantiating
-                * <receive> and a subsequent <pick> that does not define a 
correlation
-                * key. The BPEL compiler should throw an exception indicating
-                * the BPEL code error ( verify with spec ).
-                * 
-                * See JIRA ODE-64
-                * 
-                */
-           negative("target/test-classes/bpel/2.0/NegativeCorrelationTest");
-      }
-         public void testNegativeInitialization() throws Exception {
-                       /**
-                        * This test contains invalid BPEL. There is an 
instantiating
-                        * <receive> within a <scope>. The <scope> contains 
eventhandlers
-                        * that reference the correlation set found on the 
receive. The BPEL
-                        * compiler should throw an exception indicating
-                        * the BPEL error ( verify with spec ) or at runtime
-                        * a clear initialization exception should be thrown.
-                        * 
-                        * See JIRA ODE-61.
-                        * 
-                        * The message exchange should return with a 
Fault/Failure.
-                        * 
-                        */
-                   
negative("target/test-classes/bpel/2.0/NegativeInitializationTest");
-          }
-       
 
+       private void testResponsePattern(String resp, String responsePattern) {
+               boolean testValue = Pattern.compile(responsePattern, 
Pattern.DOTALL)
+                               .matcher(resp).matches();
+
+               if (!testValue) {
+                       System.out.println("=> Expected Response Pattern >> "
+                                       + responsePattern);
+                       System.out.println("=> Acutal Response >> " + resp);
+               }
+               assertTrue(testValue);
+       }
 
-    /** These tests compile however they fail at runtime */
-  
-//     public void testCompensationHandlers() throws Exception {
-//             go("target/test-classes/bpel/2.0/TestCompensationHandlers");
-//     }
-//     public void testTimer() throws Exception {
-//             go("target/test-classes/bpel/2.0/TestTimer");
-//     } 
+       /** These tests compile however they fail at runtime */
 
+       // public void testCompensationHandlers() throws Exception {
+       // go("target/test-classes/bpel/2.0/TestCompensationHandlers");
+       // }
+       // public void testTimer() throws Exception {
+       // go("target/test-classes/bpel/2.0/TestTimer");
+       // }
 
 }

Added: 
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Tests.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Tests.java?view=auto&rev=468711
==============================================================================
--- 
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Tests.java
 (added)
+++ 
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Tests.java
 Sat Oct 28 10:57:31 2006
@@ -0,0 +1,21 @@
+package org.apache.ode.test;
+
+public class BasicActivities20Tests extends BPELTest {
+       public void testHelloWorld2() throws Exception {
+               go("target/test-classes/bpel/2.0/HelloWorld2");
+       }
+
+       public void testNegativeTargetNS1() throws Exception {
+               /**
+                * Test for an invalid targetNamespace has been entered into 
the WSDL.
+                * 
+                * See JIRA ODE-67
+                * 
+                * Test for a specific exception message.
+                * 
+                */
+
+               go("target/test-classes/bpel/2.0/NegativeTargetNSTest1");
+       }
+
+}

Added: 
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Tests.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Tests.java?view=auto&rev=468711
==============================================================================
--- 
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Tests.java
 (added)
+++ 
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Tests.java
 Sat Oct 28 10:57:31 2006
@@ -0,0 +1,30 @@
+package org.apache.ode.test;
+
+public class DataHandling20Tests extends BPELTest {
+
+    public void testXPathNamespace1() throws Exception {
+       go("target/test-classes/bpel/2.0/TestXPathNamespace1");
+    }
+    public void testXPathNamespace2() throws Exception {
+       go("target/test-classes/bpel/2.0/TestXPathNamespace2");
+    }
+       public void testSubTreeAssign() throws Exception {
+               go("target/test-classes/bpel/2.0/TestSubTreeAssign");
+       }
+    public void testAssignActivity1() throws Exception {
+        go("target/test-classes/bpel/2.0/TestAssignActivity1");
+    }
+    public void testAssignActivity2() throws Exception {
+        go("target/test-classes/bpel/2.0/TestAssignActivity2");
+    }
+    public void testSimpleTypeParts() throws Exception {
+       go("target/test-classes/bpel/2.0/TestSimpleTypeParts");
+    }
+    public void testSimpleVariableType() throws Exception {
+       go("target/test-classes/bpel/2.0/TestSimpleVariableType");
+    }
+    public void testXslTransform() throws Exception {
+        go("target/test-classes/bpel/2.0/TestXslTransform");
+    }
+       
+}

Added: 
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/FaultHandling20Tests.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/FaultHandling20Tests.java?view=auto&rev=468711
==============================================================================
--- 
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/FaultHandling20Tests.java
 (added)
+++ 
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/FaultHandling20Tests.java
 Sat Oct 28 10:57:31 2006
@@ -0,0 +1,13 @@
+package org.apache.ode.test;
+
+public class FaultHandling20Tests extends BPELTest {
+       public void testFaultHandlers() throws Exception {
+               go("target/test-classes/bpel/2.0/TestFaultHandlers");
+       }
+    public void testFaultWithVariable() throws Exception {
+       go("target/test-classes/bpel/2.0/TestFaultWithVariable");
+    }
+       public void testCatchFaultInFaultHandler() throws Exception {
+               go("target/test-classes/bpel/2.0/TestCatchFaultInFaultHandler");
+       }
+}

Added: 
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Tests.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Tests.java?view=auto&rev=468711
==============================================================================
--- 
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Tests.java
 (added)
+++ 
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Tests.java
 Sat Oct 28 10:57:31 2006
@@ -0,0 +1,58 @@
+package org.apache.ode.test;
+
+public class MessageRouting20Tests extends BPELTest {
+
+       public void testCorrelation() throws Exception {
+               go("target/test-classes/bpel/2.0/TestCorrelation");
+       }
+       public void testCorrelation1() throws Exception {
+               go("target/test-classes/bpel/2.0/TestCorrelation1");
+       }
+       public void testCorrelationOpaque() throws Exception {
+               go("target/test-classes/bpel/2.0/testCorrelationOpaque");
+       }
+       public void testCorrelationAsync() throws Exception {
+               go("target/test-classes/bpel/2.0/TestCorrelationAsync");
+       }
+    public void testDynamicPick() throws Exception {
+       go("target/test-classes/bpel/2.0/TestDynamicPick");
+    }
+    public void testInstPick() throws Exception {
+        go("target/test-classes/bpel/2.0/TestInstantiatingPick");
+    }
+    public void testStaticOnMessage() throws Exception {
+       go("target/test-classes/bpel/2.0/TestStaticOnMessage");
+    }
+    public void testStaticPick() throws Exception {
+       go("target/test-classes/bpel/2.0/TestStaticPick");
+    }
+       public void testNegativeCorrelation() throws Exception {
+                       /**
+                        * This test contains invalid BPEL. There is an 
instantiating
+                        * <receive> and a subsequent <pick> that does not 
define a correlation
+                        * key. The BPEL compiler should throw an exception 
indicating
+                        * the BPEL code error ( verify with spec ).
+                        * 
+                        * See JIRA ODE-64
+                        * 
+                        */
+          negative("target/test-classes/bpel/2.0/NegativeCorrelationTest");
+       }
+         public void testNegativeInitialization() throws Exception {
+                       /**
+                        * This test contains invalid BPEL. There is an 
instantiating
+                        * <receive> within a <scope>. The <scope> contains 
eventhandlers
+                        * that reference the correlation set found on the 
receive. The BPEL
+                        * compiler should throw an exception indicating
+                        * the BPEL error ( verify with spec ) or at runtime
+                        * a clear initialization exception should be thrown.
+                        * 
+                        * See JIRA ODE-61.
+                        * 
+                        * The message exchange should return with a 
Fault/Failure.
+                        * 
+                        */
+                   
negative("target/test-classes/bpel/2.0/NegativeInitializationTest");
+          }
+
+}

Added: 
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/StructuredActivities20Tests.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/StructuredActivities20Tests.java?view=auto&rev=468711
==============================================================================
--- 
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/StructuredActivities20Tests.java
 (added)
+++ 
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/StructuredActivities20Tests.java
 Sat Oct 28 10:57:31 2006
@@ -0,0 +1,12 @@
+package org.apache.ode.test;
+
+public class StructuredActivities20Tests extends BPELTest {
+       public void testFlowActivity1() throws Exception {
+               // Test Flow with XPath20
+               go("target/test-classes/bpel/2.0/TestFlowActivity1");
+       }
+       public void testFlowActivity2() throws Exception {
+               // Test Flow with XPath10
+               go("target/test-classes/bpel/2.0/TestFlowActivity2");
+       }
+}

Modified: 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/FaultService/faultService.wsdl
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/FaultService/faultService.wsdl?view=diff&rev=468711&r1=468710&r2=468711
==============================================================================
--- 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/FaultService/faultService.wsdl
 (original)
+++ 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/FaultService/faultService.wsdl
 Sat Oct 28 10:57:31 2006
@@ -40,6 +40,7 @@
          <wsdl:output name="FaultOutputMessage" message="tns:faultMessage"/>
          <wsdl:fault name="FaultMessage1" message="tns:errorMessage"/>
          <wsdl:fault name="FaultMessage2" message="tns:errorMessage"/>
+         <wsdl:fault name="UnknownFault" message="tns:errorMessage"/>
       </wsdl:operation>
    </wsdl:portType>
 

Added: 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCatchFaultInFaultHandler/TestCatchFaultInFaultHandler.bpel
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCatchFaultInFaultHandler/TestCatchFaultInFaultHandler.bpel?view=auto&rev=468711
==============================================================================
--- 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCatchFaultInFaultHandler/TestCatchFaultInFaultHandler.bpel
 (added)
+++ 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCatchFaultInFaultHandler/TestCatchFaultInFaultHandler.bpel
 Sat Oct 28 10:57:31 2006
@@ -0,0 +1,101 @@
+<!--
+  ~ 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.
+-->
+
+<bpel:process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://schemas.xmlsoap.org/ws/2004/03/business-process/ 
../../../../../../../bpel-schemas/src/main/resources/wsbpel_main-draft-Apr-29-2006.xsd"
+  xmlns:tns="http://ode/bpel/unit-test/TestCatchFaultInFaultHandler";
+  xmlns:wns="http://ode/bpel/unit-test/TestCatchFaultInFaultHandler.wsdl";
+ xmlns:bpel="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
+  name="TestCatchFaultInFaultHandler"
+  targetNamespace="http://ode/bpel/unit-test/TestCatchFaultInFaultHandler";
+  queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+  expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+  suppressJoinFailure="yes">
+  
+  <bpel:import location="TestCatchFaultInFaultHandler.wsdl"
+    namespace="http://ode/bpel/unit-test/TestCatchFaultInFaultHandler.wsdl";
+    importType="http://schemas.xmlsoap.org/wsdl/"; />
+  
+  <bpel:partnerLinks>
+    <bpel:partnerLink name="TestCatchFaultInFaultHandlerPL" 
partnerLinkType="wns:TestCatchFaultInFaultHandlerRequest" 
myRole="TestCatchFaultInFaultHandlerService"/>
+  </bpel:partnerLinks>
+  <bpel:scope name="ID1127336036600153">
+    <bpel:variables>
+      <bpel:variable messageType="wns:operation1Request" 
name="BP112733603660012"/>
+      <bpel:variable messageType="wns:operation1Response" 
name="BP112733616006913"/>
+    </bpel:variables>
+    <bpel:faultHandlers>
+      <bpel:catchAll>
+        <bpel:flow>
+          <bpel:sequence>
+            <bpel:assign name="ID1127336402868200-1">
+              <bpel:copy>
+                <bpel:from>'doesn&amp;apos;t work'</bpel:from>
+                <bpel:to>$BP112733616006913.output1</bpel:to>
+              </bpel:copy>
+            </bpel:assign>
+            <bpel:reply name="ID1127336407008201" operation="operation1" 
partnerLink="TestCatchFaultInFaultHandlerPL" 
portType="wns:TestCatchFaultInFaultHandlerPT" variable="BP112733616006913"/>
+          </bpel:sequence>
+        </bpel:flow>
+      </bpel:catchAll>
+    </bpel:faultHandlers>
+    <bpel:flow>
+      <bpel:sequence>
+        <bpel:receive name="ID1127336036600156" createInstance="yes" 
operation="operation1" partnerLink="TestCatchFaultInFaultHandlerPL" 
portType="wns:TestCatchFaultInFaultHandlerPT" variable="BP112733603660012"/>
+        <bpel:scope name="ID1127336181272165">
+          <bpel:faultHandlers>
+            <bpel:catch faultName="tns:Exception1">
+              <bpel:flow>
+                <bpel:sequence>
+                  <bpel:scope name="ID1127336251523176">
+                    <bpel:faultHandlers>
+                      <bpel:catch faultName="tns:Exception2">
+                        <bpel:flow>
+                          <bpel:sequence>
+                            <bpel:assign name="ID1127336307445194-1">
+                              <bpel:copy>
+                                <bpel:from>'works'</bpel:from>
+                                <bpel:to>$BP112733616006913.output1</bpel:to>
+                              </bpel:copy>
+                            </bpel:assign>
+                          </bpel:sequence>
+                        </bpel:flow>
+                      </bpel:catch>
+                    </bpel:faultHandlers>
+                    <bpel:flow>
+                      <bpel:sequence>
+                        <bpel:throw faultName="tns:Exception2"/>
+                      </bpel:sequence>
+                    </bpel:flow>
+                  </bpel:scope>
+                </bpel:sequence>
+              </bpel:flow>
+            </bpel:catch>
+          </bpel:faultHandlers>
+          <bpel:flow>
+            <bpel:sequence>
+              <bpel:throw faultName="tns:Exception1"/>
+            </bpel:sequence>
+          </bpel:flow>
+        </bpel:scope>
+        <bpel:reply name="ID1127336160069161" operation="operation1" 
partnerLink="TestCatchFaultInFaultHandlerPL" 
portType="wns:TestCatchFaultInFaultHandlerPT" variable="BP112733616006913"/>
+      </bpel:sequence>
+    </bpel:flow>
+  </bpel:scope>
+</bpel:process>

Added: 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCatchFaultInFaultHandler/TestCatchFaultInFaultHandler.wsdl
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCatchFaultInFaultHandler/TestCatchFaultInFaultHandler.wsdl?view=auto&rev=468711
==============================================================================
--- 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCatchFaultInFaultHandler/TestCatchFaultInFaultHandler.wsdl
 (added)
+++ 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCatchFaultInFaultHandler/TestCatchFaultInFaultHandler.wsdl
 Sat Oct 28 10:57:31 2006
@@ -0,0 +1,57 @@
+<!--
+  ~ 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/TestCatchFaultInFaultHandler.wsdl";
+  xmlns="http://ode/bpel/unit-test/TestCatchFaultInFaultHandler.wsdl";
+  xmlns:tns="http://ode/bpel/unit-test/TestCatchFaultInFaultHandler.wsdl";
+  xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/";      
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+  xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl";
+  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";>
+
+  <wsdl:message name="operation1Request">
+    <wsdl:part name="input1" type="xsd:string"></wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="operation1Response">
+    <wsdl:part name="output1" type="xsd:string"></wsdl:part>
+  </wsdl:message>
+
+  <wsdl:portType name="TestCatchFaultInFaultHandlerPT">
+    <wsdl:operation name="operation1">
+      <wsdl:input name="operation1Request" message="tns:operation1Request"/>
+      <wsdl:output name="operation1Response" message="tns:operation1Response"/>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="TestCatchFaultInFaultHandlerBinding" 
type="TestCatchFaultInFaultHandlerPT">
+    <wsdl:operation name="operation1">
+      <wsdl:input name="operation1Request"/>
+      <wsdl:output name="operation1Response"/>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="BPService">
+    <wsdl:port name="TestCatchFaultInFaultHandlerPort" 
binding="TestCatchFaultInFaultHandlerBinding">
+    </wsdl:port>
+  </wsdl:service>
+  
+  <plnk:partnerLinkType name="TestCatchFaultInFaultHandlerRequest">
+    <plnk:role name="TestCatchFaultInFaultHandlerService" 
portType="TestCatchFaultInFaultHandlerPT"/>
+  </plnk:partnerLinkType>
+  
+</wsdl:definitions>

Added: 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCatchFaultInFaultHandler/deploy.xml
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCatchFaultInFaultHandler/deploy.xml?view=auto&rev=468711
==============================================================================
--- 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCatchFaultInFaultHandler/deploy.xml
 (added)
+++ 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCatchFaultInFaultHandler/deploy.xml
 Sat Oct 28 10:57:31 2006
@@ -0,0 +1,31 @@
+<!--
+       ~ 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://ode.fivesight.com/schemas/2006/06/27/dd"; 
+       xmlns:pns="http://ode/bpel/unit-test/TestCatchFaultInFaultHandler"; 
+       xmlns:wns="http://ode/bpel/unit-test/TestCatchFaultInFaultHandler.wsdl";>
+
+
+       <process name="pns:TestCatchFaultInFaultHandler">
+               <active>true</active>
+               <provide partnerLink="TestCatchFaultInFaultHandlerPL">
+                       <service name="wns:TestCatchFaultInFaultHandlerService" 
port="wns:TestCatchFaultInFaultHandlerPort"/>
+               </provide>
+       </process>
+</deploy>

Added: 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCatchFaultInFaultHandler/test.properties
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCatchFaultInFaultHandler/test.properties?view=auto&rev=468711
==============================================================================
--- 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCatchFaultInFaultHandler/test.properties
 (added)
+++ 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCatchFaultInFaultHandler/test.properties
 Sat Oct 28 10:57:31 2006
@@ -0,0 +1,5 @@
+namespace=http://ode/bpel/unit-test/TestCatchFaultInFaultHandler.wsdl
+service=TestCatchFaultInFaultHandlerService
+operation=operation1
+request1=<message><input1>Start TestCatchFaultInFaultHandler</input1></message>
+response1=.*works.*

Added: 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.bpel
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.bpel?view=auto&rev=468711
==============================================================================
--- 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.bpel
 (added)
+++ 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.bpel
 Sat Oct 28 10:57:31 2006
@@ -0,0 +1,86 @@
+<!--
+  ~ 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.
+-->
+
+<bpel:process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://schemas.xmlsoap.org/ws/2004/03/business-process/ 
../../../../../../../bpel-schemas/src/main/resources/wsbpel_main-draft-Apr-29-2006.xsd"
+  xmlns:tns="http://ode/bpel/unit-test/testCorrelation1";
+  targetNamespace="http://ode/bpel/unit-test/testCorrelation1";
+  xmlns:wns="http://ode/bpel/unit-test/testCorrelation1.wsdl";
+ xmlns:ns0="http://www.w3schools.com";
+ xmlns:bpel="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
+ name="TestCorrelation1"
+  queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+  expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+  suppressJoinFailure="yes">
+  
+  <bpel:import location="testCorrelation1.wsdl"
+    namespace="http://ode/bpel/unit-test/testCorrelation1.wsdl";
+    importType="http://schemas.xmlsoap.org/wsdl/"; />
+  
+  <bpel:partnerLinks>
+    <bpel:partnerLink name="testCorrelation1PL" 
partnerLinkType="wns:testCorrelation1Request" myRole="testCorrelation1Service"/>
+  </bpel:partnerLinks>
+  <bpel:scope name="scope1">
+    <bpel:variables>
+      <bpel:variable messageType="wns:operation1Request" name="input1"/>
+      <bpel:variable messageType="wns:operation2Request" name="input2"/>
+      <bpel:variable messageType="wns:operation3Request" name="input3"/>
+      <bpel:variable messageType="wns:operation3Response" name="output3"/>
+    </bpel:variables>
+    <bpel:correlationSets>
+      <bpel:correlationSet name="correlationSet1" 
properties="wns:testCorrelation1Variable1"/>
+    </bpel:correlationSets>
+    <bpel:flow>
+      <bpel:sequence>
+        <bpel:receive name="receive1" createInstance="yes" 
operation="operation1" partnerLink="testCorrelation1PL" 
portType="wns:testCorrelation1PT" variable="input1">
+          <bpel:correlations>
+            <bpel:correlation set="correlationSet1" 
initiate="yes"></bpel:correlation>
+          </bpel:correlations>
+        </bpel:receive>
+        <bpel:scope name="scope2">
+          <bpel:correlationSets>
+            <bpel:correlationSet name="correlationSet2" 
properties="wns:testCorrelation1Variable1"/>
+         </bpel:correlationSets>
+          <bpel:flow>
+            <bpel:sequence>
+              <bpel:receive name="receive2" createInstance="no" 
operation="operation2" partnerLink="testCorrelation1PL" 
portType="wns:testCorrelation1PT" variable="input2">
+                <bpel:correlations>
+                  <bpel:correlation set="correlationSet1" 
initiate="no"></bpel:correlation>
+                  <bpel:correlation initiate="yes" set="correlationSet2"/>
+                </bpel:correlations>
+              </bpel:receive>
+              <bpel:receive name="receive3" createInstance="no" 
operation="operation3" partnerLink="testCorrelation1PL" 
portType="wns:testCorrelation1PT" variable="input3">
+                <bpel:correlations>
+                  <bpel:correlation initiate="no" set="correlationSet2"/>
+                </bpel:correlations>
+              </bpel:receive>
+              <bpel:assign name="assign1">
+                <bpel:copy>
+                  <bpel:from>$input2.newParameter1/ns0:from</bpel:from>
+                  <bpel:to part="newParameter2" variable="output3"/>
+                </bpel:copy>
+              </bpel:assign>
+              <bpel:reply name="reply" operation="operation3" 
partnerLink="testCorrelation1PL" portType="wns:testCorrelation1PT" 
variable="output3"/>
+            </bpel:sequence>
+          </bpel:flow>
+        </bpel:scope>
+      </bpel:sequence>
+    </bpel:flow>
+  </bpel:scope>
+</bpel:process>
\ No newline at end of file

Added: 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.wsdl
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.wsdl?view=auto&rev=468711
==============================================================================
--- 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.wsdl
 (added)
+++ 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.wsdl
 Sat Oct 28 10:57:31 2006
@@ -0,0 +1,96 @@
+<!--
+  ~ 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/testCorrelation1.wsdl"; 
xmlns:tns="http://ode/bpel/unit-test/testCorrelation1.wsdl"; 
xmlns="http://ode/bpel/unit-test/testCorrelation1.wsdl";
+  xmlns:ns0="http://www.w3schools.com"; 
xmlns:ns1="http://ode/bpel/unit-test/testCorrelation1.wsdl.types"; 
xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/";
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"; 
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";>
+
+  <wsdl:types>
+    <xsd:schema 
targetNamespace="http://ode/bpel/unit-test/testCorrelation1.wsdl.types"; 
xmlns="http://ode/bpel/unit-test/testCorrelation1.wsdl.types"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
+
+      <xsd:element name="simpleString" type="xsd:string"/>
+    </xsd:schema>
+    <xs:schema elementFormDefault="qualified" 
targetNamespace="http://www.w3schools.com"; xmlns="http://www.w3schools.com"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
+
+      <xs:element name="note">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="to" type="xs:string"/>
+            <xs:element name="from" type="xs:string"/>
+            <xs:element name="heading" type="xs:string"/>
+            <xs:element name="body" type="xs:string"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+
+    </xs:schema>
+  </wsdl:types>
+  <wsdl:message name="operation2Request">
+    <wsdl:part name="newParameter1" element="ns0:note"/>
+  </wsdl:message>
+  <wsdl:message name="operation3Request">
+    <wsdl:part name="newParameter1" element="ns1:simpleString"/>
+  </wsdl:message>
+  <wsdl:message name="operation1Request">
+    <wsdl:part name="newParameter1" type="xsd:string"/>
+  </wsdl:message>
+  <wsdl:message name="operation3Response">
+    <wsdl:part name="newParameter2" type="xsd:string"/>
+  </wsdl:message>
+  <wsdl:portType name="testCorrelation1PT">
+    <wsdl:operation name="operation3">
+      <wsdl:input name="operation3Input" message="tns:operation3Request"/>
+      <wsdl:output name="operation3Output" message="tns:operation3Response"/>
+    </wsdl:operation>
+    <wsdl:operation name="operation2">
+      <wsdl:input name="operation2Input" message="tns:operation2Request"/>
+    </wsdl:operation>
+    <wsdl:operation name="operation1">
+      <wsdl:input name="operation1Input" message="tns:operation1Request"/>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="testCorrelation1Binding" type="tns:testCorrelation1PT">
+    <wsdl:operation name="operation3">
+      <wsdl:input name="operation3Input"> </wsdl:input>
+      <wsdl:output name="operation3Output"> </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="operation2">
+      <wsdl:input name="operation2Input"> </wsdl:input>
+    </wsdl:operation>
+    <wsdl:operation name="operation1">
+      <wsdl:input name="operation1Input"> </wsdl:input>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="testCorrelation1Service">
+    <wsdl:port name="testCorrelation1Port" 
binding="tns:testCorrelation1Binding"> </wsdl:port>
+  </wsdl:service>
+
+  <plnk:partnerLinkType name="testCorrelation1Request">
+    <plnk:role name="testCorrelation1Service" portType="testCorrelation1PT"/>
+  </plnk:partnerLinkType>
+
+  <bpws:property name="testCorrelation1Variable1" type="xsd:string"/>
+  <bpws:propertyAlias messageType="tns:operation2Request" part="newParameter1" 
propertyName="tns:testCorrelation1Variable1">
+    <bpws:query 
queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">ns0:to</bpws:query>
+  </bpws:propertyAlias>
+  <bpws:propertyAlias messageType="tns:operation3Request" part="newParameter1" 
propertyName="tns:testCorrelation1Variable1">
+  </bpws:propertyAlias>
+  <bpws:propertyAlias messageType="tns:operation1Request" part="newParameter1" 
propertyName="tns:testCorrelation1Variable1">
+  </bpws:propertyAlias>
+</wsdl:definitions>

Added: 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/deploy.xml
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/deploy.xml?view=auto&rev=468711
==============================================================================
--- 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/deploy.xml
 (added)
+++ 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/deploy.xml
 Sat Oct 28 10:57:31 2006
@@ -0,0 +1,31 @@
+<!--
+       ~ 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://ode.fivesight.com/schemas/2006/06/27/dd"; 
+       xmlns:pns="http://ode/bpel/unit-test/testCorrelation1"; 
+       xmlns:wns="http://ode/bpel/unit-test/testCorrelation1.wsdl";>
+
+
+       <process name="pns:TestCorrelation1">
+               <active>true</active>
+               <provide partnerLink="testCorrelation1PL">
+                       <service name="wns:testCorrelation1Service" 
port="wns:testCorrelation1Port"/>
+               </provide>
+       </process>
+</deploy>

Added: 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test1.properties
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test1.properties?view=auto&rev=468711
==============================================================================
--- 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test1.properties
 (added)
+++ 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test1.properties
 Sat Oct 28 10:57:31 2006
@@ -0,0 +1,5 @@
+namespace=http://ode/bpel/unit-test/testCorrelation1.wsdl
+service=testCorrelation1Service
+operation=operation1
+request1=<message><newParameter1>To Test</newParameter1></message>
+response1=ASYNC
\ No newline at end of file

Added: 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test2.properties
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test2.properties?view=auto&rev=468711
==============================================================================
--- 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test2.properties
 (added)
+++ 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test2.properties
 Sat Oct 28 10:57:31 2006
@@ -0,0 +1,5 @@
+namespace=http://ode/bpel/unit-test/testCorrelation1.wsdl
+service=testCorrelation1Service
+operation=operation2
+request1=<message><newParameter1><tns2:note 
xmlns:tns2="http://www.w3schools.com";><tns2:to>To Test</tns2:to><tns2:from>From 
Test</tns2:from><tns2:heading>x</tns2:heading><tns2:body>x</tns2:body></tns2:note></newParameter1></message>
+response1=ASYNC
\ No newline at end of file

Added: 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test3.properties
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test3.properties?view=auto&rev=468711
==============================================================================
--- 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test3.properties
 (added)
+++ 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test3.properties
 Sat Oct 28 10:57:31 2006
@@ -0,0 +1,5 @@
+namespace=http://ode/bpel/unit-test/testCorrelation1.wsdl
+service=testCorrelation1Service
+operation=operation3
+request1=<message><newParameter1><ns0:simpleString 
xmlns:ns0="http://ode/bpel/unit-test/testCorrelation1.wsdl.types";>To 
Test</ns0:simpleString></newParameter1></message>
+response1=.*From Test.*
\ No newline at end of file

Modified: 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultWithVariable/test.properties
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultWithVariable/test.properties?view=diff&rev=468711&r1=468710&r2=468711
==============================================================================
--- 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultWithVariable/test.properties
 (original)
+++ 
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultWithVariable/test.properties
 Sat Oct 28 10:57:31 2006
@@ -5,3 +5,5 @@
 response1=.*Event TestFaultWithVariable1 -&gt; caught FaultMessage1 -&gt; 
Event TestFaultWithVariable1 -&gt; process complete.*
 request2=<message><requestID>Start 
TestFaultWithVariable2</requestID><requestText>Event 
TestFaultWithVariable2</requestText><faultIndicator1>no</faultIndicator1><faultIndicator2>yes</faultIndicator2></message>
 response2=.*Event TestFaultWithVariable2 -&gt; caught FaultMessage2 -&gt; 
Event TestFaultWithVariable2 -&gt; process complete.*
+request3=<message><requestID>Start 
TestFaultWithVariable3</requestID><requestText>Event 
TestFaultWithVariable3</requestText><faultIndicator1>no</faultIndicator1><faultIndicator2>no</faultIndicator2></message>
+response3=.*Event TestFaultWithVariable3 -&gt; caught fault with catchAll.*


Reply via email to