svn commit: r1377526 [3/3] - in /axis/axis2/java/core/branches/1_6: ./ modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/ modules/saaj/ modules/saaj/src/org/apache/axis2/saaj/ modules/saaj/sr
Modified:
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java?rev=1377526&r1=1377525&r2=1377526&view=diff
==
---
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
Sun Aug 26 21:42:35 2012
@@ -19,17 +19,13 @@
package org.apache.axis2.saaj;
+import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.impl.dom.ElementImpl;
-import org.apache.axiom.om.impl.dom.NamespaceImpl;
-import org.apache.axiom.om.impl.dom.NodeImpl;
+import org.apache.axiom.soap.SOAP11Version;
+import org.apache.axiom.soap.SOAP12Version;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeaderBlock;
-import org.apache.axiom.soap.impl.dom.soap11.SOAP11Factory;
-import org.apache.axiom.soap.impl.dom.soap11.SOAP11HeaderBlockImpl;
-import org.apache.axiom.soap.impl.dom.soap12.SOAP12Factory;
-import org.apache.axiom.soap.impl.dom.soap12.SOAP12HeaderBlockImpl;
import org.apache.axis2.namespace.Constants;
import org.w3c.dom.Element;
@@ -44,9 +40,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-public class SOAPHeaderImpl extends SOAPElementImpl implements SOAPHeader {
-
-private org.apache.axiom.soap.SOAPHeader omSOAPHeader;
+public class SOAPHeaderImpl extends
SOAPElementImpl implements SOAPHeader {
/**
* Constructor
@@ -54,8 +48,7 @@ public class SOAPHeaderImpl extends SOAP
* @param header
*/
public SOAPHeaderImpl(org.apache.axiom.soap.SOAPHeader header) {
-super((ElementImpl)header);
-omSOAPHeader = header;
+super(header);
}
/* (non-Javadoc)
@@ -82,18 +75,11 @@ public class SOAPHeaderImpl extends SOAP
*/
public SOAPElement addChildElement(String localName, String prefix, String
uri)
throws SOAPException {
-OMNamespace ns = new NamespaceImpl(uri, prefix);
-SOAPHeaderBlock headerBlock = null;
-if (this.element.getOMFactory() instanceof SOAP11Factory) {
-headerBlock = new SOAP11HeaderBlockImpl(localName, ns,
omSOAPHeader,
-
(SOAPFactory)this.element.getOMFactory());
-} else {
-headerBlock = new SOAP12HeaderBlockImpl(localName, ns,
omSOAPHeader,
-
(SOAPFactory)this.element.getOMFactory());
-}
+OMNamespace ns = omTarget.getOMFactory().createOMNamespace(uri,
prefix);
+SOAPHeaderBlock headerBlock =
((SOAPFactory)this.omTarget.getOMFactory()).createSOAPHeaderBlock(localName,
ns, omTarget);
SOAPHeaderElementImpl soapHeaderElement = new
SOAPHeaderElementImpl(headerBlock);
-element.setUserData(SAAJ_NODE, this, null);
-soapHeaderElement.element.setUserData(SAAJ_NODE, soapHeaderElement,
null);
+target.setUserData(SAAJ_NODE, this, null);
+soapHeaderElement.target.setUserData(SAAJ_NODE, soapHeaderElement,
null);
soapHeaderElement.setParentElement(this);
return soapHeaderElement;
}
@@ -109,47 +95,29 @@ public class SOAPHeaderImpl extends SOAP
* @see
javax.xml.soap.SOAPElement#addChildElement(javax.xml.soap.SOAPElement)
*/
public SOAPElement addChildElement(SOAPElement soapElement) throws
SOAPException {
-OMNamespace ns = new NamespaceImpl(soapElement.getNamespaceURI(),
+OMNamespace ns =
omTarget.getOMFactory().createOMNamespace(soapElement.getNamespaceURI(),
soapElement.getPrefix());
-SOAPHeaderBlock headerBlock = null;
-if (this.element.getOMFactory() instanceof SOAP11Factory) {
-headerBlock = new
SOAP11HeaderBlockImpl(soapElement.getLocalName(), ns,
-omSOAPHeader,
-
(SOAPFactory)this.element.getOMFactory());
-} else {
-headerBlock = new
SOAP12HeaderBlockImpl(soapElement.getLocalName(), ns,
-omSOAPHeader,
-
(SOAPFactory)this.element.getOMFactory());
-
-}
+SOAPHeaderBlock headerBlock =
((SOAPFactory)this.omTarget.getOMFactory()).createSOAPHeaderBlock(
+soapElement.getLocalName(), ns, omTarget);
SOAPHeaderElementImpl soapHeaderElement = new
SOAPHeaderElementImpl(headerBlock);
-element.setUserData(SAAJ_NODE, this, null);
-soapHeaderElement.element.setUserData(SAAJ_NODE, soap
svn commit: r1377526 [1/3] - in /axis/axis2/java/core/branches/1_6: ./ modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/ modules/saaj/ modules/saaj/src/org/apache/axis2/saaj/ modules/saaj/sr
Author: veithen
Date: Sun Aug 26 21:42:35 2012
New Revision: 1377526
URL: http://svn.apache.org/viewvc?rev=1377526&view=rev
Log:
Merged a couple of changes to the 1.6 branch to increase compatibility with
Axiom 1.2.14.
Added:
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SAAJNode.java
- copied, changed from r1343353,
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SAAJNode.java
Removed:
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/ (props changed)
axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/CommentImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/DetailEntryImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/DetailImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/MessageFactoryImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyElementImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPFactoryImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultElementImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderElementImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java
axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/SOAPPartTest.java
axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
Propchange: axis/axis2/java/core/branches/1_6/
--
Merged /axis/axis2/java/core/trunk:r1343353,1348340
Modified:
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java?rev=1377526&r1=1377525&r2=1377526&view=diff
==
---
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java
Sun Aug 26 21:42:35 2012
@@ -21,10 +21,8 @@ package org.apache.axis2.jaxws.message.u
import org.apache.axiom.attachments.Attachments;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.impl.dom.ElementImpl;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
@@ -631,8 +629,8 @@ public class SAAJConverterImpl implement
// get that and add it as a text node under the
original element.
Node value = se.getFirstChild();
if (value != null && value instanceof
org.apache.axis2.saaj.SOAPElementImpl) {
-org.apache.axis2.saaj.SOAPElementImpl valueElement
= (org.apache.axis2.saaj.SOAPElementImpl) value;
-ElementImpl e = valueElement.getElement();
+org.apache.axis2.saaj.SOAPElementImpl
valueElement = (org.apache.axis2.saaj.SOAPElementImpl) value;
+OMElement e = valueElement.getO
