You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2012/05/15 23:23:48 UTC
svn commit: r1338901 - in /webservices/axiom/branches/CLONE: ./
modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/
modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/
modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom...
Author: veithen
Date: Tue May 15 21:23:48 2012
New Revision: 1338901
URL: http://svn.apache.org/viewvc?rev=1338901&view=rev
Log:
Merged latest changes from trunk.
Added:
webservices/axiom/branches/CLONE/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent1.java
- copied unchanged from r1338896, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent1.java
webservices/axiom/branches/CLONE/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent2.java
- copied unchanged from r1338896, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent2.java
webservices/axiom/branches/CLONE/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent3.java
- copied unchanged from r1338896, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent3.java
webservices/axiom/branches/CLONE/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent1.java
- copied unchanged from r1338896, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent1.java
webservices/axiom/branches/CLONE/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent2.java
- copied unchanged from r1338896, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent2.java
webservices/axiom/branches/CLONE/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent3.java
- copied unchanged from r1338896, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent3.java
Modified:
webservices/axiom/branches/CLONE/ (props changed)
webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java
webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java
webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java
webservices/axiom/branches/CLONE/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
webservices/axiom/branches/CLONE/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java
webservices/axiom/branches/CLONE/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java
Propchange: webservices/axiom/branches/CLONE/
------------------------------------------------------------------------------
Merged /webservices/axiom/branches/CHECK_PARENT_BUG:r1338398-1338886
Merged /webservices/commons/trunk/modules/axiom:r1337942-1338896
Modified: webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java?rev=1338901&r1=1338900&r2=1338901&view=diff
==============================================================================
--- webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java (original)
+++ webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java Tue May 15 21:23:48 2012
@@ -177,7 +177,7 @@ public abstract class ChildNode extends
setParent(element, false);
}
- void setParent(OMContainer element, boolean useDomSemantics) {
+ protected void setParent(OMContainer element, boolean useDomSemantics) {
if (element == null) {
ownerNode = useDomSemantics ? ownerDocument() : null;
hasParent(false);
Modified: webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java?rev=1338901&r1=1338900&r2=1338901&view=diff
==============================================================================
--- webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java (original)
+++ webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java Tue May 15 21:23:48 2012
@@ -19,6 +19,7 @@
package org.apache.axiom.soap.impl.dom;
+import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMXMLParserWrapper;
@@ -76,4 +77,11 @@ public abstract class SOAPElement extend
protected abstract void checkParent(OMElement parent)
throws SOAPProcessingException;
+ protected void setParent(OMContainer element, boolean useDomSemantics) {
+ super.setParent(element, useDomSemantics);
+
+ if (!useDomSemantics && element instanceof OMElement) {
+ checkParent((OMElement) element);
+ }
+ }
}
Modified: webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java?rev=1338901&r1=1338900&r2=1338901&view=diff
==============================================================================
--- webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java (original)
+++ webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java Tue May 15 21:23:48 2012
@@ -135,6 +135,17 @@ public abstract class SOAPHeaderBlockImp
public Object getObject(Class dataSourceClass) {
throw new UnsupportedOperationException();
}
+
+ protected abstract void checkParent(OMElement parent)
+ throws SOAPProcessingException;
+
+ protected void setParent(OMContainer element, boolean useDomSemantics) {
+ super.setParent(element, useDomSemantics);
+
+ if (!useDomSemantics && element instanceof OMElement) {
+ checkParent((OMElement) element);
+ }
+ }
protected OMElement createClone(OMCloneOptions options, OMContainer targetParent) {
SOAPHeaderBlock clone = ((SOAPFactory)factory).createSOAPHeaderBlock(getLocalName(), getNamespace(), (SOAPHeader)targetParent);
Modified: webservices/axiom/branches/CLONE/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/CLONE/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java?rev=1338901&r1=1338900&r2=1338901&view=diff
==============================================================================
--- webservices/axiom/branches/CLONE/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java (original)
+++ webservices/axiom/branches/CLONE/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java Tue May 15 21:23:48 2012
@@ -325,7 +325,7 @@ public class OMElementImpl extends OMNod
child.detach();
}
- child.parent = this;
+ child.setParent(this);
if (firstChild == null) {
firstChild = child;
Modified: webservices/axiom/branches/CLONE/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/CLONE/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java?rev=1338901&r1=1338900&r2=1338901&view=diff
==============================================================================
--- webservices/axiom/branches/CLONE/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java (original)
+++ webservices/axiom/branches/CLONE/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java Tue May 15 21:23:48 2012
@@ -84,6 +84,16 @@ public abstract class SOAPHeaderBlockImp
this.setNamespace(ns);
}
+ protected abstract void checkParent(OMElement parent) throws SOAPProcessingException;
+
+ public void setParent(OMContainer element) {
+ super.setParent(element);
+
+ if (element instanceof OMElement) {
+ checkParent((OMElement) element);
+ }
+ }
+
/**
* @param attributeName
* @param attrValue
Modified: webservices/axiom/branches/CLONE/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/CLONE/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java?rev=1338901&r1=1338900&r2=1338901&view=diff
==============================================================================
--- webservices/axiom/branches/CLONE/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java (original)
+++ webservices/axiom/branches/CLONE/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java Tue May 15 21:23:48 2012
@@ -118,6 +118,9 @@ public class SOAPTestSuiteBuilder extend
addTest(new org.apache.axiom.ts.soap.fault.TestSetException(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.fault.TestSetReason(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.fault.TestSetRole(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.fault.TestWrongParent1(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.fault.TestWrongParent2(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.fault.TestWrongParent3(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.faultdetail.TestAddDetailEntry(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.faultdetail.TestDetailEntriesUsingDefaultNamespaceWithParser(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.faultdetail.TestGetAllDetailEntries(metaFactory, spec));
@@ -145,6 +148,9 @@ public class SOAPTestSuiteBuilder extend
addTest(new org.apache.axiom.ts.soap.headerblock.TestSetMustUnderstandString01(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.headerblock.TestSetMustUnderstandWithInvalidValue(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.headerblock.TestSetRole(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.headerblock.TestWrongParent1(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.headerblock.TestWrongParent2(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.headerblock.TestWrongParent3(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.xpath.TestXPathAppliedToSOAPEnvelope(metaFactory, spec, true));
addTest(new org.apache.axiom.ts.soap.xpath.TestXPathAppliedToSOAPEnvelope(metaFactory, spec, false));
}