Author: veithen
Date: Sun Jan 27 19:26:43 2013
New Revision: 1439148
URL: http://svn.apache.org/viewvc?rev=1439148&view=rev
Log:
Merged r1438985 to the 1.6 branch for compatibility with Axiom 1.2.15.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/saaj/ (props changed)
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk:r1438985
Propchange: axis/axis2/java/core/branches/1_6/modules/saaj/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/saaj:r1438985
Modified:
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java?rev=1439148&r1=1439147&r2=1439148&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
Sun Jan 27 19:26:43 2013
@@ -20,9 +20,7 @@
package org.apache.axis2.saaj;
import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMText;
@@ -49,7 +47,6 @@ import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPFault;
import javax.xml.soap.SOAPFaultElement;
import javax.xml.soap.SOAPHeader;
-import javax.xml.stream.XMLStreamException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
@@ -63,18 +60,6 @@ public class SOAPElementImpl<T extends O
super((Element)element, element);
}
- /* (non-Javadoc)
- * @see org.apache.axiom.om.OMNode#discard()
- */
- public void discard() throws OMException {
- omTarget.discard();
- }
-
- public void internalSerialize(javax.xml.stream.XMLStreamWriter writer,
boolean cache)
- throws XMLStreamException {
- ((OMElementEx)omTarget).internalSerialize(writer, cache);
- }
-
/**
* Adds an attribute with the specified name and value to this
<code>SOAPElement</code> object.
* <p/>
@@ -547,13 +532,6 @@ public class SOAPElementImpl<T extends O
}
/* (non-Javadoc)
- * @see
org.apache.axiom.om.impl.OMNodeEx#setParent(org.apache.axiom.om.OMContainer)
- */
- public void setParent(OMContainer parentElement) {
- ((OMElementEx)omTarget).setParent(parentElement);
- }
-
- /* (non-Javadoc)
* @see org.w3c.dom.Element#getAttribute(java.lang.String)
*/
public String getAttribute(String name) {
