ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1700242 - in /webservices/axiom/trunk/aspects: core-aspects/src/main/java/org/apache/axiom/core/ om-aspects/src/main/java/org/apache/axiom/om/impl/common/ om-aspects/src/main/java/org/apache/axiom/soap/impl/common/
Date Mon, 31 Aug 2015 12:25:41 GMT
Author: veithen
Date: Mon Aug 31 12:25:40 2015
New Revision: 1700242

URL: http://svn.apache.org/r1700242
Log:
Generalize getElementType to all nodes.

Added:
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomSourcedElementSupport.aj
  (with props)
Modified:
    webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNode.java
    webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNodeSupport.aj
    webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NodeType.java
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11BodySupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultCodeSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultDetailSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultReasonSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultRoleSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11HeaderBlockSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11HeaderSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12BodySupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultCodeSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultDetailSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultNodeSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultReasonSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultRoleSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultSubCodeSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultTextSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultValueSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12HeaderBlockSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12HeaderSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPEnvelopeSupport.aj

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNode.java?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNode.java
(original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNode.java
Mon Aug 31 12:25:40 2015
@@ -29,6 +29,8 @@ public interface CoreNode {
      * @return the node type
      */
     NodeType coreGetNodeType();
+    
+    Class<? extends CoreNode> coreGetNodeClass();
 
     /**
      * Clone this node according to the provided policy.

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNodeSupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNodeSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNodeSupport.aj
Mon Aug 31 12:25:40 2015
@@ -21,6 +21,11 @@ package org.apache.axiom.core;
 public aspect CoreNodeSupport {
     int CoreNode.flags;
 
+    // Default implementation; may be overridden
+    public Class<? extends CoreNode> CoreNode.coreGetNodeClass() {
+        return coreGetNodeType().getInterface();
+    }
+    
     public abstract CoreNode CoreNode.getRootOrOwnerDocument();
 
     /**

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NodeType.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NodeType.java?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NodeType.java
(original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NodeType.java
Mon Aug 31 12:25:40 2015
@@ -22,65 +22,75 @@ public enum NodeType {
     /**
      * The node is a {@link CoreDocument}.
      */
-    DOCUMENT,
+    DOCUMENT(CoreDocument.class),
     
     /**
      * The node is a {@link CoreDocumentTypeDeclaration}.
      */
-    DOCUMENT_TYPE_DECLARATION,
+    DOCUMENT_TYPE_DECLARATION(CoreDocumentTypeDeclaration.class),
     
     /**
      * The node is a {@link CoreNSUnawareElement}.
      */
-    NS_UNAWARE_ELEMENT,
+    NS_UNAWARE_ELEMENT(CoreNSUnawareElement.class),
     
     /**
      * The node is a {@link CoreNSAwareElement}.
      */
-    NS_AWARE_ELEMENT,
+    NS_AWARE_ELEMENT(CoreNSAwareElement.class),
     
     /**
      * The node is a {@link CoreNSUnawareAttribute}.
      */
-    NS_UNAWARE_ATTRIBUTE,
+    NS_UNAWARE_ATTRIBUTE(CoreNSUnawareAttribute.class),
     
     /**
      * The node is a {@link CoreNSAwareAttribute}.
      */
-    NS_AWARE_ATTRIBUTE,
+    NS_AWARE_ATTRIBUTE(CoreNSAwareAttribute.class),
     
     /**
      * The node is a {@link CoreNamespaceDeclaration}.
      */
-    NAMESPACE_DECLARATION,
+    NAMESPACE_DECLARATION(CoreNamespaceDeclaration.class),
     
     /**
      * The node is a {@link CoreProcessingInstruction}.
      */
-    PROCESSING_INSTRUCTION,
+    PROCESSING_INSTRUCTION(CoreProcessingInstruction.class),
     
     /**
      * The node is a {@link CoreDocumentFragment}.
      */
-    DOCUMENT_FRAGMENT,
+    DOCUMENT_FRAGMENT(CoreDocumentFragment.class),
     
     /**
      * The node is a {@link CoreCharacterDataNode}.
      */
-    CHARACTER_DATA,
+    CHARACTER_DATA(CoreCharacterDataNode.class),
     
     /**
      * The node is a {@link CoreComment}.
      */
-    COMMENT,
+    COMMENT(CoreComment.class),
     
     /**
      * The node is a {@link CoreCDATASection}.
      */
-    CDATA_SECTION,
+    CDATA_SECTION(CoreCDATASection.class),
     
     /**
      * The node is a {@link CoreEntityReference}.
      */
-    ENTITY_REFERENCE
+    ENTITY_REFERENCE(CoreEntityReference.class);
+
+    private final Class<? extends CoreNode> iface;
+    
+    private NodeType(Class<? extends CoreNode> iface) {
+        this.iface = iface;
+    }
+    
+    public Class<? extends CoreNode> getInterface() {
+        return iface;
+    }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj
Mon Aug 31 12:25:40 2015
@@ -74,10 +74,6 @@ public aspect AxiomElementSupport {
         forceExpand();
     }
     
-    public Class<? extends AxiomElement> AxiomElement.getElementType() {
-        return AxiomElement.class;
-    }
-    
     public final int AxiomElement.getType() {
         return OMNode.ELEMENT_NODE;
     }
@@ -562,7 +558,7 @@ public aspect AxiomElementSupport {
     }
 
     public final AxiomElement AxiomElement.shallowCloneWithoutAttributes(OMCloneOptions options,
CoreParentNode targetParent, boolean namespaceRepairing) {
-        AxiomElement clone = coreGetNodeFactory().createNode(options.isPreserveModel() ?
getElementType() : AxiomElement.class);
+        AxiomElement clone = (AxiomElement)coreGetNodeFactory().createNode(options.isPreserveModel()
? coreGetNodeClass() : AxiomElement.class);
         if (targetParent != null) {
             targetParent.coreAppendChild(clone, false);
         }

Added: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomSourcedElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomSourcedElementSupport.aj?rev=1700242&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomSourcedElementSupport.aj
(added)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomSourcedElementSupport.aj
Mon Aug 31 12:25:40 2015
@@ -0,0 +1,27 @@
+/*
+ * 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 org.apache.axiom.core.CoreNode;
+
+public aspect AxiomSourcedElementSupport {
+    public Class<? extends CoreNode> AxiomSourcedElement.coreGetNodeClass() {
+        return AxiomSourcedElement.class;
+    }
+}

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

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11BodySupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11BodySupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11BodySupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11BodySupport.aj
Mon Aug 31 12:25:40 2015
@@ -18,10 +18,10 @@
  */
 package org.apache.axiom.soap.impl.common;
 
-import org.apache.axiom.om.impl.common.AxiomElement;
+import org.apache.axiom.core.CoreNode;
 
 public aspect AxiomSOAP11BodySupport {
-    public final Class<? extends AxiomElement> AxiomSOAP11Body.getElementType() {
+    public final Class<? extends CoreNode> AxiomSOAP11Body.coreGetNodeClass() {
         return AxiomSOAP11Body.class;
     }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultCodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultCodeSupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultCodeSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultCodeSupport.aj
Mon Aug 31 12:25:40 2015
@@ -18,10 +18,10 @@
  */
 package org.apache.axiom.soap.impl.common;
 
-import org.apache.axiom.om.impl.common.AxiomElement;
+import org.apache.axiom.core.CoreNode;
 
 public aspect AxiomSOAP11FaultCodeSupport {
-    public final Class<? extends AxiomElement> AxiomSOAP11FaultCode.getElementType()
{
+    public final Class<? extends CoreNode> AxiomSOAP11FaultCode.coreGetNodeClass()
{
         return AxiomSOAP11FaultCode.class;
     }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultDetailSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultDetailSupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultDetailSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultDetailSupport.aj
Mon Aug 31 12:25:40 2015
@@ -18,10 +18,10 @@
  */
 package org.apache.axiom.soap.impl.common;
 
-import org.apache.axiom.om.impl.common.AxiomElement;
+import org.apache.axiom.core.CoreNode;
 
 public aspect AxiomSOAP11FaultDetailSupport {
-    public final Class<? extends AxiomElement> AxiomSOAP11FaultDetail.getElementType()
{
+    public final Class<? extends CoreNode> AxiomSOAP11FaultDetail.coreGetNodeClass()
{
         return AxiomSOAP11FaultDetail.class;
     }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultReasonSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultReasonSupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultReasonSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultReasonSupport.aj
Mon Aug 31 12:25:40 2015
@@ -18,10 +18,10 @@
  */
 package org.apache.axiom.soap.impl.common;
 
-import org.apache.axiom.om.impl.common.AxiomElement;
+import org.apache.axiom.core.CoreNode;
 
 public aspect AxiomSOAP11FaultReasonSupport {
-    public final Class<? extends AxiomElement> AxiomSOAP11FaultReason.getElementType()
{
+    public final Class<? extends CoreNode> AxiomSOAP11FaultReason.coreGetNodeClass()
{
         return AxiomSOAP11FaultReason.class;
     }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultRoleSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultRoleSupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultRoleSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultRoleSupport.aj
Mon Aug 31 12:25:40 2015
@@ -18,10 +18,10 @@
  */
 package org.apache.axiom.soap.impl.common;
 
-import org.apache.axiom.om.impl.common.AxiomElement;
+import org.apache.axiom.core.CoreNode;
 
 public aspect AxiomSOAP11FaultRoleSupport {
-    public final Class<? extends AxiomElement> AxiomSOAP11FaultRole.getElementType()
{
+    public final Class<? extends CoreNode> AxiomSOAP11FaultRole.coreGetNodeClass()
{
         return AxiomSOAP11FaultRole.class;
     }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultSupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FaultSupport.aj
Mon Aug 31 12:25:40 2015
@@ -18,7 +18,7 @@
  */
 package org.apache.axiom.soap.impl.common;
 
-import org.apache.axiom.om.impl.common.AxiomElement;
+import org.apache.axiom.core.CoreNode;
 import org.apache.axiom.soap.SOAP11Constants;
 import org.apache.axiom.soap.SOAPFaultCode;
 import org.apache.axiom.soap.SOAPFaultDetail;
@@ -31,7 +31,7 @@ public aspect AxiomSOAP11FaultSupport {
     private static final Class<?>[] sequence = { SOAPFaultCode.class, SOAPFaultReason.class,
             SOAPFaultRole.class, SOAPFaultDetail.class };
 
-    public final Class<? extends AxiomElement> AxiomSOAP11Fault.getElementType() {
+    public final Class<? extends CoreNode> AxiomSOAP11Fault.coreGetNodeClass() {
         return AxiomSOAP11Fault.class;
     }
     

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11HeaderBlockSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11HeaderBlockSupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11HeaderBlockSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11HeaderBlockSupport.aj
Mon Aug 31 12:25:40 2015
@@ -18,14 +18,14 @@
  */
 package org.apache.axiom.soap.impl.common;
 
-import org.apache.axiom.om.impl.common.AxiomElement;
+import org.apache.axiom.core.CoreNode;
 
 public aspect AxiomSOAP11HeaderBlockSupport {
     public final SOAPHelper AxiomSOAP11HeaderBlock.getSOAPHelper() {
         return SOAPHelper.SOAP11;
     }
 
-    public final Class<? extends AxiomElement> AxiomSOAP11HeaderBlock.getElementType()
{
+    public final Class<? extends CoreNode> AxiomSOAP11HeaderBlock.coreGetNodeClass()
{
         return AxiomSOAP11HeaderBlock.class;
     }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11HeaderSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11HeaderSupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11HeaderSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11HeaderSupport.aj
Mon Aug 31 12:25:40 2015
@@ -18,10 +18,10 @@
  */
 package org.apache.axiom.soap.impl.common;
 
-import org.apache.axiom.om.impl.common.AxiomElement;
+import org.apache.axiom.core.CoreNode;
 
 public aspect AxiomSOAP11HeaderSupport {
-    public final Class<? extends AxiomElement> AxiomSOAP11Header.getElementType() {
+    public final Class<? extends CoreNode> AxiomSOAP11Header.coreGetNodeClass() {
         return AxiomSOAP11Header.class;
     }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12BodySupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12BodySupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12BodySupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12BodySupport.aj
Mon Aug 31 12:25:40 2015
@@ -18,10 +18,10 @@
  */
 package org.apache.axiom.soap.impl.common;
 
-import org.apache.axiom.om.impl.common.AxiomElement;
+import org.apache.axiom.core.CoreNode;
 
 public aspect AxiomSOAP12BodySupport {
-    public final Class<? extends AxiomElement> AxiomSOAP12Body.getElementType() {
+    public final Class<? extends CoreNode> AxiomSOAP12Body.coreGetNodeClass() {
         return AxiomSOAP12Body.class;
     }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultCodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultCodeSupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultCodeSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultCodeSupport.aj
Mon Aug 31 12:25:40 2015
@@ -18,10 +18,10 @@
  */
 package org.apache.axiom.soap.impl.common;
 
-import org.apache.axiom.om.impl.common.AxiomElement;
+import org.apache.axiom.core.CoreNode;
 
 public aspect AxiomSOAP12FaultCodeSupport {
-    public final Class<? extends AxiomElement> AxiomSOAP12FaultCode.getElementType()
{
+    public final Class<? extends CoreNode> AxiomSOAP12FaultCode.coreGetNodeClass()
{
         return AxiomSOAP12FaultCode.class;
     }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultDetailSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultDetailSupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultDetailSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultDetailSupport.aj
Mon Aug 31 12:25:40 2015
@@ -18,10 +18,10 @@
  */
 package org.apache.axiom.soap.impl.common;
 
-import org.apache.axiom.om.impl.common.AxiomElement;
+import org.apache.axiom.core.CoreNode;
 
 public aspect AxiomSOAP12FaultDetailSupport {
-    public final Class<? extends AxiomElement> AxiomSOAP12FaultDetail.getElementType()
{
+    public final Class<? extends CoreNode> AxiomSOAP12FaultDetail.coreGetNodeClass()
{
         return AxiomSOAP12FaultDetail.class;
     }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultNodeSupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultNodeSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultNodeSupport.aj
Mon Aug 31 12:25:40 2015
@@ -18,10 +18,10 @@
  */
 package org.apache.axiom.soap.impl.common;
 
-import org.apache.axiom.om.impl.common.AxiomElement;
+import org.apache.axiom.core.CoreNode;
 
 public aspect AxiomSOAP12FaultNodeSupport {
-    public final Class<? extends AxiomElement> AxiomSOAP12FaultNode.getElementType()
{
+    public final Class<? extends CoreNode> AxiomSOAP12FaultNode.coreGetNodeClass()
{
         return AxiomSOAP12FaultNode.class;
     }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultReasonSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultReasonSupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultReasonSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultReasonSupport.aj
Mon Aug 31 12:25:40 2015
@@ -18,10 +18,10 @@
  */
 package org.apache.axiom.soap.impl.common;
 
-import org.apache.axiom.om.impl.common.AxiomElement;
+import org.apache.axiom.core.CoreNode;
 
 public aspect AxiomSOAP12FaultReasonSupport {
-    public final Class<? extends AxiomElement> AxiomSOAP12FaultReason.getElementType()
{
+    public final Class<? extends CoreNode> AxiomSOAP12FaultReason.coreGetNodeClass()
{
         return AxiomSOAP12FaultReason.class;
     }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultRoleSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultRoleSupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultRoleSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultRoleSupport.aj
Mon Aug 31 12:25:40 2015
@@ -18,10 +18,10 @@
  */
 package org.apache.axiom.soap.impl.common;
 
-import org.apache.axiom.om.impl.common.AxiomElement;
+import org.apache.axiom.core.CoreNode;
 
 public aspect AxiomSOAP12FaultRoleSupport {
-    public final Class<? extends AxiomElement> AxiomSOAP12FaultRole.getElementType()
{
+    public final Class<? extends CoreNode> AxiomSOAP12FaultRole.coreGetNodeClass()
{
         return AxiomSOAP12FaultRole.class;
     }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultSubCodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultSubCodeSupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultSubCodeSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultSubCodeSupport.aj
Mon Aug 31 12:25:40 2015
@@ -18,10 +18,10 @@
  */
 package org.apache.axiom.soap.impl.common;
 
-import org.apache.axiom.om.impl.common.AxiomElement;
+import org.apache.axiom.core.CoreNode;
 
 public aspect AxiomSOAP12FaultSubCodeSupport {
-    public final Class<? extends AxiomElement> AxiomSOAP12FaultSubCode.getElementType()
{
+    public final Class<? extends CoreNode> AxiomSOAP12FaultSubCode.coreGetNodeClass()
{
         return AxiomSOAP12FaultSubCode.class;
     }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultSupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultSupport.aj
Mon Aug 31 12:25:40 2015
@@ -18,7 +18,7 @@
  */
 package org.apache.axiom.soap.impl.common;
 
-import org.apache.axiom.om.impl.common.AxiomElement;
+import org.apache.axiom.core.CoreNode;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axiom.soap.SOAPFaultCode;
 import org.apache.axiom.soap.SOAPFaultDetail;
@@ -31,7 +31,7 @@ public aspect AxiomSOAP12FaultSupport {
     private static final Class<?>[] sequence = { SOAPFaultCode.class, SOAPFaultReason.class,
             SOAPFaultNode.class, SOAPFaultRole.class, SOAPFaultDetail.class };
 
-    public final Class<? extends AxiomElement> AxiomSOAP12Fault.getElementType() {
+    public final Class<? extends CoreNode> AxiomSOAP12Fault.coreGetNodeClass() {
         return AxiomSOAP12Fault.class;
     }
     

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultTextSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultTextSupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultTextSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultTextSupport.aj
Mon Aug 31 12:25:40 2015
@@ -20,8 +20,8 @@ package org.apache.axiom.soap.impl.commo
 
 import javax.xml.namespace.QName;
 
+import org.apache.axiom.core.CoreNode;
 import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.impl.common.AxiomElement;
 import org.apache.axiom.om.impl.common.OMNamespaceImpl;
 import org.apache.axiom.soap.SOAP12Constants;
 
@@ -34,7 +34,7 @@ public aspect AxiomSOAP12FaultTextSuppor
             SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_LOCAL_NAME,
             SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_PREFIX);
     
-    public final Class<? extends AxiomElement> AxiomSOAP12FaultText.getElementType()
{
+    public final Class<? extends CoreNode> AxiomSOAP12FaultText.coreGetNodeClass()
{
         return AxiomSOAP12FaultText.class;
     }
 

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultValueSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultValueSupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultValueSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultValueSupport.aj
Mon Aug 31 12:25:40 2015
@@ -18,10 +18,10 @@
  */
 package org.apache.axiom.soap.impl.common;
 
-import org.apache.axiom.om.impl.common.AxiomElement;
+import org.apache.axiom.core.CoreNode;
 
 public aspect AxiomSOAP12FaultValueSupport {
-    public final Class<? extends AxiomElement> AxiomSOAP12FaultValue.getElementType()
{
+    public final Class<? extends CoreNode> AxiomSOAP12FaultValue.coreGetNodeClass()
{
         return AxiomSOAP12FaultValue.class;
     }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12HeaderBlockSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12HeaderBlockSupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12HeaderBlockSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12HeaderBlockSupport.aj
Mon Aug 31 12:25:40 2015
@@ -18,14 +18,14 @@
  */
 package org.apache.axiom.soap.impl.common;
 
-import org.apache.axiom.om.impl.common.AxiomElement;
+import org.apache.axiom.core.CoreNode;
 
 public aspect AxiomSOAP12HeaderBlockSupport {
     public final SOAPHelper AxiomSOAP12HeaderBlock.getSOAPHelper() {
         return SOAPHelper.SOAP12;
     }
 
-    public final Class<? extends AxiomElement> AxiomSOAP12HeaderBlock.getElementType()
{
+    public final Class<? extends CoreNode> AxiomSOAP12HeaderBlock.coreGetNodeClass()
{
         return AxiomSOAP12HeaderBlock.class;
     }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12HeaderSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12HeaderSupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12HeaderSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12HeaderSupport.aj
Mon Aug 31 12:25:40 2015
@@ -18,10 +18,10 @@
  */
 package org.apache.axiom.soap.impl.common;
 
-import org.apache.axiom.om.impl.common.AxiomElement;
+import org.apache.axiom.core.CoreNode;
 
 public aspect AxiomSOAP12HeaderSupport {
-    public final Class<? extends AxiomElement> AxiomSOAP12Header.getElementType() {
+    public final Class<? extends CoreNode> AxiomSOAP12Header.coreGetNodeClass() {
         return AxiomSOAP12Header.class;
     }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPEnvelopeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPEnvelopeSupport.aj?rev=1700242&r1=1700241&r2=1700242&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPEnvelopeSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPEnvelopeSupport.aj
Mon Aug 31 12:25:40 2015
@@ -18,10 +18,10 @@
  */
 package org.apache.axiom.soap.impl.common;
 
-import org.apache.axiom.om.impl.common.AxiomElement;
+import org.apache.axiom.core.CoreNode;
 
 public aspect AxiomSOAPEnvelopeSupport {
-    public final Class<? extends AxiomElement> AxiomSOAPEnvelope.getElementType() {
+    public final Class<? extends CoreNode> AxiomSOAPEnvelope.coreGetNodeClass() {
         return AxiomSOAPEnvelope.class;
     }
 }



Mime
View raw message