This is an automated email from the ASF dual-hosted git repository.

veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git


The following commit(s) were added to refs/heads/master by this push:
     new 8529b1be5 Extract interface from SOAPHelper
8529b1be5 is described below

commit 8529b1be592f646c00178c1d69952c56cd072a8a
Author: Copilot <[email protected]>
AuthorDate: Sun May 24 08:50:07 2026 +0100

    Extract interface from SOAPHelper
    
    This should make it easier to enforce proper layering and avoid cycles.
    
    Also move the implementation classes to avoid a cycle.
    
    Co-authored-by: Andreas Veithen-Knowles <[email protected]>
---
 .../SOAPHelper.java => common/SOAPHelperImpl.java} |  54 ++++--
 .../axiom/soap/impl/common/builder/SOAPModel.java  |   4 +-
 .../impl/{intf => common}/soap11/SOAP11Helper.java |   6 +-
 .../impl/{intf => common}/soap12/SOAP12Helper.java |   6 +-
 .../axiom/soap/impl/factory/SOAP11Factory.java     |   2 +-
 .../axiom/soap/impl/factory/SOAP12Factory.java     |   2 +-
 .../apache/axiom/soap/impl/intf/SOAPHelper.java    | 213 +++++----------------
 .../soap/impl/mixin/AxiomSOAP11ElementMixin.java   |   2 +-
 .../soap/impl/mixin/AxiomSOAP12ElementMixin.java   |   2 +-
 9 files changed, 99 insertions(+), 192 deletions(-)

diff --git 
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/SOAPHelper.java
 
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/SOAPHelperImpl.java
similarity index 87%
copy from 
mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/SOAPHelper.java
copy to 
mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/SOAPHelperImpl.java
index d9a20d975..94b576129 100644
--- 
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/SOAPHelper.java
+++ 
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/SOAPHelperImpl.java
@@ -16,23 +16,26 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axiom.soap.impl.intf;
+package org.apache.axiom.soap.impl.common;
 
 import javax.xml.namespace.QName;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.impl.common.OMNamespaceImpl;
 import org.apache.axiom.om.impl.intf.factory.AxiomElementType;
 import org.apache.axiom.soap.SOAPConstants;
