ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1700181 - in /webservices/axiom/trunk: aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/ aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/ aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/...
Date Mon, 31 Aug 2015 00:02:31 GMT
Author: veithen
Date: Mon Aug 31 00:02:30 2015
New Revision: 1700181

URL: http://svn.apache.org/r1700181
Log:
AXIOM-471: Create OMSourcedElement instances via the NodeFactory API.

Added:
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomSourcedElement.java
  (with props)
Modified:
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AxiomNodeFactorySupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactorySupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPHeaderBlock.java
    webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java
    webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFactoryImpl.java
    webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java
    webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
    webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java
    webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java
    webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11Factory.java
    webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11HeaderBlockImpl.java
    webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12Factory.java
    webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12HeaderBlockImpl.java

Added: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomSourcedElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomSourcedElement.java?rev=1700181&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomSourcedElement.java
(added)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomSourcedElement.java
Mon Aug 31 00:02:30 2015
@@ -0,0 +1,31 @@
+/*
+ * 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.axiom.om.impl.common;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axiom.om.OMDataSource;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.OMSourcedElement;
+
+public interface AxiomSourcedElement extends OMSourcedElement, AxiomElement {
+    void init(OMDataSource source);
+    void init(String localName, OMNamespace ns, OMDataSource source);
+    void init(QName qName, OMDataSource source);
+}

Propchange: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomSourcedElement.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AxiomNodeFactorySupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AxiomNodeFactorySupport.aj?rev=1700181&r1=1700180&r2=1700181&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AxiomNodeFactorySupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AxiomNodeFactorySupport.aj
Mon Aug 31 00:02:30 2015
@@ -25,6 +25,7 @@ import org.apache.axiom.om.OMAttribute;
 import org.apache.axiom.om.OMComment;
 import org.apache.axiom.om.OMConstants;
 import org.apache.axiom.om.OMContainer;
+import org.apache.axiom.om.OMDataSource;
 import org.apache.axiom.om.OMDocType;
 import org.apache.axiom.om.OMDocument;
 import org.apache.axiom.om.OMElement;
@@ -32,6 +33,7 @@ import org.apache.axiom.om.OMEntityRefer
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.om.OMProcessingInstruction;
+import org.apache.axiom.om.OMSourcedElement;
 import org.apache.axiom.om.OMText;
 import org.apache.axiom.om.OMXMLParserWrapper;
 import org.apache.axiom.om.impl.OMContainerEx;
@@ -46,6 +48,7 @@ import org.apache.axiom.om.impl.common.A
 import org.apache.axiom.om.impl.common.AxiomElement;
 import org.apache.axiom.om.impl.common.AxiomEntityReference;
 import org.apache.axiom.om.impl.common.AxiomProcessingInstruction;
+import org.apache.axiom.om.impl.common.AxiomSourcedElement;
 import org.apache.axiom.om.impl.common.AxiomText;
 import org.apache.axiom.om.impl.common.OMNamespaceImpl;
 import org.apache.axiom.om.impl.common.Policies;
@@ -293,6 +296,24 @@ public aspect AxiomNodeFactorySupport {
         }
     }
 
+    public final OMSourcedElement AxiomNodeFactory.createOMElement(OMDataSource source) {
+        AxiomSourcedElement element = createNode(AxiomSourcedElement.class);
+        element.init(source);
+        return element;
+    }
+
+    public final OMSourcedElement AxiomNodeFactory.createOMElement(OMDataSource source, String
localName, OMNamespace ns) {
+        AxiomSourcedElement element = createNode(AxiomSourcedElement.class);
+        element.init(localName, ns, source);
+        return element;
+    }
+
+    public final OMSourcedElement AxiomNodeFactory.createOMElement(OMDataSource source, QName
qname) {
+        AxiomSourcedElement element = createNode(AxiomSourcedElement.class);
+        element.init(qname, source);
+        return element;
+    }
+
     public final OMAttribute AxiomNodeFactory.createOMAttribute(String localName, OMNamespace
ns, String value) {
         if (ns != null && ns.getPrefix() == null) {
             String namespaceURI = ns.getNamespaceURI();

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactorySupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactorySupport.aj?rev=1700181&r1=1700180&r2=1700181&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactorySupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactorySupport.aj
Mon Aug 31 00:02:30 2015
@@ -20,6 +20,7 @@ package org.apache.axiom.soap.impl.commo
 
 import javax.xml.namespace.QName;
 
+import org.apache.axiom.om.OMDataSource;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMXMLParserWrapper;
@@ -109,6 +110,18 @@ public aspect AxiomSOAPFactorySupport {
         return createAxiomElement(getSOAPHelper().getHeaderBlockClass(), parent, localName,
null, builder, false);
     }
 
+    public final SOAPHeaderBlock AxiomSOAPFactory.createSOAPHeaderBlock(OMDataSource source)
{
+        AxiomSOAPHeaderBlock element = createNode(getSOAPHelper().getHeaderBlockClass());
+        element.init(source);
+        return element;
+    }
+
+    public final SOAPHeaderBlock AxiomSOAPFactory.createSOAPHeaderBlock(String localName,
OMNamespace ns, OMDataSource ds) {
+        AxiomSOAPHeaderBlock element = createNode(getSOAPHelper().getHeaderBlockClass());
+        element.init(localName, ns, ds);
+        return element;
+    }
+
     public final SOAPBody AxiomSOAPFactory.createSOAPBody(SOAPEnvelope parent, OMXMLParserWrapper
builder) {
         SOAPHelper helper = getSOAPHelper();
         return createSOAPElement(helper.getBodyClass(), parent, helper.getBodyQName(), builder);

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPHeaderBlock.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPHeaderBlock.java?rev=1700181&r1=1700180&r2=1700181&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPHeaderBlock.java
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPHeaderBlock.java
Mon Aug 31 00:02:30 2015
@@ -18,8 +18,9 @@
  */
 package org.apache.axiom.soap.impl.common;
 
