Author: veithen
Date: Sun Aug 30 22:38:46 2015
New Revision: 1700172
URL: http://svn.apache.org/r1700172
Log:
Create SOAPMessage instances using the new createNode API.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactory.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactorySupport.aj
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/SOAPMessageImpl.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/SOAPFactoryImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPMessageImpl.java
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactory.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactory.java?rev=1700172&r1=1700171&r2=1700172&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactory.java
(original)
+++
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactory.java
Sun Aug 30 22:38:46 2015
@@ -23,5 +23,4 @@ import org.apache.axiom.soap.impl.builde
public interface AxiomSOAPFactory extends AxiomNodeFactory, SOAPFactoryEx {
SOAPHelper getSOAPHelper();
- AxiomSOAPMessage createSOAPMessage();
}
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=1700172&r1=1700171&r2=1700172&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
Sun Aug 30 22:38:46 2015
@@ -59,8 +59,12 @@ public aspect AxiomSOAPFactorySupport {
return element;
}
+ public final SOAPMessage AxiomSOAPFactory.createSOAPMessage() {
+ return createNode(AxiomSOAPMessage.class);
+ }
+
public final SOAPMessage
AxiomSOAPFactory.createSOAPMessage(OMXMLParserWrapper builder) {
- AxiomSOAPMessage message = createSOAPMessage();
+ AxiomSOAPMessage message = createNode(AxiomSOAPMessage.class);
// Null check for Spring-WS compatibility
if (builder != null) {
message.coreSetBuilder(builder);
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=1700172&r1=1700171&r2=1700172&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
Sun Aug 30 22:38:46 2015
@@ -108,7 +108,9 @@ import org.apache.axiom.soap.impl.common
import org.apache.axiom.soap.impl.common.AxiomSOAP12Header;
import org.apache.axiom.soap.impl.common.AxiomSOAP12HeaderBlock;
import org.apache.axiom.soap.impl.common.AxiomSOAPEnvelope;
+import org.apache.axiom.soap.impl.common.AxiomSOAPMessage;
import org.apache.axiom.soap.impl.dom.SOAPEnvelopeImpl;
+import org.apache.axiom.soap.impl.dom.SOAPMessageImpl;
import org.apache.axiom.soap.impl.dom.soap11.SOAP11BodyImpl;
import org.apache.axiom.soap.impl.dom.soap11.SOAP11FaultCodeImpl;
import org.apache.axiom.soap.impl.dom.soap11.SOAP11FaultDetailImpl;
@@ -280,6 +282,8 @@ public class OMDOMFactory implements Axi
node = new NSUnawareElement(this);
} else if (type == CoreProcessingInstruction.class || type ==
AxiomProcessingInstruction.class || type == DOMProcessingInstruction.class) {
node = new ProcessingInstructionImpl(this);
+ } else if (type == AxiomSOAPMessage.class) {
+ node = new SOAPMessageImpl(this);
} else if (type == AxiomSOAPEnvelope.class) {
node = new SOAPEnvelopeImpl(this);
} else if (type == AxiomSOAP11Header.class) {
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=1700172&r1=1700171&r2=1700172&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
Sun Aug 30 22:38:46 2015
@@ -28,7 +28,6 @@ import org.apache.axiom.soap.SOAPHeaderB
import org.apache.axiom.soap.SOAPMessage;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.common.AxiomSOAPFactory;
-import org.apache.axiom.soap.impl.common.AxiomSOAPMessage;
public abstract class SOAPFactoryImpl extends OMDOMFactory implements
AxiomSOAPFactory {
public SOAPFactoryImpl(OMDOMMetaFactory metaFactory) {
@@ -38,10 +37,6 @@ public abstract class SOAPFactoryImpl ex
public SOAPFactoryImpl() {
}
- public final AxiomSOAPMessage createSOAPMessage() {
- return new SOAPMessageImpl(this);
- }
-
public final SOAPMessage createDefaultSOAPMessage() {
SOAPMessage message = createSOAPMessage();
SOAPEnvelope env = createSOAPEnvelope();
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPMessageImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPMessageImpl.java?rev=1700172&r1=1700171&r2=1700172&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPMessageImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPMessageImpl.java
Sun Aug 30 22:38:46 2015
@@ -22,14 +22,14 @@ package org.apache.axiom.soap.impl.dom;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.impl.dom.DocumentImpl;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.common.AxiomSOAPMessage;
public class SOAPMessageImpl extends DocumentImpl implements AxiomSOAPMessage {
- public SOAPMessageImpl(SOAPFactory factory) {
+ public SOAPMessageImpl(OMFactory factory) {
super(factory);
}
@@ -48,6 +48,6 @@ public class SOAPMessageImpl extends Doc
}
protected DocumentImpl createClone(OMCloneOptions options) {
- return new SOAPMessageImpl((SOAPFactory)getOMFactory());
+ return new SOAPMessageImpl(getOMFactory());
}
}
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=1700172&r1=1700171&r2=1700172&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
Sun Aug 30 22:38:46 2015
@@ -88,7 +88,9 @@ import org.apache.axiom.soap.impl.common
import org.apache.axiom.soap.impl.common.AxiomSOAP12Header;
import org.apache.axiom.soap.impl.common.AxiomSOAP12HeaderBlock;
import org.apache.axiom.soap.impl.common.AxiomSOAPEnvelope;
+import org.apache.axiom.soap.impl.common.AxiomSOAPMessage;
import org.apache.axiom.soap.impl.llom.SOAPEnvelopeImpl;
+import org.apache.axiom.soap.impl.llom.SOAPMessageImpl;
import org.apache.axiom.soap.impl.llom.soap11.SOAP11BodyImpl;
import org.apache.axiom.soap.impl.llom.soap11.SOAP11FaultCodeImpl;
import org.apache.axiom.soap.impl.llom.soap11.SOAP11FaultDetailImpl;
@@ -262,6 +264,8 @@ public class OMLinkedListImplFactory imp
node = new OMElementImpl(this);
} else if (type == CoreProcessingInstruction.class || type ==
AxiomProcessingInstruction.class) {
node = new OMProcessingInstructionImpl(this);
+ } else if (type == AxiomSOAPMessage.class) {
+ node = new SOAPMessageImpl(this);
} else if (type == AxiomSOAPEnvelope.class) {
node = new SOAPEnvelopeImpl(this);
} else if (type == AxiomSOAP11Header.class) {
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFactoryImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFactoryImpl.java?rev=1700172&r1=1700171&r2=1700172&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFactoryImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFactoryImpl.java
Sun Aug 30 22:38:46 2015
@@ -24,7 +24,6 @@ import org.apache.axiom.soap.SOAPEnvelop
import org.apache.axiom.soap.SOAPMessage;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.common.AxiomSOAPFactory;
-import org.apache.axiom.soap.impl.common.AxiomSOAPMessage;
public abstract class SOAPFactoryImpl extends OMLinkedListImplFactory
implements AxiomSOAPFactory {
public SOAPFactoryImpl(OMLinkedListMetaFactory metaFactory) {
@@ -37,10 +36,6 @@ public abstract class SOAPFactoryImpl ex
public SOAPFactoryImpl() {
}
- public final AxiomSOAPMessage createSOAPMessage() {
- return new SOAPMessageImpl(this);
- }
-
public final SOAPMessage createDefaultSOAPMessage() {
SOAPMessage message = createSOAPMessage();
SOAPEnvelope env = createSOAPEnvelope();
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPMessageImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPMessageImpl.java?rev=1700172&r1=1700171&r2=1700172&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPMessageImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPMessageImpl.java
Sun Aug 30 22:38:46 2015
@@ -23,14 +23,14 @@ import org.apache.axiom.om.OMCloneOption
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.impl.llom.OMDocumentImpl;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.common.AxiomSOAPMessage;
public class SOAPMessageImpl extends OMDocumentImpl implements
AxiomSOAPMessage {
- public SOAPMessageImpl(SOAPFactory factory) {
+ public SOAPMessageImpl(OMFactory factory) {
super(factory);
}
@@ -51,6 +51,6 @@ public class SOAPMessageImpl extends OMD
protected OMDocument createClone(OMCloneOptions options) {
// Note: we need to use getOMFactory here (instead of the factory
attribute)
// directly because the factory for a SOAPMessage may be determined
lazily.
- return new SOAPMessageImpl((SOAPFactory)getOMFactory());
+ return new SOAPMessageImpl(getOMFactory());
}
}