-import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPVersion;
-
-/**
- * Encapsulates certain SOAP version specific behaviors. This API defines 
methods that could also be
- * added to {@link SOAPVersion}, but that are not relevant for application 
code and should therefore
- * not be part of the public API.
- */
-public abstract class SOAPHelper {
+import org.apache.axiom.soap.impl.intf.AxiomSOAPBody;
+import org.apache.axiom.soap.impl.intf.AxiomSOAPEnvelope;
+import org.apache.axiom.soap.impl.intf.AxiomSOAPFault;
+import org.apache.axiom.soap.impl.intf.AxiomSOAPFaultCode;
+import org.apache.axiom.soap.impl.intf.AxiomSOAPFaultDetail;
+import org.apache.axiom.soap.impl.intf.AxiomSOAPFaultReason;
+import org.apache.axiom.soap.impl.intf.AxiomSOAPFaultRole;
+import org.apache.axiom.soap.impl.intf.AxiomSOAPHeader;
+import org.apache.axiom.soap.impl.intf.AxiomSOAPHeaderBlock;
+import org.apache.axiom.soap.impl.intf.SOAPHelper;
+
+public abstract class SOAPHelperImpl implements SOAPHelper {
     private final SOAPVersion version;
     private final OMNamespace namespace;
     private final String specName;
@@ -52,7 +55,7 @@ public abstract class SOAPHelper {
     private final QName roleAttributeQName;
     private final QName relayAttributeQName;
 
-    protected SOAPHelper(
+    protected SOAPHelperImpl(
             SOAPVersion version,
             String specName,
             AxiomElementType<? extends AxiomSOAPEnvelope> envelopeType,
@@ -98,101 +101,118 @@ public abstract class SOAPHelper {
                         version.getEnvelopeURI(), relayAttributeLocalName, 
SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
     }
 
+    @Override
     public final SOAPVersion getVersion() {
         return version;
     }
 
-    public abstract SOAPFactory getSOAPFactory(OMMetaFactory metaFactory);
-
+    @Override
     public final String getEnvelopeURI() {
         return version.getEnvelopeURI();
     }
 
+    @Override
     public final OMNamespace getNamespace() {
         return namespace;
     }
 
+    @Override
     public final String getSpecName() {
         return specName;
     }
 
+    @Override
     public final AxiomElementType<? extends AxiomSOAPEnvelope> 
getEnvelopeType() {
         return envelopeType;
     }
 
+    @Override
     public final AxiomElementType<? extends AxiomSOAPHeader> getHeaderType() {
         return headerType;
     }
 
+    @Override
     public final QName getHeaderQName() {
         return headerQName;
     }
 
+    @Override
     public final AxiomElementType<? extends AxiomSOAPHeaderBlock> 
getHeaderBlockType() {
         return headerBlockType;
     }
 
+    @Override
     public final AxiomElementType<? extends AxiomSOAPBody> getBodyType() {
         return bodyType;
     }
 
+    @Override
     public final QName getBodyQName() {
         return bodyQName;
     }
 
+    @Override
     public final AxiomElementType<? extends AxiomSOAPFault> getFaultType() {
         return faultType;
     }
 
+    @Override
     public final QName getFaultQName() {
         return faultQName;
     }
 
+    @Override
     public final AxiomElementType<? extends AxiomSOAPFaultCode> 
getFaultCodeType() {
         return faultCodeType;
     }
 
+    @Override
     public final QName getFaultCodeQName() {
         return version.getFaultCodeQName();
     }
 
+    @Override
     public final AxiomElementType<? extends AxiomSOAPFaultReason> 
getFaultReasonType() {
         return faultReasonType;
     }
 
+    @Override
     public final QName getFaultReasonQName() {
         return version.getFaultReasonQName();
     }
 
+    @Override
     public final AxiomElementType<? extends AxiomSOAPFaultRole> 
getFaultRoleType() {
         return faultRoleType;
     }
 
+    @Override
     public final QName getFaultRoleQName() {
         return version.getFaultRoleQName();
     }
 
+    @Override
     public final AxiomElementType<? extends AxiomSOAPFaultDetail> 
getFaultDetailType() {
         return faultDetailType;
     }
 
+    @Override
     public final QName getFaultDetailQName() {
         return version.getFaultDetailQName();
     }
 
+    @Override
     public final QName getMustUnderstandAttributeQName() {
         return mustUnderstandAttributeQName;
     }
 
+    @Override
     public final QName getRoleAttributeQName() {
         return roleAttributeQName;
     }
 
+    @Override
     public final QName getRelayAttributeQName() {
         return relayAttributeQName;
     }
-
-    public abstract Boolean parseBoolean(String literal);
-
-    public abstract String formatBoolean(boolean value);
 }
diff --git 
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModel.java
 
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModel.java
index b2dd255e0..0ad62027e 100644
--- 
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModel.java
+++ 
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModel.java
@@ -29,9 +29,9 @@ import org.apache.axiom.soap.SOAP11Constants;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axiom.soap.SOAPConstants;
 import org.apache.axiom.soap.SOAPProcessingException;
+import org.apache.axiom.soap.impl.common.soap11.SOAP11Helper;
+import org.apache.axiom.soap.impl.common.soap12.SOAP12Helper;
 import org.apache.axiom.soap.impl.intf.SOAPHelper;
-import org.apache.axiom.soap.impl.intf.soap11.SOAP11Helper;
-import org.apache.axiom.soap.impl.intf.soap12.SOAP12Helper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git 
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/SOAP11Helper.java
 
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/soap11/SOAP11Helper.java
similarity index 93%
rename from 
mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/SOAP11Helper.java
rename to 
mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/soap11/SOAP11Helper.java
index 8a2c79b2f..23ee0f300 100644
--- 
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/SOAP11Helper.java
+++ 
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/soap11/SOAP11Helper.java
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axiom.soap.impl.intf.soap11;
+package org.apache.axiom.soap.impl.common.soap11;
 
 import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.impl.intf.factory.AxiomNodeFactory;
 import org.apache.axiom.soap.SOAP11Constants;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPVersion;
-import org.apache.axiom.soap.impl.intf.SOAPHelper;
+import org.apache.axiom.soap.impl.common.SOAPHelperImpl;
 
-public final class SOAP11Helper extends SOAPHelper {
+public final class SOAP11Helper extends SOAPHelperImpl {
     public static final SOAP11Helper INSTANCE = new SOAP11Helper();
 
     private SOAP11Helper() {
diff --git 
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/SOAP12Helper.java
 
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/soap12/SOAP12Helper.java
similarity index 93%
rename from 
mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/SOAP12Helper.java
rename to 
mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/soap12/SOAP12Helper.java
index 1800ecdae..b46a0b88e 100644
--- 
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/SOAP12Helper.java
+++ 
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/soap12/SOAP12Helper.java
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axiom.soap.impl.intf.soap12;
+package org.apache.axiom.soap.impl.common.soap12;
 
 import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.impl.intf.factory.AxiomNodeFactory;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPVersion;
-import org.apache.axiom.soap.impl.intf.SOAPHelper;
+import org.apache.axiom.soap.impl.common.SOAPHelperImpl;
 
-public final class SOAP12Helper extends SOAPHelper {
+public final class SOAP12Helper extends SOAPHelperImpl {
     public static final SOAP12Helper INSTANCE = new SOAP12Helper();
 
     private SOAP12Helper() {
diff --git 
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/factory/SOAP11Factory.java
 
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/factory/SOAP11Factory.java
index 30baa9b14..6ff5d62ca 100644
--- 
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/factory/SOAP11Factory.java
+++ 
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/factory/SOAP11Factory.java
@@ -27,8 +27,8 @@ import org.apache.axiom.soap.SOAPFaultReason;
 import org.apache.axiom.soap.SOAPFaultSubCode;
 import org.apache.axiom.soap.SOAPFaultText;
 import org.apache.axiom.soap.SOAPFaultValue;
+import org.apache.axiom.soap.impl.common.soap11.SOAP11Helper;
 import org.apache.axiom.soap.impl.intf.SOAPHelper;
-import org.apache.axiom.soap.impl.intf.soap11.SOAP11Helper;
 
 public class SOAP11Factory extends SOAPFactoryImpl {
     public SOAP11Factory(AxiomNodeFactory nodeFactory) {
diff --git 
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/factory/SOAP12Factory.java
 
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/factory/SOAP12Factory.java
index ce36070e5..f594a4810 100644
--- 
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/factory/SOAP12Factory.java
+++ 
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/factory/SOAP12Factory.java
@@ -29,8 +29,8 @@ import org.apache.axiom.soap.SOAPFaultReason;
 import org.apache.axiom.soap.SOAPFaultSubCode;
 import org.apache.axiom.soap.SOAPFaultText;
 import org.apache.axiom.soap.SOAPFaultValue;
+import org.apache.axiom.soap.impl.common.soap12.SOAP12Helper;
 import org.apache.axiom.soap.impl.intf.SOAPHelper;
-import org.apache.axiom.soap.impl.intf.soap12.SOAP12Helper;
 
 public class SOAP12Factory extends SOAPFactoryImpl {
     public SOAP12Factory(AxiomNodeFactory nodeFactory) {
diff --git 
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/SOAPHelper.java
 
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/SOAPHelper.java
index d9a20d975..96ce693ff 100644
--- 
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/SOAPHelper.java
+++ 
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/SOAPHelper.java
@@ -21,9 +21,7 @@ package org.apache.axiom.soap.impl.intf;
 import javax.xml.namespace.QName;
 import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.impl.common.OMNamespaceImpl;
 import org.apache.axiom.om.impl.intf.factory.AxiomElementType;
-import org.apache.axiom.soap.SOAPConstants;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPVersion;
 
@@ -32,167 +30,56 @@ import org.apache.axiom.soap.SOAPVersion;
  * added to {@link SOAPVersion}, but that are not relevant for application 
code and should therefore
  * not be part of the public API.
  */
-public abstract class SOAPHelper {
-    private final SOAPVersion version;
-    private final OMNamespace namespace;
-    private final String specName;
-    private final AxiomElementType<? extends AxiomSOAPEnvelope> envelopeType;
-    private final AxiomElementType<? extends AxiomSOAPHeader> headerType;
-    private final QName headerQName;
-    private final AxiomElementType<? extends AxiomSOAPHeaderBlock> 
headerBlockType;
-    private final AxiomElementType<? extends AxiomSOAPBody> bodyType;
-    private final QName bodyQName;
-    private final AxiomElementType<? extends AxiomSOAPFault> faultType;
-    private final QName faultQName;
-    private final AxiomElementType<? extends AxiomSOAPFaultCode> faultCodeType;
-    private final AxiomElementType<? extends AxiomSOAPFaultReason> 
faultReasonType;
-    private final AxiomElementType<? extends AxiomSOAPFaultRole> faultRoleType;
-    private final AxiomElementType<? extends AxiomSOAPFaultDetail> 
faultDetailType;
-    private final QName mustUnderstandAttributeQName;
-    private final QName roleAttributeQName;
-    private final QName relayAttributeQName;
-
-    protected SOAPHelper(
-            SOAPVersion version,
-            String specName,
-            AxiomElementType<? extends AxiomSOAPEnvelope> envelopeType,
-            AxiomElementType<? extends AxiomSOAPHeader> headerType,
-            AxiomElementType<? extends AxiomSOAPHeaderBlock> headerBlockType,
-            AxiomElementType<? extends AxiomSOAPBody> bodyType,
-            AxiomElementType<? extends AxiomSOAPFault> faultType,
-            AxiomElementType<? extends AxiomSOAPFaultCode> faultCodeType,
-            AxiomElementType<? extends AxiomSOAPFaultReason> faultReasonType,
-            AxiomElementType<? extends AxiomSOAPFaultRole> faultRoleType,
-            AxiomElementType<? extends AxiomSOAPFaultDetail> faultDetailType,
-            String roleAttributeLocalName,
-            String relayAttributeLocalName) {
-        this.version = version;
-        namespace = new OMNamespaceImpl(version.getEnvelopeURI(), 
SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
-        this.specName = specName;
-        this.envelopeType = envelopeType;
-        this.headerType = headerType;
-        headerQName = new QName(
-                version.getEnvelopeURI(), SOAPConstants.HEADER_LOCAL_NAME, 
SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
-        this.headerBlockType = headerBlockType;
-        this.bodyType = bodyType;
-        bodyQName = new QName(
-                version.getEnvelopeURI(), SOAPConstants.BODY_LOCAL_NAME, 
SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
-        this.faultType = faultType;
-        faultQName = new QName(
-                version.getEnvelopeURI(),
-                SOAPConstants.SOAPFAULT_LOCAL_NAME,
-                SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
-        this.faultCodeType = faultCodeType;
-        this.faultReasonType = faultReasonType;
-        this.faultRoleType = faultRoleType;
-        this.faultDetailType = faultDetailType;
-        mustUnderstandAttributeQName = new QName(
-                version.getEnvelopeURI(),
-                SOAPConstants.ATTR_MUSTUNDERSTAND,
-                SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
-        roleAttributeQName = new QName(
-                version.getEnvelopeURI(), roleAttributeLocalName, 
SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
-        relayAttributeQName = relayAttributeLocalName == null
-                ? null
-                : new QName(
-                        version.getEnvelopeURI(), relayAttributeLocalName, 
SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
-    }
-
-    public final SOAPVersion getVersion() {
-        return version;
-    }
-
-    public abstract SOAPFactory getSOAPFactory(OMMetaFactory metaFactory);
-
-    public final String getEnvelopeURI() {
-        return version.getEnvelopeURI();
-    }
-
-    public final OMNamespace getNamespace() {
-        return namespace;
-    }
-
-    public final String getSpecName() {
-        return specName;
-    }
-
-    public final AxiomElementType<? extends AxiomSOAPEnvelope> 
getEnvelopeType() {
-        return envelopeType;
-    }
-
-    public final AxiomElementType<? extends AxiomSOAPHeader> getHeaderType() {
-        return headerType;
-    }
-
-    public final QName getHeaderQName() {
-        return headerQName;
-    }
-
-    public final AxiomElementType<? extends AxiomSOAPHeaderBlock> 
getHeaderBlockType() {
-        return headerBlockType;
-    }
-
-    public final AxiomElementType<? extends AxiomSOAPBody> getBodyType() {
-        return bodyType;
-    }
-
-    public final QName getBodyQName() {
-        return bodyQName;
-    }
-
-    public final AxiomElementType<? extends AxiomSOAPFault> getFaultType() {
-        return faultType;
-    }
-
-    public final QName getFaultQName() {
-        return faultQName;
-    }
-
-    public final AxiomElementType<? extends AxiomSOAPFaultCode> 
getFaultCodeType() {
-        return faultCodeType;
-    }
-
-    public final QName getFaultCodeQName() {
-        return version.getFaultCodeQName();
-    }
-
-    public final AxiomElementType<? extends AxiomSOAPFaultReason> 
getFaultReasonType() {
-        return faultReasonType;
-    }
-
-    public final QName getFaultReasonQName() {
-        return version.getFaultReasonQName();
-    }
-
-    public final AxiomElementType<? extends AxiomSOAPFaultRole> 
getFaultRoleType() {
-        return faultRoleType;
-    }
-
-    public final QName getFaultRoleQName() {
-        return version.getFaultRoleQName();
-    }
-
-    public final AxiomElementType<? extends AxiomSOAPFaultDetail> 
getFaultDetailType() {
-        return faultDetailType;
-    }
-
-    public final QName getFaultDetailQName() {
-        return version.getFaultDetailQName();
-    }
-
-    public final QName getMustUnderstandAttributeQName() {
-        return mustUnderstandAttributeQName;
-    }
-
-    public final QName getRoleAttributeQName() {
-        return roleAttributeQName;
-    }
-
-    public final QName getRelayAttributeQName() {
-        return relayAttributeQName;
-    }
+public interface SOAPHelper {
+    SOAPVersion getVersion();
 
-    public abstract Boolean parseBoolean(String literal);
+    SOAPFactory getSOAPFactory(OMMetaFactory metaFactory);
 
-    public abstract String formatBoolean(boolean value);
+    String getEnvelopeURI();
+
+    OMNamespace getNamespace();
+
+    String getSpecName();
+
+    AxiomElementType<? extends AxiomSOAPEnvelope> getEnvelopeType();
+
+    AxiomElementType<? extends AxiomSOAPHeader> getHeaderType();
+
+    QName getHeaderQName();
+
+    AxiomElementType<? extends AxiomSOAPHeaderBlock> getHeaderBlockType();
+
+    AxiomElementType<? extends AxiomSOAPBody> getBodyType();
+
+    QName getBodyQName();
+
+    AxiomElementType<? extends AxiomSOAPFault> getFaultType();
+
+    QName getFaultQName();
+
+    AxiomElementType<? extends AxiomSOAPFaultCode> getFaultCodeType();
+
+    QName getFaultCodeQName();
+
+    AxiomElementType<? extends AxiomSOAPFaultReason> getFaultReasonType();
+
+    QName getFaultReasonQName();
+
+    AxiomElementType<? extends AxiomSOAPFaultRole> getFaultRoleType();
+
+    QName getFaultRoleQName();
+
+    AxiomElementType<? extends AxiomSOAPFaultDetail> getFaultDetailType();
+
+    QName getFaultDetailQName();
+
+    QName getMustUnderstandAttributeQName();
+
+    QName getRoleAttributeQName();
+
+    QName getRelayAttributeQName();
+
+    Boolean parseBoolean(String literal);
+
+    String formatBoolean(boolean value);
 }
diff --git 
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11ElementMixin.java
 
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11ElementMixin.java
index f9cef72b9..64bc806ab 100644
--- 
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11ElementMixin.java
+++ 
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11ElementMixin.java
@@ -18,9 +18,9 @@
  */
 package org.apache.axiom.soap.impl.mixin;
 
+import org.apache.axiom.soap.impl.common.soap11.SOAP11Helper;
 import org.apache.axiom.soap.impl.intf.SOAPHelper;
 import org.apache.axiom.soap.impl.intf.soap11.AxiomSOAP11Element;
-import org.apache.axiom.soap.impl.intf.soap11.SOAP11Helper;
 import org.apache.axiom.weaver.annotation.Mixin;
 
 @Mixin
diff --git 
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12ElementMixin.java
 
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12ElementMixin.java
index 91b5a8026..15b647400 100644
--- 
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12ElementMixin.java
+++ 
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12ElementMixin.java
@@ -18,9 +18,9 @@
  */
 package org.apache.axiom.soap.impl.mixin;
 
+import org.apache.axiom.soap.impl.common.soap12.SOAP12Helper;
 import org.apache.axiom.soap.impl.intf.SOAPHelper;
 import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12Element;
-import org.apache.axiom.soap.impl.intf.soap12.SOAP12Helper;
 import org.apache.axiom.weaver.annotation.Mixin;
 
 @Mixin

Reply via email to