+import org.apache.axiom.om.impl.common.AxiomSourcedElement;
 import org.apache.axiom.soap.SOAPHeaderBlock;
 
-public interface AxiomSOAPHeaderBlock extends AxiomSOAPElement, SOAPHeaderBlock {
+public interface AxiomSOAPHeaderBlock extends AxiomSOAPElement, AxiomSourcedElement, SOAPHeaderBlock
{
     SOAPHelper getSOAPHelper();
 }

Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java?rev=1700181&r1=1700180&r2=1700181&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java
(original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java
Mon Aug 31 00:02:30 2015
@@ -19,8 +19,6 @@
 
 package org.apache.axiom.om.impl.dom.factory;
 
-import javax.xml.namespace.QName;
-
 import org.apache.axiom.core.CoreCDATASection;
 import org.apache.axiom.core.CoreCharacterDataNode;
 import org.apache.axiom.core.CoreComment;
@@ -50,11 +48,8 @@ import org.apache.axiom.dom.DOMNodeFacto
 import org.apache.axiom.dom.DOMProcessingInstruction;
 import org.apache.axiom.dom.DOMText;
 import org.apache.axiom.om.OMContainer;
-import org.apache.axiom.om.OMDataSource;
 import org.apache.axiom.om.OMHierarchyException;
 import org.apache.axiom.om.OMMetaFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMSourcedElement;
 import org.apache.axiom.om.impl.common.AxiomAttribute;
 import org.apache.axiom.om.impl.common.AxiomCDATASection;
 import org.apache.axiom.om.impl.common.AxiomCharacterDataNode;
@@ -143,24 +138,6 @@ public class OMDOMFactory implements Axi
         return metaFactory;
     }
 
-    public OMSourcedElement createOMElement(OMDataSource source) {
-        throw new UnsupportedOperationException("Not supported for DOM");
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.axiom.om.OMFactory#createOMElement(org.apache.axiom.om.OMDataSource,
java.lang.String, org.apache.axiom.om.OMNamespace)
-     */
-    public OMSourcedElement createOMElement(OMDataSource source, String localName, OMNamespace
ns) {
-        throw new UnsupportedOperationException("Not supported for DOM");
-    }
-
-    /**
-     * Unsupported.
-     */
-    public OMSourcedElement createOMElement(OMDataSource source, QName qname) {
-        throw new UnsupportedOperationException("Not supported for DOM");
-    }
-
     public final void validateOMTextParent(OMContainer parent) {
         if (parent instanceof DocumentImpl) {
             throw new OMHierarchyException(

Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFactoryImpl.java?rev=1700181&r1=1700180&r2=1700181&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFactoryImpl.java
(original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFactoryImpl.java
Mon Aug 31 00:02:30 2015
@@ -19,12 +19,9 @@
 
 package org.apache.axiom.soap.impl.dom;
 
-import org.apache.axiom.om.OMDataSource;
-import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.impl.dom.factory.OMDOMFactory;
 import org.apache.axiom.om.impl.dom.factory.OMDOMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPHeaderBlock;
 import org.apache.axiom.soap.SOAPMessage;
 import org.apache.axiom.soap.SOAPProcessingException;
 import org.apache.axiom.soap.impl.common.AxiomSOAPFactory;
@@ -51,13 +48,4 @@ public abstract class SOAPFactoryImpl ex
         createSOAPBody(env);
         return env;
     }
-
-    public SOAPHeaderBlock createSOAPHeaderBlock(OMDataSource source) {
-        throw new UnsupportedOperationException("TODO");
-    }
-
-    public SOAPHeaderBlock createSOAPHeaderBlock(String localName, OMNamespace ns, OMDataSource
ds) throws SOAPProcessingException {
-        throw new UnsupportedOperationException("TODO");
-    }
-
 }

Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java?rev=1700181&r1=1700180&r2=1700181&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java
(original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java
Mon Aug 31 00:02:30 2015
@@ -19,8 +19,11 @@
 
 package org.apache.axiom.soap.impl.dom;
 
+import javax.xml.namespace.QName;
+
 import org.apache.axiom.om.OMDataSource;
 import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.impl.dom.NSAwareElement;
 import org.apache.axiom.soap.impl.common.AxiomSOAPHeaderBlock;
 
@@ -29,6 +32,18 @@ public abstract class SOAPHeaderBlockImp
         super(factory);
     }
 
+    public final void init(OMDataSource source) {
+        throw new UnsupportedOperationException();
+    }
+
+    public final void init(String localName, OMNamespace ns, OMDataSource source) {
+        throw new UnsupportedOperationException();
+    }
+
+    public final void init(QName qName, OMDataSource source) {
+        throw new UnsupportedOperationException();
+    }
+
     public OMDataSource getDataSource() {
         throw new UnsupportedOperationException();
     }

Modified: webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java?rev=1700181&r1=1700180&r2=1700181&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
(original)
+++ webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
Mon Aug 31 00:02:30 2015
@@ -32,6 +32,7 @@ import org.apache.axiom.om.OMXMLStreamRe
 import org.apache.axiom.om.QNameAwareOMDataSource;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.om.impl.common.AxiomContainer;
+import org.apache.axiom.om.impl.common.AxiomSourcedElement;
 import org.apache.axiom.om.impl.common.OMDataSourceUtil;
 import org.apache.axiom.om.impl.common.OMNamespaceImpl;
 import org.apache.axiom.om.impl.common.serializer.push.OutputException;
@@ -58,7 +59,7 @@ import java.util.Iterator;
  * #forceExpand()} method) before the base class method is called. This will typically involve
a
  * heavy overhead penalty, so should be avoided if possible.</p>
  */
-public class OMSourcedElementImpl extends OMElementImpl implements OMSourcedElement {
+public class OMSourcedElementImpl extends OMElementImpl implements AxiomSourcedElement {
     
     /** Data source for element data. */
     private OMDataSource dataSource;
@@ -87,8 +88,7 @@ public class OMSourcedElementImpl extend
                 : new OMNamespaceImpl(qName.getNamespaceURI(), qName.getPrefix());
     }
     
-    public OMSourcedElementImpl(OMFactory factory, OMDataSource source) {
-        super(factory);
+    public void init(OMDataSource source) {
         dataSource = source;
         isExpanded = false;
     }
@@ -101,9 +101,7 @@ public class OMSourcedElementImpl extend
      * @param factory
      * @param source
      */
-    public OMSourcedElementImpl(String localName, OMNamespace ns, OMFactory factory,
-                                OMDataSource source) {
-        super(factory);
+    public void init(String localName, OMNamespace ns, OMDataSource source) {
         if (source == null) {
             throw new IllegalArgumentException("OMDataSource can't be null");
         }
@@ -134,8 +132,7 @@ public class OMSourcedElementImpl extend
      * @param factory
      * @param source
      */
-    public OMSourcedElementImpl(QName qName, OMFactory factory, OMDataSource source) {
-        super(factory);
+    public void init(QName qName, OMDataSource source) {
         if (source == null) {
             throw new IllegalArgumentException("OMDataSource can't be null");
         }

Modified: webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java?rev=1700181&r1=1700180&r2=1700181&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java
(original)
+++ webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java
Mon Aug 31 00:02:30 2015
@@ -19,8 +19,6 @@
 
 package org.apache.axiom.om.impl.llom.factory;
 
-import javax.xml.namespace.QName;
-
 import org.apache.axiom.core.CoreCDATASection;
 import org.apache.axiom.core.CoreCharacterDataNode;
 import org.apache.axiom.core.CoreComment;
@@ -33,10 +31,7 @@ import org.apache.axiom.core.CoreNamespa
 import org.apache.axiom.core.CoreNode;
 import org.apache.axiom.core.CoreProcessingInstruction;
 import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMDataSource;
 import org.apache.axiom.om.OMMetaFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMSourcedElement;
 import org.apache.axiom.om.impl.common.AxiomAttribute;
 import org.apache.axiom.om.impl.common.AxiomCDATASection;
 import org.apache.axiom.om.impl.common.AxiomCharacterDataNode;
@@ -47,6 +42,7 @@ import org.apache.axiom.om.impl.common.A
 import org.apache.axiom.om.impl.common.AxiomEntityReference;
 import org.apache.axiom.om.impl.common.AxiomNamespaceDeclaration;
 import org.apache.axiom.om.impl.common.AxiomProcessingInstruction;
+import org.apache.axiom.om.impl.common.AxiomSourcedElement;
 import org.apache.axiom.om.impl.common.factory.AxiomNodeFactory;
 import org.apache.axiom.om.impl.llom.CDATASectionImpl;
 import org.apache.axiom.om.impl.llom.CharacterDataImpl;
@@ -129,31 +125,6 @@ public class OMLinkedListImplFactory imp
         return metaFactory;
     }
 
-    public OMSourcedElement createOMElement(OMDataSource source) {
-        return new OMSourcedElementImpl(this, source);
-    }
-
-    /**
-     * Construct element with arbitrary data source.
-     *
-     * @param source
-     * @param localName
-     * @param ns
-     */
-    public OMSourcedElement createOMElement(OMDataSource source, String localName, OMNamespace
ns) {
-        return new OMSourcedElementImpl(localName, ns, this, source);
-    }
-
-    /**
-     * Construct element with arbitrary data source.
-     * 
-     * @param source the data source
-     * @param qname the name of the element produced by the data source
-     */
-    public OMSourcedElement createOMElement(OMDataSource source, QName qname) {
-        return new OMSourcedElementImpl(qname, this, source);
-    }
-
     public <T extends CoreNode> T createNode(Class<T> type) {
         CoreNode node;
         if (type == CoreCDATASection.class || type == AxiomCDATASection.class) {
@@ -176,6 +147,8 @@ public class OMLinkedListImplFactory imp
             node = new OMElementImpl(this);
         } else if (type == CoreProcessingInstruction.class || type == AxiomProcessingInstruction.class)
{
             node = new OMProcessingInstructionImpl(this);
+        } else if (type == AxiomSourcedElement.class) {
+            node = new OMSourcedElementImpl(this);
         } else if (type == AxiomSOAPMessage.class) {
             node = new SOAPMessageImpl(this);
         } else if (type == AxiomSOAPEnvelope.class) {

Modified: webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java?rev=1700181&r1=1700180&r2=1700181&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java
(original)
+++ webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java
Mon Aug 31 00:02:30 2015
@@ -24,7 +24,6 @@ import org.apache.axiom.om.OMCloneOption
 import org.apache.axiom.om.OMDataSource;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMSourcedElement;
 import org.apache.axiom.om.impl.llom.OMSourcedElementImpl;
 import org.apache.axiom.soap.SOAPFactory;
@@ -38,15 +37,6 @@ public abstract class SOAPHeaderBlockImp
         super(factory);
     }
 
-    public SOAPHeaderBlockImpl(SOAPFactory factory, OMDataSource source) {
-        super(factory, source);
-    }
-
-    public SOAPHeaderBlockImpl(String localName, OMNamespace ns, SOAPFactory factory, 
-                               OMDataSource ds) {
-        super(localName, ns, factory, ds);
-    }
-
     public void internalSetParent(CoreParentNode element) {
         super.internalSetParent(element);
 

Modified: webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11Factory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11Factory.java?rev=1700181&r1=1700180&r2=1700181&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11Factory.java
(original)
+++ webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11Factory.java
Mon Aug 31 00:02:30 2015
@@ -20,14 +20,12 @@
 package org.apache.axiom.soap.impl.llom.soap11;
 
 import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMDataSource;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.impl.common.OMNamespaceImpl;
 import org.apache.axiom.om.impl.llom.factory.OMLinkedListMetaFactory;
 import org.apache.axiom.soap.SOAP11Constants;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFault;
-import org.apache.axiom.soap.SOAPHeaderBlock;
 import org.apache.axiom.soap.SOAPProcessingException;
 import org.apache.axiom.soap.SOAPVersion;
 import org.apache.axiom.soap.SOAP11Version;
@@ -66,17 +64,6 @@ public class SOAP11Factory extends SOAPF
         return SOAP11Version.getSingleton();
     }
 
-    public SOAPHeaderBlock createSOAPHeaderBlock(OMDataSource source) {
-        return new SOAP11HeaderBlockImpl(this, source);
-    }
-
-    public SOAPHeaderBlock createSOAPHeaderBlock(String localName,
-                                                 OMNamespace ns,
-                                                 OMDataSource ds) 
-        throws SOAPProcessingException {
-        return new SOAP11HeaderBlockImpl(localName, ns, this, ds);
-    }
-
     public SOAPEnvelope getDefaultFaultEnvelope() throws SOAPProcessingException {
         SOAPEnvelope defaultEnvelope = getDefaultEnvelope();
         SOAPFault fault = createSOAPFault(defaultEnvelope.getBody());

Modified: webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11HeaderBlockImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11HeaderBlockImpl.java?rev=1700181&r1=1700180&r2=1700181&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11HeaderBlockImpl.java
(original)
+++ webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11HeaderBlockImpl.java
Mon Aug 31 00:02:30 2015
@@ -19,11 +19,8 @@
 
 package org.apache.axiom.soap.impl.llom.soap11;
 
-import org.apache.axiom.om.OMDataSource;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPProcessingException;
 import org.apache.axiom.soap.impl.common.AxiomSOAP11HeaderBlock;
 import org.apache.axiom.soap.impl.llom.SOAPHeaderBlockImpl;
@@ -33,16 +30,6 @@ public class SOAP11HeaderBlockImpl exten
         super(factory);
     }
 
-    public SOAP11HeaderBlockImpl(SOAPFactory factory, OMDataSource source) {
-        super(factory, source);
-    }
-
-    public SOAP11HeaderBlockImpl(String localName, OMNamespace ns,
-                                 SOAPFactory factory, 
-                                 OMDataSource ds) {
-        super(localName, ns, factory, ds);
-    }
-
     public void checkParent(OMElement parent) throws SOAPProcessingException {
         if (!(parent instanceof SOAP11HeaderImpl)) {
             throw new SOAPProcessingException(

Modified: webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12Factory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12Factory.java?rev=1700181&r1=1700180&r2=1700181&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12Factory.java
(original)
+++ webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12Factory.java
Mon Aug 31 00:02:30 2015
@@ -20,7 +20,6 @@
 package org.apache.axiom.soap.impl.llom.soap12;
 
 import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMDataSource;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.impl.common.OMNamespaceImpl;
 import org.apache.axiom.om.impl.llom.factory.OMLinkedListMetaFactory;
@@ -30,7 +29,6 @@ import org.apache.axiom.soap.SOAPEnvelop
 import org.apache.axiom.soap.SOAPFault;
 import org.apache.axiom.soap.SOAPFaultCode;
 import org.apache.axiom.soap.SOAPFaultReason;
-import org.apache.axiom.soap.SOAPHeaderBlock;
 import org.apache.axiom.soap.SOAPProcessingException;
 import org.apache.axiom.soap.SOAPVersion;
 import org.apache.axiom.soap.impl.common.AxiomSOAP12Factory;
@@ -68,17 +66,6 @@ public class SOAP12Factory extends SOAPF
                                    SOAP12Constants.SOAP_DEFAULT_NAMESPACE_PREFIX);
     }
 
-    public SOAPHeaderBlock createSOAPHeaderBlock(OMDataSource source) {
-        return new SOAP12HeaderBlockImpl(this, source);
-    }
-
-    public SOAPHeaderBlock createSOAPHeaderBlock(String localName,
-                                                 OMNamespace ns,
-                                                 OMDataSource ds) 
-        throws SOAPProcessingException {
-        return new SOAP12HeaderBlockImpl(localName, ns, this, ds);
-    }
-
     public SOAPEnvelope getDefaultFaultEnvelope() throws SOAPProcessingException {
         SOAPEnvelope defaultEnvelope = getDefaultEnvelope();
         SOAPFault fault = createSOAPFault(defaultEnvelope.getBody());

Modified: webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12HeaderBlockImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12HeaderBlockImpl.java?rev=1700181&r1=1700180&r2=1700181&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12HeaderBlockImpl.java
(original)
+++ webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12HeaderBlockImpl.java
Mon Aug 31 00:02:30 2015
@@ -19,11 +19,8 @@
 
 package org.apache.axiom.soap.impl.llom.soap12;
 
-import org.apache.axiom.om.OMDataSource;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPProcessingException;
 import org.apache.axiom.soap.impl.common.AxiomSOAP12HeaderBlock;
 import org.apache.axiom.soap.impl.llom.SOAPHeaderBlockImpl;
@@ -33,15 +30,6 @@ public class SOAP12HeaderBlockImpl exten
         super(factory);
     }
 
-    public SOAP12HeaderBlockImpl(SOAPFactory factory, OMDataSource source) {
-        super(factory, source);
-    }
-
-    public SOAP12HeaderBlockImpl(String localName, OMNamespace ns,
-                                 SOAPFactory factory, OMDataSource ds) {
-        super(localName, ns, factory, ds);
-    }
-    
     public void checkParent(OMElement parent) throws SOAPProcessingException {
         if (!(parent instanceof SOAP12HeaderImpl)) {
             throw new SOAPProcessingException(



Mime
View raw message