You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ms...@apache.org on 2007/09/06 05:20:54 UTC

svn commit: r573139 [2/3] - in /ode/branches/bart: axis2/src/main/java/org/apache/ode/axis2/ axis2/src/main/java/org/apache/ode/axis2/hooks/ axis2/src/main/java/org/apache/ode/axis2/util/ axis2/src/main/wsdl/ axis2/src/test/resources/ bpel-compiler/src...

Modified: ode/branches/bart/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java (original)
+++ ode/branches/bart/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java Wed Sep  5 20:20:50 2007
@@ -1,181 +1,181 @@
-/*
- * 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.
- */
-
-/*
- * 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.
- */
-
-package org.apache.ode.test;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-
-import org.apache.ode.bpel.iapi.BpelEngineException;
-import org.apache.ode.bpel.iapi.ContextException;
-import org.apache.ode.bpel.iapi.EndpointReference;
-import org.apache.ode.bpel.iapi.InvocationStyle;
-import org.apache.ode.bpel.iapi.Message;
-import org.apache.ode.bpel.iapi.MessageExchangeContext;
-import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
-import org.apache.ode.bpel.iapi.PartnerRoleChannel;
-import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange;
-import org.apache.ode.utils.DOMUtils;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-
-/**
- * This is a simple MessageExchangeContext implementation
- * that only supports a set of "well known" portTypes used
- * for testing.
- *
- *
- */
-public class MessageExchangeContextImpl implements MessageExchangeContext {
-	
-	private static final String PROBE_NS = "http://ode/bpel/unit-test/ProbeService.wsdl";
-	private static final String FAULT_NS = "http://ode/bpel/unit-test/FaultService.wsdl";
-
-	// Probe Service is a simple concatination service
-	private static final QName probePT = new QName(PROBE_NS,"probeMessagePT");
-	private static final QName faultPT = new QName(FAULT_NS,"faultMessagePT");
-
-	
-	public void invokePartnerUnreliable(PartnerRoleMessageExchange mex)
-			throws ContextException {
-		QName calledPT = mex.getPortType().getQName();
-		
-		if (calledPT.equals(probePT)) {
-			invokeProbeService(mex);
-		}
-		
-		if (calledPT.equals(faultPT)) {
-			invokeFaultService(mex);
-		}
-
-	}
-
-	public void onMyRoleMessageExchangeStateChanged(MyRoleMessageExchange myRoleMex)
-			throws BpelEngineException {
-
-	}
-	
-	private void invokeProbeService(PartnerRoleMessageExchange prmx) {
-		Message msg = prmx.getRequest();
-		Element elm1 = prmx.getRequest().getPart("probeName");
-		Element elm2 = prmx.getRequest().getPart("probeData");
-		
-		if ( elm1 != null && elm2 != null ) {
-			String cat = elm2.getTextContent()+" -> "+elm1.getTextContent();
-			elm2.setTextContent(cat);
-            final Message response = prmx.createMessage(prmx.getOperation().getOutput().getMessage().getQName());
-            response.setMessage(msg.getMessage());
-            response.setMessagePart("probeData", elm2);
-			prmx.reply(response);
-		}
-	}
-	
-	private void invokeFaultService(PartnerRoleMessageExchange prmx) {
-		QName errorMsgType = new QName(FAULT_NS,"errorMessage");
-		QName responseMsgType = new QName(FAULT_NS,"faultMessage");
-		Message faultMsg = prmx.createMessage(errorMsgType);
-		Message responseMsg = prmx.createMessage(responseMsgType);
-
-		String ind1 = prmx.getRequest().getPart("faultIndicator1").getTextContent();
-		String ind2 = prmx.getRequest().getPart("faultIndicator2").getTextContent();
-		String inputData = prmx.getRequest().getPart("faultData").getTextContent();
-		
-		StringBuffer faultData = new StringBuffer("<message><errorID>FA-1</errorID><errorText>");
-		faultData.append(inputData);
-		faultData.append("</errorText></message>");
-		
-		StringBuffer responseData = new StringBuffer("<message><faultName>FA-NoFault</faultName><faultData>");
-		responseData.append(inputData);
-		responseData.append("</faultData></message>");
-		
-		
-		Element faultResponse = null;
-		Element response = null;
-		try {
-			faultResponse = DOMUtils.stringToDOM(faultData.toString());
-			response = DOMUtils.stringToDOM(responseData.toString());
-		} catch (SAXException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		
-		
-		// TODO: Question - how does one set parts that are of a simple xsd type?
-		faultMsg.setMessage(faultResponse);
-		responseMsg.setMessage(response);
-		
-		if ( ind1.equals("yes")){
-			prmx.replyWithFault(new QName(FAULT_NS,"FaultMessage1"), faultMsg);
-		} else {
-			if ( ind2.equals("yes")){
-				prmx.replyWithFault(new QName(FAULT_NS,"FaultMessage2"), faultMsg);
-			} else {
-				prmx.replyWithFault(new QName(FAULT_NS,"UnKnownFault"), faultMsg);
-			}
-		}
-
-	}
-
-
-    public void cancel(PartnerRoleMessageExchange mex) throws ContextException {
-        // TODO Auto-generated method stub
-        
-    }
-
-    public Set<InvocationStyle> getSupportedInvocationStyle(PartnerRoleChannel prc, EndpointReference partnerEpr) {
-        return Collections.singleton(InvocationStyle.UNRELIABLE);
-    }
-
-    public void invokePartnerReliable(PartnerRoleMessageExchange mex) throws ContextException {
-        // TODO Auto-generated method stub
-        
-    }
-
-    public void invokePartnerTransacted(PartnerRoleMessageExchange mex) throws ContextException {
-        // TODO Auto-generated method stub
-        
-    }
-
-
-}
+/*
+ * 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.
+ */
+
+/*
+ * 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.
+ */
+
+package org.apache.ode.test;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Set;
+
+import javax.xml.namespace.QName;
+
+import org.apache.ode.bpel.iapi.BpelEngineException;
+import org.apache.ode.bpel.iapi.ContextException;
+import org.apache.ode.bpel.iapi.EndpointReference;
+import org.apache.ode.bpel.iapi.InvocationStyle;
+import org.apache.ode.bpel.iapi.Message;
+import org.apache.ode.bpel.iapi.MessageExchangeContext;
+import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
+import org.apache.ode.bpel.iapi.PartnerRoleChannel;
+import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange;
+import org.apache.ode.utils.DOMUtils;
+import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
+
+/**
+ * This is a simple MessageExchangeContext implementation
+ * that only supports a set of "well known" portTypes used
+ * for testing.
+ *
+ *
+ */
+public class MessageExchangeContextImpl implements MessageExchangeContext {
+	
+	private static final String PROBE_NS = "http://ode/bpel/unit-test/ProbeService.wsdl";
+	private static final String FAULT_NS = "http://ode/bpel/unit-test/FaultService.wsdl";
+
+	// Probe Service is a simple concatination service
+	private static final QName probePT = new QName(PROBE_NS,"probeMessagePT");
+	private static final QName faultPT = new QName(FAULT_NS,"faultMessagePT");
+
+	
+	public void invokePartnerUnreliable(PartnerRoleMessageExchange mex)
+			throws ContextException {
+		QName calledPT = mex.getPortType().getQName();
+		
+		if (calledPT.equals(probePT)) {
+			invokeProbeService(mex);
+		}
+		
+		if (calledPT.equals(faultPT)) {
+			invokeFaultService(mex);
+		}
+
+	}
+
+	public void onMyRoleMessageExchangeStateChanged(MyRoleMessageExchange myRoleMex)
+			throws BpelEngineException {
+
+	}
+	
+	private void invokeProbeService(PartnerRoleMessageExchange prmx) {
+		Message msg = prmx.getRequest();
+		Element elm1 = prmx.getRequest().getPart("probeName");
+		Element elm2 = prmx.getRequest().getPart("probeData");
+		
+		if ( elm1 != null && elm2 != null ) {
+			String cat = elm2.getTextContent()+" -> "+elm1.getTextContent();
+			elm2.setTextContent(cat);
+            final Message response = prmx.createMessage(prmx.getOperation().getOutput().getMessage().getQName());
+            response.setMessage(msg.getMessage());
+            response.setMessagePart("probeData", elm2);
+			prmx.reply(response);
+		}
+	}
+	
+	private void invokeFaultService(PartnerRoleMessageExchange prmx) {
+		QName errorMsgType = new QName(FAULT_NS,"errorMessage");
+		QName responseMsgType = new QName(FAULT_NS,"faultMessage");
+		Message faultMsg = prmx.createMessage(errorMsgType);
+		Message responseMsg = prmx.createMessage(responseMsgType);
+
+		String ind1 = prmx.getRequest().getPart("faultIndicator1").getTextContent();
+		String ind2 = prmx.getRequest().getPart("faultIndicator2").getTextContent();
+		String inputData = prmx.getRequest().getPart("faultData").getTextContent();
+		
+		StringBuffer faultData = new StringBuffer("<message><errorID>FA-1</errorID><errorText>");
+		faultData.append(inputData);
+		faultData.append("</errorText></message>");
+		
+		StringBuffer responseData = new StringBuffer("<message><faultName>FA-NoFault</faultName><faultData>");
+		responseData.append(inputData);
+		responseData.append("</faultData></message>");
+		
+		
+		Element faultResponse = null;
+		Element response = null;
+		try {
+			faultResponse = DOMUtils.stringToDOM(faultData.toString());
+			response = DOMUtils.stringToDOM(responseData.toString());
+		} catch (SAXException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		
+		// TODO: Question - how does one set parts that are of a simple xsd type?
+		faultMsg.setMessage(faultResponse);
+		responseMsg.setMessage(response);
+		
+		if ( ind1.equals("yes")){
+			prmx.replyWithFault(new QName(FAULT_NS,"FaultMessage1"), faultMsg);
+		} else {
+			if ( ind2.equals("yes")){
+				prmx.replyWithFault(new QName(FAULT_NS,"FaultMessage2"), faultMsg);
+			} else {
+				prmx.replyWithFault(new QName(FAULT_NS,"UnKnownFault"), faultMsg);
+			}
+		}
+
+	}
+
+
+    public void cancel(PartnerRoleMessageExchange mex) throws ContextException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    public Set<InvocationStyle> getSupportedInvocationStyle(PartnerRoleChannel prc, EndpointReference partnerEpr) {
+        return Collections.singleton(InvocationStyle.UNRELIABLE);
+    }
+
+    public void invokePartnerReliable(PartnerRoleMessageExchange mex) throws ContextException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    public void invokePartnerTransacted(PartnerRoleMessageExchange mex) throws ContextException {
+        // TODO Auto-generated method stub
+        
+    }
+
+
+}

Modified: ode/branches/bart/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java (original)
+++ ode/branches/bart/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java Wed Sep  5 20:20:50 2007
@@ -18,6 +18,8 @@
  */
 package org.apache.ode.test;
 
+import org.junit.Ignore;
+import org.junit.Test;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -84,6 +86,7 @@
         inv.maximumWaitMs=7*1000L;
         inv.expectedFinalStatus = AckType.RESPONSE;
         
+        
         go();
     }
 
@@ -98,6 +101,7 @@
             null);
         inv.maximumWaitMs=20*1000L;
         inv.expectedFinalStatus = AckType.RESPONSE;
