[jbossws-commits] JBossWS SVN: r10187 - in stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws: core/soap and 1 other directories.

Author: darran.lofthouse(a)jboss.com Date: 2009-06-11 07:05:24 -0400 (Thu, 11 Jun 2009) New Revision: 10187 Added: stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementInternal.java stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementWrapper.java Modified: stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/NodeListImpl.java stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/extensions/xop/CreateAttachmentVisitor.java stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/extensions/xop/RestoreXOPElementVisitor.java Log: Initial changes to alter appendChild() Modified: stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2009-06-11 11:03:44 UTC (rev 10186) +++ stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2009-06-11 11:05:24 UTC (rev 10187) @@ -60,6 +60,7 @@ import org.jboss.ws.core.soap.SOAPBodyImpl; import org.jboss.ws.core.soap.SOAPContentElement; import org.jboss.ws.core.soap.SOAPElementImpl; +import org.jboss.ws.core.soap.SOAPElementInternal; import org.jboss.ws.core.soap.SOAPFactoryImpl; import org.jboss.ws.core.soap.SOAPFaultImpl; import org.jboss.ws.core.soap.SOAPHeaderElementImpl; @@ -841,7 +842,7 @@ Object childNode = childElements.next(); if (childNode instanceof SOAPElement) { - SOAPElementImpl childElement = (SOAPElementImpl)childNode; + SOAPElementInternal childElement = (SOAPElementInternal)childNode; // If this message was manipulated by a handler the child may not be a content element if (!(childElement instanceof SOAPContentElement)) childElement = (SOAPContentElement)soapElement.replaceChild(new SOAPContentElement(childElement), childElement); @@ -891,7 +892,7 @@ TypesMetaData typesMetaData = opMetaData.getEndpointMetaData().getServiceMetaData().getTypesMetaData(); if (childElements.hasNext() && opMetaData.getStyle() == Style.DOCUMENT) { - SOAPElementImpl childElement = (SOAPElementImpl)childElements.next(); + SOAPElementInternal childElement = (SOAPElementInternal)childElements.next(); // The parameters are expected to be lazy SOAPContentElement aux = (SOAPContentElement)childElement; Modified: stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2009-06-11 11:03:44 UTC (rev 10186) +++ stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2009-06-11 11:05:24 UTC (rev 10187) @@ -67,7 +67,7 @@ // This org.w3c.dom.Node protected org.w3c.dom.Node domNode; // A list of soap children - private List<NodeImpl> soapChildren = new ArrayList<NodeImpl>(); + private List<Node> soapChildren = new ArrayList<Node>(); // A hash with the user data private Map<String, Object> userData; @@ -284,14 +284,25 @@ public org.w3c.dom.Node getFirstChild() { - NodeImpl child = null; + Node child = null; org.w3c.dom.Node domChild = domNode.getFirstChild(); if (domChild != null) { if (!soapChildren.isEmpty()) //see JBWS-2186 { - child = (NodeImpl)soapChildren.get(0); - if (domChild != child.domNode) + child = (Node)soapChildren.get(0); + + Node childDomNode = null; + if (child instanceof NodeImpl) + { + childDomNode = ((NodeImpl)child).domNode; + } + else if (child instanceof SOAPElementInternal) + { + childDomNode = ((SOAPElementInternal)child).getDomNode(); + } + + if (domChild != childDomNode) throw new WSException("Inconsistent node, child lists not synchronized"); } } @@ -340,21 +351,31 @@ { assertSOAPParent(); - NodeImpl sibling = null; + Node sibling = null; if (soapParent != null) { List children = ((NodeImpl)soapParent).soapChildren; for (int i = 0; i < children.size(); i++) { - NodeImpl node = (NodeImpl)children.get(i); + Node node = (Node)children.get(i); if (node == this && (i + 1) < children.size()) { - sibling = (NodeImpl)children.get(i + 1); + sibling = (Node)children.get(i + 1); break; } } - if (sibling != null && sibling.domNode != domNode.getNextSibling()) + Node siblingDomNode = null; + if (sibling instanceof NodeImpl) + { + siblingDomNode = ((NodeImpl)sibling).domNode; + } + else if (sibling instanceof SOAPElementInternal) + { + siblingDomNode = ((SOAPElementInternal)sibling).getDomNode(); + } + + if (sibling != null && siblingDomNode != domNode.getNextSibling()) throw new WSException("Inconsistent node, child lists not synchronized"); } @@ -475,17 +496,24 @@ return newChild; } - if ((this instanceof SOAPElementImpl) == false) + if ((this instanceof SOAPElementInternal) == false) throw new DOMException(DOMException.INVALID_ACCESS_ERR, "Cannot append child to this node: " + this); - NodeImpl soapNode = (NodeImpl)newChild; - soapNode.detachNode(); - - domNode.appendChild(soapNode.domNode); - soapNode.soapParent = (SOAPElementImpl)this; - - soapChildren.add(soapNode); - + if (newChild instanceof SOAPElementInternal) + { + SOAPElementInternal soapNode = (SOAPElementInternal)newChild; + soapNode.detachNode(); + domNode.appendChild(soapNode.getDomNode()); + soapNode.setSoapParent((SOAPElementImpl)this); + soapChildren.add(soapNode); + } else { + NodeImpl soapNode = (NodeImpl)newChild; + soapNode.detachNode(); + domNode.appendChild(soapNode.domNode); + soapNode.soapParent = (SOAPElementImpl)this; + soapChildren.add(soapNode); + } + return newChild; } Modified: stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/NodeListImpl.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/NodeListImpl.java 2009-06-11 11:03:44 UTC (rev 10186) +++ stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/NodeListImpl.java 2009-06-11 11:05:24 UTC (rev 10187) @@ -38,16 +38,16 @@ */ class NodeListImpl implements NodeList { - private List<NodeImpl> nodeList = new ArrayList<NodeImpl>(); + private List<Node> nodeList = new ArrayList<Node>(); - NodeListImpl(List<NodeImpl> nodes) + NodeListImpl(List<Node> nodes) { - nodeList = new ArrayList<NodeImpl>(nodes); + nodeList = new ArrayList<Node>(nodes); } NodeListImpl(Iterator<NodeImpl> nodes) { - nodeList = new ArrayList<NodeImpl>(); + nodeList = new ArrayList<Node>(); while (nodes.hasNext()) nodeList.add(nodes.next()); } Modified: stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2009-06-11 11:03:44 UTC (rev 10186) +++ stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2009-06-11 11:05:24 UTC (rev 10187) @@ -236,14 +236,14 @@ Iterator childElements = getChildElements(); - SOAPElementImpl childElement = null; + SOAPElementInternal childElement = null; while (childElements.hasNext() == true) { Object current = childElements.next(); - if (current instanceof SOAPElementImpl) + if (current instanceof SOAPElementInternal) { - childElement = (SOAPElementImpl)current; + childElement = (SOAPElementInternal)current; break; } } @@ -256,7 +256,7 @@ while (childElements.hasNext() == true) { Object current = childElements.next(); - if (current instanceof SOAPElementImpl) + if (current instanceof SOAPElementInternal) throw new SOAPException("Multiple SOAPBodyElement"); } @@ -274,7 +274,7 @@ // child element's owner document might be shared with other elements; // we have to create a separate document for returning to our caller Document newDocument = DOMUtils.getDocumentBuilder().newDocument(); - Node adoptedElement = newDocument.adoptNode(childElement.domNode); + Node adoptedElement = newDocument.adoptNode(childElement.getDomNode()); newDocument.appendChild(adoptedElement); return newDocument; Modified: stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2009-06-11 11:03:44 UTC (rev 10186) +++ stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2009-06-11 11:05:24 UTC (rev 10187) @@ -68,7 +68,7 @@ * @author Heiko.Braun(a)jboss.org * @since 13-Dec-2004 */ -public class SOAPContentElement extends SOAPElementImpl implements SOAPContentAccess +public class SOAPContentElement extends SOAPElementWrapper implements SOAPContentAccess { // provide logging private static Logger log = Logger.getLogger(SOAPContentElement.class); @@ -89,17 +89,17 @@ */ public SOAPContentElement(Name name) { - super(name); + super(new SOAPElementImpl(name)); this.soapContent = new DOMContent(this); } public SOAPContentElement(QName qname) { - super(qname); + super(new SOAPElementImpl(qname)); this.soapContent = new DOMContent(this); } - public SOAPContentElement(SOAPElementImpl element) + public SOAPContentElement(SOAPElementInternal element) { super(element); this.soapContent = new DOMContent(this); Modified: stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2009-06-11 11:03:44 UTC (rev 10186) +++ stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2009-06-11 11:05:24 UTC (rev 10187) @@ -58,7 +58,7 @@ * * @author Thomas.Diesler(a)jboss.org */ -public class SOAPElementImpl extends NodeImpl implements SOAPElement, SAAJVisitable +public class SOAPElementImpl extends NodeImpl implements SOAPElementInternal, SAAJVisitable { // provide logging private static Logger log = Logger.getLogger(SOAPElementImpl.class); @@ -854,4 +854,18 @@ out.write(value); } } + + // SOAPElementInternal + + public org.w3c.dom.Node getDomNode() + { + return domNode; + } + + public void setSoapParent(SOAPElementImpl soapParent) + { + this.soapParent = soapParent; + } + + } Added: stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementInternal.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementInternal.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementInternal.java 2009-06-11 11:05:24 UTC (rev 10187) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.core.soap; + +import javax.xml.namespace.QName; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPException; + +import org.w3c.dom.Node; + +/** + * An extension of the SOAPElement interface to add internal methods. + * + * @author darran.lofthouse(a)jboss.com + * @since 11th June 2009 + */ +public interface SOAPElementInternal extends SAAJVisitable, SOAPElement +{ + + Node getDomNode(); + + SOAPElement setElementQNameInternal(QName qname) throws SOAPException; + + void setSoapParent(SOAPElementImpl soapParent); + +} Property changes on: stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementInternal.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementWrapper.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementWrapper.java (rev 0) +++ stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementWrapper.java 2009-06-11 11:05:24 UTC (rev 10187) @@ -0,0 +1,578 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.core.soap; + +import java.util.Iterator; + +import javax.xml.namespace.QName; +import javax.xml.soap.Name; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPException; + +import org.w3c.dom.Attr; +import org.w3c.dom.DOMException; +import org.w3c.dom.Document; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.w3c.dom.TypeInfo; +import org.w3c.dom.UserDataHandler; + +/** + * A wrapper to delegate calls to an existing SOAPElement without + * duplicating the SOAPElement. + * + * @author darran.lofthouse(a)jboss.com + * @since 11th June 2009 + */ +public class SOAPElementWrapper implements SOAPElementInternal +{ + + private final SOAPElementImpl soapElement; + + SOAPElementWrapper(final SOAPElementInternal soapElement) + { + this.soapElement = (SOAPElementImpl)soapElement; + } + + /* + * Element methods. + * + * @see org.w3c.dom.Element + */ + + public String getAttribute(String name) + { + return soapElement.getAttribute(name); + } + + public Attr getAttributeNode(String name) + { + return soapElement.getAttributeNode(name); + } + + public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException + { + return soapElement.getAttributeNodeNS(namespaceURI, localName); + } + + public String getAttributeNS(String namespaceURI, String localName) throws DOMException + { + return soapElement.getAttributeNS(namespaceURI, localName); + } + + public NodeList getElementsByTagName(String name) + { + return soapElement.getElementsByTagName(name); + } + + public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException + { + return soapElement.getElementsByTagNameNS(namespaceURI, localName); + } + + public TypeInfo getSchemaTypeInfo() + { + return soapElement.getSchemaTypeInfo(); + } + + public String getTagName() + { + return soapElement.getTagName(); + } + + public boolean hasAttribute(String name) + { + return soapElement.hasAttribute(name); + } + + public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException + { + return soapElement.hasAttributeNS(namespaceURI, localName); + } + + public void removeAttribute(String name) throws DOMException + { + soapElement.removeAttribute(name); + } + + public Attr removeAttributeNode(Attr oldAttr) throws DOMException + { + return soapElement.removeAttributeNode(oldAttr); + } + + public void removeAttributeNS(String namespaceURI, String localName) throws DOMException + { + soapElement.removeAttributeNS(namespaceURI, localName); + } + + public void setAttribute(String name, String value) throws DOMException + { + soapElement.setAttribute(name, value); + } + + public Attr setAttributeNode(Attr newAttr) throws DOMException + { + return soapElement.setAttributeNode(newAttr); + } + + public Attr setAttributeNodeNS(Attr newAttr) throws DOMException + { + return soapElement.setAttributeNodeNS(newAttr); + } + + public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException + { + soapElement.setAttributeNS(namespaceURI, qualifiedName, value); + } + + public void setIdAttribute(String name, boolean isId) throws DOMException + { + soapElement.setIdAttribute(name, isId); + } + + public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException + { + soapElement.setIdAttributeNode(idAttr, isId); + } + + public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException + { + soapElement.setIdAttributeNS(namespaceURI, localName, isId); + } + + /* + * SAAJVisitable Methods. + * + * @see org.jboss.ws.core.soap.SAAJVisitable + */ + + public void accept(SAAJVisitor visitor) + { + soapElement.accept(visitor); + } + + /* + * SOAPElement Methods. + * + * @see javax.xml.soap.SOAPElement + */ + + public SOAPElement addAttribute(Name name, String value) throws SOAPException + { + return soapElement.addAttribute(name, value); + } + + public SOAPElement addAttribute(QName qname, String value) throws SOAPException + { + return soapElement.addAttribute(qname, value); + } + + public SOAPElement addChildElement(Name name) throws SOAPException + { + return soapElement.addChildElement(name); + } + + public SOAPElement addChildElement(QName qname) throws SOAPException + { + return soapElement.addChildElement(qname); + } + + public SOAPElement addChildElement(SOAPElement child) throws SOAPException + { + return soapElement.addChildElement(child); + } + + public SOAPElement addChildElement(String localName, String prefix, String uri) throws SOAPException + { + return soapElement.addChildElement(localName, prefix, uri); + } + + public SOAPElement addChildElement(String localName, String prefix) throws SOAPException + { + return soapElement.addChildElement(localName, prefix); + } + + public SOAPElement addChildElement(String name) throws SOAPException + { + return soapElement.addChildElement(name); + } + + public SOAPElement addNamespaceDeclaration(String prefix, String uri) + { + return soapElement.addNamespaceDeclaration(prefix, uri); + } + + public SOAPElement addTextNode(String text) throws SOAPException + { + return soapElement.addTextNode(text); + } + + public QName createQName(String localName, String prefix) throws SOAPException + { + return soapElement.createQName(localName, prefix); + } + + public Iterator getAllAttributes() + { + return soapElement.getAllAttributes(); + } + + public Iterator getAllAttributesAsQNames() + { + return soapElement.getAllAttributesAsQNames(); + } + + public String getAttributeValue(Name name) + { + return soapElement.getAttributeValue(name); + } + + public String getAttributeValue(QName qname) + { + return soapElement.getAttributeValue(qname); + } + + public Iterator getChildElements() + { + return soapElement.getChildElements(); + } + + public Iterator getChildElements(Name name) + { + return soapElement.getChildElements(name); + } + + public Iterator getChildElements(QName qname) + { + return soapElement.getChildElements(qname); + } + + public Name getElementName() + { + return soapElement.getElementName(); + } + + public QName getElementQName() + { + return soapElement.getElementQName(); + } + + public String getEncodingStyle() + { + return soapElement.getEncodingStyle(); + } + + public Iterator getNamespacePrefixes() + { + return soapElement.getNamespacePrefixes(); + } + + public String getNamespaceURI(String prefix) + { + return soapElement.getNamespaceURI(prefix); + } + + public Iterator getVisibleNamespacePrefixes() + { + return soapElement.getVisibleNamespacePrefixes(); + } + + public boolean removeAttribute(Name name) + { + return soapElement.removeAttribute(name); + } + + public boolean removeAttribute(QName qname) + { + return soapElement.removeAttribute(qname); + } + + public void removeContents() + { + soapElement.removeContents(); + } + + public boolean removeNamespaceDeclaration(String prefix) + { + return soapElement.removeNamespaceDeclaration(prefix); + } + + public SOAPElement setElementQName(QName qname) throws SOAPException + { + return soapElement.setElementQName(qname); + } + + public void setEncodingStyle(String encodingStyle) throws SOAPException + { + soapElement.setEncodingStyle(encodingStyle); + } + + /* + * Node methods. + * + * @see javax.xml.soap.Node + */ + + public void detachNode() + { + soapElement.detachNode(); + } + + public SOAPElement getParentElement() + { + return soapElement.getParentElement(); + } + + public String getValue() + { + return soapElement.getValue(); + } + + public void recycleNode() + { + soapElement.recycleNode(); + } + + public void setParentElement(SOAPElement parent) throws SOAPException + { + soapElement.setParentElement(parent); + } + + public void setValue(String value) + { + soapElement.setValue(value); + } + + /* + * Node methods. + * + * @see org.w3c.dom.Node + */ + + public Node appendChild(Node newChild) throws DOMException + { + return soapElement.appendChild(newChild); + } + + public Node cloneNode(boolean deep) + { + return soapElement.cloneNode(deep); + } + + public short compareDocumentPosition(Node other) throws DOMException + { + return soapElement.compareDocumentPosition(other); + } + + public NamedNodeMap getAttributes() + { + return soapElement.getAttributes(); + } + + public String getBaseURI() + { + return soapElement.getBaseURI(); + } + + public NodeList getChildNodes() + { + return soapElement.getChildNodes(); + } + + public Object getFeature(String feature, String version) + { + return soapElement.getFeature(feature, version); + } + + public Node getFirstChild() + { + return soapElement.getFirstChild(); + } + + public Node getLastChild() + { + return soapElement.getLastChild(); + } + + public String getLocalName() + { + return soapElement.getLocalName(); + } + + public String getNamespaceURI() + { + return soapElement.getNamespaceURI(); + } + + public Node getNextSibling() + { + return soapElement.getNextSibling(); + } + + public String getNodeName() + { + return soapElement.getNodeName(); + } + + public short getNodeType() + { + return soapElement.getNodeType(); + } + + public String getNodeValue() throws DOMException + { + return soapElement.getNodeValue(); + } + + public Document getOwnerDocument() + { + return soapElement.getOwnerDocument(); + } + + public Node getParentNode() + { + return soapElement.getParentNode(); + } + + public String getPrefix() + { + return soapElement.getPrefix(); + } + + public Node getPreviousSibling() + { + return soapElement.getPreviousSibling(); + } + + public String getTextContent() throws DOMException + { + return soapElement.getTextContent(); + } + + public Object getUserData(String key) + { + return soapElement.getUserData(key); + } + + public boolean hasAttributes() + { + return soapElement.hasAttributes(); + } + + public boolean hasChildNodes() + { + return soapElement.hasChildNodes(); + } + + public Node insertBefore(Node newChild, Node refChild) throws DOMException + { + return soapElement.insertBefore(newChild, refChild); + } + + public boolean isDefaultNamespace(String namespaceURI) + { + return soapElement.isDefaultNamespace(namespaceURI); + } + + public boolean isEqualNode(Node arg) + { + return soapElement.isEqualNode(arg); + } + + public boolean isSameNode(Node other) + { + return soapElement.isSameNode(other); + } + + public boolean isSupported(String feature, String version) + { + return soapElement.isSupported(feature, version); + } + + public String lookupNamespaceURI(String prefix) + { + return soapElement.lookupNamespaceURI(prefix); + } + + public String lookupPrefix(String namespaceURI) + { + return soapElement.lookupPrefix(namespaceURI); + } + + public void normalize() + { + soapElement.normalize(); + } + + public Node removeChild(Node oldChild) throws DOMException + { + return soapElement.removeChild(oldChild); + } + + public Node replaceChild(Node newChild, Node oldChild) throws DOMException + { + return soapElement.replaceChild(newChild, oldChild); + } + + public void setNodeValue(String nodeValue) throws DOMException + { + soapElement.setNodeValue(nodeValue); + } + + public void setPrefix(String prefix) throws DOMException + { + soapElement.setPrefix(prefix); + } + + public void setTextContent(String textContent) throws DOMException + { + soapElement.setTextContent(textContent); + } + + public Object setUserData(String key, Object data, UserDataHandler handler) + { + return soapElement.setUserData(key, data, handler); + } + + /* + * SOAPElementInternal methods. + * + * @see org.jboss.ws.core.soap.SOAPElementInternal + */ + + public Node getDomNode() + { + return soapElement.getDomNode(); + } + + public SOAPElement setElementQNameInternal(QName qname) throws SOAPException + { + return soapElement.setElementQNameInternal(qname); + } + + public void setSoapParent(SOAPElementImpl soapParent) + { + soapElement.setSoapParent(soapParent); + } + +} Property changes on: stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementWrapper.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/extensions/xop/CreateAttachmentVisitor.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/extensions/xop/CreateAttachmentVisitor.java 2009-06-11 11:03:44 UTC (rev 10186) +++ stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/extensions/xop/CreateAttachmentVisitor.java 2009-06-11 11:05:24 UTC (rev 10187) @@ -28,13 +28,14 @@ import org.jboss.ws.core.soap.SAAJVisitor; import org.jboss.ws.core.soap.SOAPContentElement; import org.jboss.ws.core.soap.SOAPElementImpl; +import org.jboss.ws.core.soap.SOAPElementInternal; /** * @author Heiko Braun <heiko.braun(a)jboss.com&gt; * @since Nov 7, 2006 */ public class CreateAttachmentVisitor implements SAAJVisitor { - public void visitXOPElements(SOAPElementImpl root) + public void visitXOPElements(SOAPElementInternal root) { boolean isSCE = (root instanceof SOAPContentElement); Modified: stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/extensions/xop/RestoreXOPElementVisitor.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/extensions/xop/RestoreXOPElementVisitor.java 2009-06-11 11:03:44 UTC (rev 10186) +++ stack/native/branches/dlofthouse/JBWS-2676/modules/core/src/main/java/org/jboss/ws/extensions/xop/RestoreXOPElementVisitor.java 2009-06-11 11:05:24 UTC (rev 10187) @@ -26,6 +26,7 @@ import org.jboss.ws.core.soap.SAAJVisitor; import org.jboss.ws.core.soap.SOAPContentElement; import org.jboss.ws.core.soap.SOAPElementImpl; +import org.jboss.ws.core.soap.SOAPElementInternal; /** * Visit soap object model and restore XOP contents. @@ -43,7 +44,7 @@ */ public class RestoreXOPElementVisitor implements SAAJVisitor { - public void visitXOPElements(SOAPElementImpl root) + public void visitXOPElements(SOAPElementInternal root) { boolean isSCE = (root instanceof SOAPContentElement);