Updated Branches:
refs/heads/ode-1.3.6.x 088c56d6e -> 7b471240b
fix for ODE-1000: Partnerlink assignments dont work properly.
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/7b471240
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/7b471240
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/7b471240
Branch: refs/heads/ode-1.3.6.x
Commit: 7b471240b52ebc4de135b2ce2bc4ad906c84298d
Parents: 088c56d
Author: Tammo van Lessen <tvanlessen@gmail.com>
Authored: Wed Aug 28 00:36:07 2013 +0200
Committer: Tammo van Lessen <tvanlessen@gmail.com>
Committed: Wed Aug 28 00:36:07 2013 +0200
----------------------------------------------------------------------
Rakefile | 1 +
.../org/apache/ode/bpel/epr/WSAEndpoint.java | 2 +-
.../org/apache/ode/bpel/epr/WSDL11Endpoint.java | 2 +-
.../apache/ode/bpel/epr/WSDL11EndpointTest.java | 71 --------------------
.../apache/ode/bpel/epr/WSDL11EndpointTest.java | 71 ++++++++++++++++++++
5 files changed, 74 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/7b471240/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index 765d351..4d2ebde 100644
--- a/Rakefile
+++ b/Rakefile
@@ -198,6 +198,7 @@ define "ode" do
define "bpel-epr" do
compile.with projects("utils", "bpel-dao", "bpel-api"),
AXIOM, COMMONS.lang, COMMONS.logging, COMMONS.beanutils, DERBY, JAVAX.connector, JAVAX.stream,
JAVAX.transaction, GERONIMO.transaction, GERONIMO.connector, TRANQL, XMLBEANS
+
package :jar
end
http://git-wip-us.apache.org/repos/asf/ode/blob/7b471240/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java
----------------------------------------------------------------------
diff --git a/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java b/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java
index c4c42bb..7f688f2 100644
--- a/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java
+++ b/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java
@@ -165,7 +165,7 @@ public class WSAEndpoint implements MutableEndpoint {
Element serviceRef = doc.createElementNS(SERVICE_REF_QNAME.getNamespaceURI(), SERVICE_REF_QNAME.getLocalPart());
doc.appendChild(serviceRef);
serviceRef.appendChild(doc.importNode(_eprElmt, true));
- return _eprElmt.getOwnerDocument();
+ return doc;
}
public Map toMap() {
http://git-wip-us.apache.org/repos/asf/ode/blob/7b471240/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSDL11Endpoint.java
----------------------------------------------------------------------
diff --git a/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSDL11Endpoint.java b/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSDL11Endpoint.java
index 4f38e9f..d978bb0 100644
--- a/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSDL11Endpoint.java
+++ b/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSDL11Endpoint.java
@@ -110,7 +110,7 @@ public class WSDL11Endpoint implements MutableEndpoint {
Element serviceRef = doc.createElementNS(Namespaces.WSBPEL2_0_FINAL_SERVREF, "service-ref");
doc.appendChild(serviceRef);
serviceRef.appendChild(doc.importNode(_serviceElmt, true));
- return _serviceElmt.getOwnerDocument();
+ return doc;
}
public Map toMap() {
http://git-wip-us.apache.org/repos/asf/ode/blob/7b471240/bpel-epr/src/main/test/org/apache/ode/bpel/epr/WSDL11EndpointTest.java
----------------------------------------------------------------------
diff --git a/bpel-epr/src/main/test/org/apache/ode/bpel/epr/WSDL11EndpointTest.java b/bpel-epr/src/main/test/org/apache/ode/bpel/epr/WSDL11EndpointTest.java
deleted file mode 100644
index e2825b9..0000000
--- a/bpel-epr/src/main/test/org/apache/ode/bpel/epr/WSDL11EndpointTest.java
+++ /dev/null
@@ -1,71 +0,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.
- */
-
-package org.apache.ode.bpel.epr;
-
-import junit.framework.TestCase;
-
-import org.apache.ode.utils.DOMUtils;
-import org.apache.ode.utils.Namespaces;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-/**
- * A test for the WSDL11Endpoint class, to define how it works.
- *
- *
- * @author <a href="mailto:atoulme@intalio.com">Antoine Toulme</a>
- */
-public class WSDL11EndpointTest extends TestCase {
-
- public void testAcceptServiceElement() {
- WSDL11Endpoint endpoint = new WSDL11Endpoint();
- Document doc = DOMUtils.newDocument();
- Node node = doc.createElementNS(Namespaces.WSDL_11, "service");
- node.appendChild(doc.createTextNode("http://example.com/hello"));
- assertTrue(endpoint.accept(node));
- }
-
-
- public void testAcceptServiceRefElement() {
- WSDL11Endpoint endpoint = new WSDL11Endpoint();
- Document doc = DOMUtils.newDocument();
- Node node = doc.createElementNS(Namespaces.WS_BPEL_20_NS, "service-ref");
- Node child = doc.createElementNS(Namespaces.WSDL_11, "service");
- node.appendChild(child);
- child.appendChild(doc.createTextNode("http://example.com/hello"));
- assertTrue(endpoint.accept(node));
- }
-
-
- public void testAcceptServiceWithRandomElement() {
- WSDL11Endpoint endpoint = new WSDL11Endpoint();
- Document doc = DOMUtils.newDocument();
- Node child = doc.createElementNS("http://example.com/someNM", "helloHeloo");
- child.appendChild(doc.createTextNode("http://example.com/hello"));
- assertFalse("The endpoint should accept a random element", endpoint.accept(child));
- }
-
- public void testAcceptServiceWithTextNode() {
- WSDL11Endpoint endpoint = new WSDL11Endpoint();
- Document doc = DOMUtils.newDocument();
- assertFalse("The endpoint should accept a text node",
- endpoint.accept(doc.createTextNode("http://example.com/hello")));
- }
-}
http://git-wip-us.apache.org/repos/asf/ode/blob/7b471240/bpel-epr/src/test/java/org/apache/ode/bpel/epr/WSDL11EndpointTest.java
----------------------------------------------------------------------
diff --git a/bpel-epr/src/test/java/org/apache/ode/bpel/epr/WSDL11EndpointTest.java b/bpel-epr/src/test/java/org/apache/ode/bpel/epr/WSDL11EndpointTest.java
new file mode 100644
index 0000000..e2825b9
--- /dev/null
+++ b/bpel-epr/src/test/java/org/apache/ode/bpel/epr/WSDL11EndpointTest.java
@@ -0,0 +1,71 @@
+/*
+ * 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.bpel.epr;
+
+import junit.framework.TestCase;
+
+import org.apache.ode.utils.DOMUtils;
+import org.apache.ode.utils.Namespaces;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+
+/**
+ * A test for the WSDL11Endpoint class, to define how it works.
+ *
+ *
+ * @author <a href="mailto:atoulme@intalio.com">Antoine Toulme</a>
+ */
+public class WSDL11EndpointTest extends TestCase {
+
+ public void testAcceptServiceElement() {
+ WSDL11Endpoint endpoint = new WSDL11Endpoint();
+ Document doc = DOMUtils.newDocument();
+ Node node = doc.createElementNS(Namespaces.WSDL_11, "service");
+ node.appendChild(doc.createTextNode("http://example.com/hello"));
+ assertTrue(endpoint.accept(node));
+ }
+
+
+ public void testAcceptServiceRefElement() {
+ WSDL11Endpoint endpoint = new WSDL11Endpoint();
+ Document doc = DOMUtils.newDocument();
+ Node node = doc.createElementNS(Namespaces.WS_BPEL_20_NS, "service-ref");
+ Node child = doc.createElementNS(Namespaces.WSDL_11, "service");
+ node.appendChild(child);
+ child.appendChild(doc.createTextNode("http://example.com/hello"));
+ assertTrue(endpoint.accept(node));
+ }
+
+
+ public void testAcceptServiceWithRandomElement() {
+ WSDL11Endpoint endpoint = new WSDL11Endpoint();
+ Document doc = DOMUtils.newDocument();
+ Node child = doc.createElementNS("http://example.com/someNM", "helloHeloo");
+ child.appendChild(doc.createTextNode("http://example.com/hello"));
+ assertFalse("The endpoint should accept a random element", endpoint.accept(child));
+ }
+
+ public void testAcceptServiceWithTextNode() {
+ WSDL11Endpoint endpoint = new WSDL11Endpoint();
+ Document doc = DOMUtils.newDocument();
+ assertFalse("The endpoint should accept a text node",
+ endpoint.accept(doc.createTextNode("http://example.com/hello")));
+ }
+}
|