+
 
         go();
     }

Modified: ode/branches/bart/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java (original)
+++ ode/branches/bart/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java Wed Sep  5 20:20:50 2007
@@ -1,56 +1,59 @@
-/*
- * 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.
- */
-package org.apache.ode.test;
-
-import org.junit.Test;
-
-public class DataHandling20Test extends BPELTestAbstract {
-
-    @Test public void testXPathNamespace1() throws Throwable {
-        go("/bpel/2.0/TestXPathNamespace1");
-    }
-    @Test public void testXPathNamespace2() throws Throwable {
-        go("/bpel/2.0/TestXPathNamespace2");
-    }
-    @Test public void testSubTreeAssign() throws Throwable {
-        go("/bpel/2.0/TestSubTreeAssign");
-    }
-    @Test public void testAssignActivity1() throws Throwable {
-        go("/bpel/2.0/TestAssignActivity1");
-    }
-    @Test public void testAssignActivity2() throws Throwable {
-        go("/bpel/2.0/TestAssignActivity2");
-    }
-    @Test public void testAssignComplex() throws Throwable {
-        go("/bpel/2.0/TestAssignComplex");
-    }
-    @Test public void testSimpleTypeParts() throws Throwable {
-        go("/bpel/2.0/TestSimpleTypeParts");
-    }
-    @Test public void testSimpleVariableType() throws Throwable {
-        go("/bpel/2.0/TestSimpleVariableType");
-    }
-    @Test public void testXslTransform() throws Throwable {
-        go("/bpel/2.0/TestXslTransform");
-    }
-    @Test public void testSplit() throws Throwable {
-        go("/bpel/2.0/TestSplit");
-    }
-
-}
+/*
+ * 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.
+ */
+package org.apache.ode.test;
+
+import org.junit.Test;
+
+public class DataHandling20Test extends BPELTestAbstract {
+
+    @Test public void testXPathNamespace1() throws Throwable {
+        go("/bpel/2.0/TestXPathNamespace1");
+    }
+    @Test public void testXPathNamespace2() throws Throwable {
+        go("/bpel/2.0/TestXPathNamespace2");
+    }
+    @Test public void testSubTreeAssign() throws Throwable {
+        go("/bpel/2.0/TestSubTreeAssign");
+    }
+    @Test public void testAssignActivity1() throws Throwable {
+        go("/bpel/2.0/TestAssignActivity1");
+    }
+    @Test public void testAssignActivity2() throws Throwable {
+        go("/bpel/2.0/TestAssignActivity2");
+    }
+    @Test public void testAssignComplex() throws Throwable {
+        go("/bpel/2.0/TestAssignComplex");
+    }
+    @Test public void testSimpleTypeParts() throws Throwable {
+        go("/bpel/2.0/TestSimpleTypeParts");
+    }
+    @Test public void testSimpleVariableType() throws Throwable {
+        go("/bpel/2.0/TestSimpleVariableType");
+    }
+    @Test public void testXslTransform() throws Throwable {
+        go("/bpel/2.0/TestXslTransform");
+    }
+    @Test public void testSplit() throws Throwable {
+        go("/bpel/2.0/TestSplit");
+    }
+    @Test public void testCounter() throws Throwable {
+        go("/bpel/2.0/TestCounter");
+    }
+
+}

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer-Timer.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer-Timer.bpel?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer-Timer.bpel (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer-Timer.bpel Wed Sep  5 20:20:50 2007
@@ -1,4 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
 <bpel:process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
               xmlns:pnlk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
               xmlns:xs="http://www.w3.org/2001/XMLSchema"

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer-Timer.deploy
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer-Timer.deploy?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer-Timer.deploy (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer-Timer.deploy Wed Sep  5 20:20:50 2007
@@ -1,4 +1,22 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?><!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
 <dd:process xmlns:dd="http://ode.fivesight.com/schemas/2006/06/27/dd" xmlns:tns="http://www.intalio.com/" xmlns:Client="http://example.com/HandleTimer/Client" xmlns:root="http://example.com/HandleTimer" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:this="http://example.com/HandleTimer/Timer" name="this:Timer" fileName="HandleTimer-Timer.bpel">
   <dd:property name="PATH">HandleTimer</dd:property>
   <dd:property name="SVG">HandleTimer.svg</dd:property>

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer-Timer.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer-Timer.wsdl?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer-Timer.wsdl (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer-Timer.wsdl Wed Sep  5 20:20:50 2007
@@ -1,4 +1,22 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?><!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
 <wsdl:definitions xmlns:tns="http://ode.apache.org/example"
                   xmlns:Client="http://example.com/HandleTimer/Client"
                   xmlns:message="http://ode.apache.org/example"

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer.wsdl?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer.wsdl (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer.wsdl Wed Sep  5 20:20:50 2007
@@ -1,4 +1,22 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?><!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
 <wsdl:definitions xmlns:tns="http://ode.apache.org/example"
                   xmlns:bpdm="http://www.intalio/designer/business-process-data-modeling"
                   xmlns:Client="http://example.com/HandleTimer/Client"

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/deploy.xml
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/deploy.xml?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/deploy.xml (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/deploy.xml Wed Sep  5 20:20:50 2007
@@ -1,4 +1,22 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version='1.0' encoding='UTF-8'?><!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
 <dd:deploy xmlns:dd="http://ode.fivesight.com/schemas/2006/06/27/dd">
     <dd:process xmlns:dd="http://ode.fivesight.com/schemas/2006/06/27/dd"
                 xmlns:tns="http://ode.apache.org/example"

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/message.xsd
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/message.xsd?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/message.xsd (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/message.xsd Wed Sep  5 20:20:50 2007
@@ -1,4 +1,22 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?><!--
+  ~ 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.
+  -->
+
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
             targetNamespace="http://ode.apache.org/example"
             xmlns:tns="http://ode.apache.org/example">

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAssignComplex/ComplexVariables-Variable.deploy
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAssignComplex/ComplexVariables-Variable.deploy?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAssignComplex/ComplexVariables-Variable.deploy (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAssignComplex/ComplexVariables-Variable.deploy Wed Sep  5 20:20:50 2007
@@ -1,4 +1,22 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?><!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
 <dd:process xmlns:dd="http://ode.fivesight.com/schemas/2006/06/27/dd" xmlns:tns="http://www.example.org/Assignment" xmlns:Client="http://example.com/ComplexVariables/Client" xmlns:diag="http://example.com/ComplexVariables" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:this="http://example.com/ComplexVariables/Variable" name="this:Variable" fileName="ComplexVariables-Variable.bpel">
   <dd:property name="PATH">TestComplexVariable/ComplexVariables</dd:property>
   <dd:provide partnerLink="clientAndVariablePlkVar">

Modified: ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HFaultData.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HFaultData.java?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HFaultData.java (original)
+++ ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HFaultData.java Wed Sep  5 20:20:50 2007
@@ -56,7 +56,7 @@
 
 
   /**
-   * @hibernate.property column="EXPLANATION"
+   * @hibernate.property column="EXPLANATION" length="4000"
    */
   public String getExplanation() {
     return _explanation;
@@ -64,8 +64,8 @@
 
   public void setExplanation(String explanation) {
       // Don't want to make this a blob, truncating to avoid errors
-      if (explanation != null && explanation.length() > 255)
-          explanation = explanation.substring(0, 254);
+      if (explanation != null && explanation.length() > 4000)
+          explanation = explanation.substring(0, 3999);
     _explanation = explanation;
   }
 

Modified: ode/branches/bart/dao-jpa/src/main/java/org/apache/ode/dao/jpa/FaultDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/dao-jpa/src/main/java/org/apache/ode/dao/jpa/FaultDAOImpl.java?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/dao-jpa/src/main/java/org/apache/ode/dao/jpa/FaultDAOImpl.java (original)
+++ ode/branches/bart/dao-jpa/src/main/java/org/apache/ode/dao/jpa/FaultDAOImpl.java Wed Sep  5 20:20:50 2007
@@ -43,7 +43,7 @@
 	private Long _id;
 	@Basic @Column(name="NAME")
     private String _name;
-	@Basic @Column(name="MESSAGE")
+	@Basic @Column(name="MESSAGE", length=4000)
     private String _explanation;
 	@Lob @Column(name="DATA")
     private String _data;

Modified: ode/branches/bart/distro/src/examples-jbi/HelloWorld2-RPC/HelloWorld2-RPC-process/HelloWorld2-RPC.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/distro/src/examples-jbi/HelloWorld2-RPC/HelloWorld2-RPC-process/HelloWorld2-RPC.bpel?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/distro/src/examples-jbi/HelloWorld2-RPC/HelloWorld2-RPC-process/HelloWorld2-RPC.bpel (original)
+++ ode/branches/bart/distro/src/examples-jbi/HelloWorld2-RPC/HelloWorld2-RPC-process/HelloWorld2-RPC.bpel Wed Sep  5 20:20:50 2007
@@ -18,12 +18,11 @@
   ~ under the License.
   -->
 <process name="HelloWorld2-RPC"
-        targetNamespace="urn:/HelloWorld2-RPC.bpel"
-        xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-        xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-        xmlns:tns="urn:/HelloWorld2-RPC.bpel"
-        xmlns:hello="urn:/HelloWorld2-RPC.wsdl"
-        xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+         targetNamespace="urn:/HelloWorld2-RPC.bpel"
+         xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+         xmlns:tns="urn:/HelloWorld2-RPC.bpel"
+         xmlns:hello="urn:/HelloWorld2-RPC.wsdl"
+         xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
     <import location="HelloWorld2-RPC.wsdl"
             namespace="urn:/HelloWorld2-RPC.wsdl"

Modified: ode/branches/bart/distro/src/examples-jbi/HelloWorld2-RPC/HelloWorld2-RPC-process/HelloWorld2-RPC.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/distro/src/examples-jbi/HelloWorld2-RPC/HelloWorld2-RPC-process/HelloWorld2-RPC.wsdl?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/distro/src/examples-jbi/HelloWorld2-RPC/HelloWorld2-RPC-process/HelloWorld2-RPC.wsdl (original)
+++ ode/branches/bart/distro/src/examples-jbi/HelloWorld2-RPC/HelloWorld2-RPC-process/HelloWorld2-RPC.wsdl Wed Sep  5 20:20:50 2007
@@ -21,7 +21,7 @@
         targetNamespace="urn:/HelloWorld2-RPC.wsdl"
         xmlns:tns="urn:/HelloWorld2-RPC.wsdl"
         xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/"
+        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
         xmlns:xsd="http://www.w3.org/2001/XMLSchema"
         xmlns="http://schemas.xmlsoap.org/wsdl/">
 

Modified: ode/branches/bart/distro/src/examples-jbi/HelloWorld2-RPC/message.soap
URL: http://svn.apache.org/viewvc/ode/branches/bart/distro/src/examples-jbi/HelloWorld2-RPC/message.soap?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/distro/src/examples-jbi/HelloWorld2-RPC/message.soap (original)
+++ ode/branches/bart/distro/src/examples-jbi/HelloWorld2-RPC/message.soap Wed Sep  5 20:20:50 2007
@@ -20,8 +20,8 @@
 
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
   <SOAP-ENV:Body>
-	<Hello>
-        <text xmlns="urn:/HelloWorld2-RPC.wsdl">hello</text>
-    </Hello>
+    <xns:Hello xmlns:xns="urn:/HelloWorld2-RPC.wsdl">
+      <text>hello</text>
+    </xns:Hello>
   </SOAP-ENV:Body>
 </SOAP-ENV:Envelope>

Modified: ode/branches/bart/distro/src/examples-jbi/HelloWorld2/HelloWorld2-process/HelloWorld2.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/distro/src/examples-jbi/HelloWorld2/HelloWorld2-process/HelloWorld2.bpel?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/distro/src/examples-jbi/HelloWorld2/HelloWorld2-process/HelloWorld2.bpel (original)
+++ ode/branches/bart/distro/src/examples-jbi/HelloWorld2/HelloWorld2-process/HelloWorld2.bpel Wed Sep  5 20:20:50 2007
@@ -18,12 +18,11 @@
   ~ under the License.
   -->
 <process name="HelloWorld2"
-        targetNamespace="urn:/HelloWorld2.bpel"
-        xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-        xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-        xmlns:tns="urn:/HelloWorld2.bpel"
-        xmlns:hello="urn:/HelloWorld2.wsdl"
-        xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+         targetNamespace="urn:/HelloWorld2.bpel"
+         xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+         xmlns:tns="urn:/HelloWorld2.bpel"
+         xmlns:hello="urn:/HelloWorld2.wsdl"
+         xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
     <import location="HelloWorld2.wsdl"
             namespace="urn:/HelloWorld2.wsdl"

Modified: ode/branches/bart/distro/src/examples-jbi/HelloWorld2/HelloWorld2-process/HelloWorld2.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/distro/src/examples-jbi/HelloWorld2/HelloWorld2-process/HelloWorld2.wsdl?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/distro/src/examples-jbi/HelloWorld2/HelloWorld2-process/HelloWorld2.wsdl (original)
+++ ode/branches/bart/distro/src/examples-jbi/HelloWorld2/HelloWorld2-process/HelloWorld2.wsdl Wed Sep  5 20:20:50 2007
@@ -21,7 +21,7 @@
         targetNamespace="urn:/HelloWorld2.wsdl"
         xmlns:tns="urn:/HelloWorld2.wsdl"
         xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/"
+        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
         xmlns="http://schemas.xmlsoap.org/wsdl/">
 
     <types>

Modified: ode/branches/bart/distro/src/examples-jbi/HelloWorld2/HelloWorld2-process/deploy.xml
URL: http://svn.apache.org/viewvc/ode/branches/bart/distro/src/examples-jbi/HelloWorld2/HelloWorld2-process/deploy.xml?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/distro/src/examples-jbi/HelloWorld2/HelloWorld2-process/deploy.xml (original)
+++ ode/branches/bart/distro/src/examples-jbi/HelloWorld2/HelloWorld2-process/deploy.xml Wed Sep  5 20:20:50 2007
@@ -17,7 +17,7 @@
   ~ under the License.
   -->
 <deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-	xmlns:pns="urn:/HelloWorld2.bpel"
+        xmlns:pns="urn:/HelloWorld2.bpel"
         xmlns:sns="urn:/HelloWorld2.wsdl" >
 
 

Modified: ode/branches/bart/distro/src/examples-jbi/PingPong/ping/Ping.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/distro/src/examples-jbi/PingPong/ping/Ping.bpel?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/distro/src/examples-jbi/PingPong/ping/Ping.bpel (original)
+++ ode/branches/bart/distro/src/examples-jbi/PingPong/ping/Ping.bpel Wed Sep  5 20:20:50 2007
@@ -19,13 +19,12 @@
   -->
 <process
         name="Ping"
-        xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+        xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
         targetNamespace="urn:/Ping.bpel"
         xmlns:xsd="http://www.w3.org/2001/XMLSchema"
         xmlns:tns="urn:/Ping.bpel"
         xmlns:ping="urn:/Ping.wsdl"
         xmlns:pong="urn:/Pong.wsdl"
-        xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
         expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0">
 
     <import location="Ping.wsdl"

Modified: ode/branches/bart/distro/src/examples-jbi/PingPong/ping/Ping.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/distro/src/examples-jbi/PingPong/ping/Ping.wsdl?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/distro/src/examples-jbi/PingPong/ping/Ping.wsdl (original)
+++ ode/branches/bart/distro/src/examples-jbi/PingPong/ping/Ping.wsdl Wed Sep  5 20:20:50 2007
@@ -21,7 +21,7 @@
         targetNamespace="urn:/Ping.wsdl"
         xmlns:tns="urn:/Ping.wsdl"
         xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/"
+        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
         xmlns="http://schemas.xmlsoap.org/wsdl/">
 
     <types>

Modified: ode/branches/bart/distro/src/examples-jbi/PingPong/ping/Pong.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/distro/src/examples-jbi/PingPong/ping/Pong.wsdl?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/distro/src/examples-jbi/PingPong/ping/Pong.wsdl (original)
+++ ode/branches/bart/distro/src/examples-jbi/PingPong/ping/Pong.wsdl Wed Sep  5 20:20:50 2007
@@ -21,7 +21,7 @@
         targetNamespace="urn:/Pong.wsdl"
         xmlns:tns="urn:/Pong.wsdl"
         xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/"
+        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
         xmlns="http://schemas.xmlsoap.org/wsdl/">
 
     <types>

Modified: ode/branches/bart/distro/src/examples-jbi/PingPong/pong/Pong.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/distro/src/examples-jbi/PingPong/pong/Pong.bpel?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/distro/src/examples-jbi/PingPong/pong/Pong.bpel (original)
+++ ode/branches/bart/distro/src/examples-jbi/PingPong/pong/Pong.bpel Wed Sep  5 20:20:50 2007
@@ -19,12 +19,11 @@
   -->
 <process
         name="Pong"
-        xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+        xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
         targetNamespace="urn:/Pong.bpel"
         xmlns:xsd="http://www.w3.org/2001/XMLSchema"
         xmlns:tns="urn:/Pong.bpel"
         xmlns:pong="urn:/Pong.wsdl"
-        xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
         expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0">
 
     <import location="Pong.wsdl"

Modified: ode/branches/bart/distro/src/examples-jbi/PingPong/pong/Pong.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/distro/src/examples-jbi/PingPong/pong/Pong.wsdl?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/distro/src/examples-jbi/PingPong/pong/Pong.wsdl (original)
+++ ode/branches/bart/distro/src/examples-jbi/PingPong/pong/Pong.wsdl Wed Sep  5 20:20:50 2007
@@ -21,7 +21,7 @@
         targetNamespace="urn:/Pong.wsdl"
         xmlns:tns="urn:/Pong.wsdl"
         xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/"
+        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
         xmlns="http://schemas.xmlsoap.org/wsdl/">
 
     <types>

Modified: ode/branches/bart/distro/src/examples-jbi/base.xml
URL: http://svn.apache.org/viewvc/ode/branches/bart/distro/src/examples-jbi/base.xml?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/distro/src/examples-jbi/base.xml (original)
+++ ode/branches/bart/distro/src/examples-jbi/base.xml Wed Sep  5 20:20:50 2007
@@ -48,7 +48,7 @@
         <condition property="ode.script.extension" value=".bat">
             <os family="windows"/>
         </condition>
-        <condition property="ode.script.extension" value=".sh">
+        <condition property="ode.script.extension" value="">
             <os family="unix"/>
         </condition>
         <condition property="ode.exe.extension" value=".exe">

Modified: ode/branches/bart/distro/src/examples-war/DynPartner/DynPartnerMain.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/distro/src/examples-war/DynPartner/DynPartnerMain.bpel?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/distro/src/examples-war/DynPartner/DynPartnerMain.bpel (original)
+++ ode/branches/bart/distro/src/examples-war/DynPartner/DynPartnerMain.bpel Wed Sep  5 20:20:50 2007
@@ -20,7 +20,6 @@
 
 <process name="DynPartnerMain"
          targetNamespace="http://ode/bpel/unit-test"
-         xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
          xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
          xmlns:sref="http://docs.oasis-open.org/wsbpel/2.0/serviceref"
          xmlns:tns="http://ode/bpel/unit-test"
@@ -28,8 +27,8 @@
          xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
          xmlns:test="http://ode/bpel/unit-test.wsdl"
          xmlns:resp="http://ode/bpel/responder.wsdl"
-    queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+         queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+         expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
 
   <import location="Main.wsdl" namespace="http://ode/bpel/unit-test.wsdl"
      importType="http://schemas.xmlsoap.org/wsdl/" />

Modified: ode/branches/bart/distro/src/examples-war/DynPartner/DynPartnerResponder.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/distro/src/examples-war/DynPartner/DynPartnerResponder.bpel?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/distro/src/examples-war/DynPartner/DynPartnerResponder.bpel (original)
+++ ode/branches/bart/distro/src/examples-war/DynPartner/DynPartnerResponder.bpel Wed Sep  5 20:20:50 2007
@@ -20,7 +20,6 @@
 
 <process name="DynPartnerResponder"
          targetNamespace="http://ode/bpel/responder"
-         xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
          xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
          xmlns:tns="http://ode/bpel/responder"
          xmlns:xsd="http://www.w3.org/2001/XMLSchema"

Modified: ode/branches/bart/distro/src/examples-war/DynPartner/Main.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/distro/src/examples-war/DynPartner/Main.wsdl?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/distro/src/examples-war/DynPartner/Main.wsdl (original)
+++ ode/branches/bart/distro/src/examples-war/DynPartner/Main.wsdl Wed Sep  5 20:20:50 2007
@@ -26,7 +26,6 @@
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
     xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
     xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
 

Modified: ode/branches/bart/distro/src/examples-war/DynPartner/Responder.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/distro/src/examples-war/DynPartner/Responder.wsdl?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/distro/src/examples-war/DynPartner/Responder.wsdl (original)
+++ ode/branches/bart/distro/src/examples-war/DynPartner/Responder.wsdl Wed Sep  5 20:20:50 2007
@@ -26,7 +26,6 @@
         xmlns:xsd="http://www.w3.org/2001/XMLSchema"
         xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
         xmlns:wsa="http://www.w3.org/2005/08/addressing"
-        xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
         xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
         xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
 

Modified: ode/branches/bart/distro/src/examples-war/HelloWorld2/HelloWorld2.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/distro/src/examples-war/HelloWorld2/HelloWorld2.bpel?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/distro/src/examples-war/HelloWorld2/HelloWorld2.bpel (original)
+++ ode/branches/bart/distro/src/examples-war/HelloWorld2/HelloWorld2.bpel Wed Sep  5 20:20:50 2007
@@ -18,8 +18,7 @@
   -->
 <process name="HelloWorld2"
     targetNamespace="http://ode/bpel/unit-test" 
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+    xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
     xmlns:tns="http://ode/bpel/unit-test"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:test="http://ode/bpel/unit-test.wsdl"

Modified: ode/branches/bart/distro/src/examples-war/HelloWorld2/HelloWorld2.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/distro/src/examples-war/HelloWorld2/HelloWorld2.wsdl?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/distro/src/examples-war/HelloWorld2/HelloWorld2.wsdl (original)
+++ ode/branches/bart/distro/src/examples-war/HelloWorld2/HelloWorld2.wsdl Wed Sep  5 20:20:50 2007
@@ -25,8 +25,7 @@
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
+    xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype">
     
     <wsdl:message name="HelloMessage">
         <wsdl:part name="TestPart" type="xsd:string"/>

Modified: ode/branches/bart/distro/src/examples-war/MagicSession/Main.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/distro/src/examples-war/MagicSession/Main.bpel?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/distro/src/examples-war/MagicSession/Main.bpel (original)
+++ ode/branches/bart/distro/src/examples-war/MagicSession/Main.bpel Wed Sep  5 20:20:50 2007
@@ -20,8 +20,7 @@
 
 <process name="MagicSessionMain"
          targetNamespace="http://ode/bpel/unit-test"
-         xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-         xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+         xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
          xmlns:tns="http://ode/bpel/unit-test"
          xmlns:xsd="http://www.w3.org/2001/XMLSchema"
          xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"

Modified: ode/branches/bart/distro/src/examples-war/MagicSession/Main.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/distro/src/examples-war/MagicSession/Main.wsdl?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/distro/src/examples-war/MagicSession/Main.wsdl (original)
+++ ode/branches/bart/distro/src/examples-war/MagicSession/Main.wsdl Wed Sep  5 20:20:50 2007
@@ -25,9 +25,8 @@
         xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
         xmlns:xsd="http://www.w3.org/2001/XMLSchema"
         xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
         xmlns:wsa="http://www.w3.org/2005/08/addressing"
-        xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
+        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype">
 
     <types>
         <xsd:element name="result" type="xsd:string"/>

Modified: ode/branches/bart/distro/src/examples-war/MagicSession/Responder.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/distro/src/examples-war/MagicSession/Responder.bpel?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/distro/src/examples-war/MagicSession/Responder.bpel (original)
+++ ode/branches/bart/distro/src/examples-war/MagicSession/Responder.bpel Wed Sep  5 20:20:50 2007
@@ -20,8 +20,7 @@
 
 <process name="MagicSessionResponder"
          targetNamespace="http://ode/bpel/responder"
-         xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-         xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+         xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
          xmlns:tns="http://ode/bpel/responder"
          xmlns:xsd="http://www.w3.org/2001/XMLSchema"
          xmlns:resp="http://ode/bpel/unit-test.wsdl">

Modified: ode/branches/bart/distro/src/examples-war/readme.txt
URL: http://svn.apache.org/viewvc/ode/branches/bart/distro/src/examples-war/readme.txt?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/distro/src/examples-war/readme.txt (original)
+++ ode/branches/bart/distro/src/examples-war/readme.txt Wed Sep  5 20:20:50 2007
@@ -10,7 +10,7 @@
 export PATH=$PATH:PATH_TO_ODE/bin
 
 The sendsoap command can either be executed using sendsoap.bat under
-Windows or sendsoap.sh with Linux (replace accordingly in the
+Windows or sendsoap with Linux (replace accordingly in the
 following command line examples).
 
 Hello World 2
@@ -21,8 +21,8 @@
 
 sendsoap http://localhost:8080/ode/processes/helloWorld testRequest.soap
 
-Please make sure that you execute the command from the HelloWorld2
-example directory. The response should be a SOAP message containing the
+Please make sure that you execute the command from the example 
+directory. The response should be a SOAP message containing the
 'hello world' string.
 
 Dynamic Partner
@@ -38,8 +38,8 @@
 
 sendsoap http://localhost:8080/ode/processes/DynMainService testRequest.soap
 
-Please make sure that you execute the command from the HelloWorld2
-example directory. The response should be an 'OK' SOAP message, showing
+Please make sure that you execute the command from the example 
+directory. The response should be an 'OK' SOAP message, showing
 that all invocations have been successful.
 
 Magic Session
@@ -54,6 +54,6 @@
 
 sendsoap http://localhost:8080/ode/processes/MSMainExecuteService testRequest.soap
 
-Please make sure that you execute the command from the HelloWorld2
-example directory. The response should be an 'OK' SOAP message, showing
+Please make sure that you execute the command from the example 
+directory. The response should be an 'OK' SOAP message, showing
 that all invocations have been successful.

Modified: ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/OdeConsumer.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/OdeConsumer.java?rev=573139&r1=573138&r2=573139&view=diff
==============================================================================
--- ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/OdeConsumer.java (original)
+++ ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/OdeConsumer.java Wed Sep  5 20:20:50 2007
@@ -120,6 +120,7 @@
     }
 
 
+    protected abstract void inOutDone(InOut inout);
 
     public void onJbiMessageExchange(MessageExchange jbiMex) throws MessagingException {
         if (!jbiMex.getPattern().equals(MessageExchangePattern.IN_ONLY)
@@ -129,11 +130,13 @@
         }
         if (jbiMex.getStatus() == ExchangeStatus.ACTIVE) {
             if (jbiMex.getPattern().equals(MessageExchangePattern.IN_OUT)) {
+                inOutDone((InOut) jbiMex);
                 outResponse((InOut) jbiMex);
             }
             jbiMex.setStatus(ExchangeStatus.DONE);
             _ode.getChannel().send(jbiMex);
         } else if (jbiMex.getStatus() == ExchangeStatus.ERROR) {
+            inOutDone((InOut) jbiMex);
             outFailure((InOut) jbiMex);
         } else if (jbiMex.getStatus() == ExchangeStatus.DONE) {
             ; // anything todo here?