Author: veithen
Date: Tue Jun 10 16:55:37 2014
New Revision: 1601684
URL: http://svn.apache.org/r1601684
Log:
Realign the SOAPFactory base classes in LLOM and DOOM to make it easier to
compare them.
Added:
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFactoryImpl.java
(contents, props changed)
- copied, changed from r1601683,
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/factory/DOMSOAPFactory.java
Removed:
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/factory/DOMSOAPFactory.java
Modified:
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11Factory.java
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12Factory.java
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFactoryImpl.java
Copied:
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFactoryImpl.java
(from r1601683,
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/factory/DOMSOAPFactory.java)
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFactoryImpl.java?p2=webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFactoryImpl.java&p1=webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/factory/DOMSOAPFactory.java&r1=1601683&r2=1601684&rev=1601684&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/factory/DOMSOAPFactory.java
(original)
+++
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFactoryImpl.java
Tue Jun 10 16:55:37 2014
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.axiom.soap.impl.dom.factory;
+package org.apache.axiom.soap.impl.dom;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMNamespace;
@@ -30,15 +30,17 @@ import org.apache.axiom.soap.SOAPHeaderB
import org.apache.axiom.soap.SOAPMessage;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.builder.SOAPFactoryEx;
-import org.apache.axiom.soap.impl.dom.SOAPEnvelopeImpl;
-import org.apache.axiom.soap.impl.dom.SOAPMessageImpl;
-public abstract class DOMSOAPFactory extends OMDOMFactory implements
SOAPFactoryEx {
- public DOMSOAPFactory(OMDOMMetaFactory metaFactory) {
+public abstract class SOAPFactoryImpl extends OMDOMFactory implements
SOAPFactoryEx {
+ public SOAPFactoryImpl(OMDOMMetaFactory metaFactory) {
super(metaFactory);
}
- public DOMSOAPFactory() {
+ public SOAPFactoryImpl() {
+ }
+
+ public final SOAPMessage createSOAPMessage() {
+ return new SOAPMessageImpl(this);
}
public final SOAPMessage createSOAPMessage(OMXMLParserWrapper builder) {
@@ -50,7 +52,7 @@ public abstract class DOMSOAPFactory ext
}
public final SOAPEnvelope createSOAPEnvelope() {
- return new SOAPEnvelopeImpl(null, getNamespace(), null, this, true);
+ return createSOAPEnvelope(getNamespace());
}
public final SOAPEnvelope createSOAPEnvelope(OMNamespace ns) {
@@ -58,16 +60,12 @@ public abstract class DOMSOAPFactory ext
}
public final SOAPEnvelope getDefaultEnvelope() throws
SOAPProcessingException {
- SOAPEnvelopeImpl env = new SOAPEnvelopeImpl(null, getNamespace(),
null, this, true);
+ SOAPEnvelope env = createSOAPEnvelope();
createSOAPHeader(env);
createSOAPBody(env);
return env;
}
- public final SOAPMessage createSOAPMessage() {
- return new SOAPMessageImpl(this);
- }
-
public SOAPHeaderBlock createSOAPHeaderBlock(OMDataSource source) {
throw new UnsupportedOperationException("TODO");
}
Propchange:
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFactoryImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11Factory.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11Factory.java?rev=1601684&r1=1601683&r2=1601684&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11Factory.java
(original)
+++
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11Factory.java
Tue Jun 10 16:55:37 2014
@@ -42,11 +42,11 @@ import org.apache.axiom.soap.SOAPHeaderB
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.SOAPVersion;
import org.apache.axiom.soap.SOAP11Version;
-import org.apache.axiom.soap.impl.dom.factory.DOMSOAPFactory;
+import org.apache.axiom.soap.impl.dom.SOAPFactoryImpl;
/**
*/
-public class SOAP11Factory extends DOMSOAPFactory {
+public class SOAP11Factory extends SOAPFactoryImpl {
public SOAP11Factory(OMDOMMetaFactory metaFactory) {
super(metaFactory);
}
Modified:
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12Factory.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12Factory.java?rev=1601684&r1=1601683&r2=1601684&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12Factory.java
(original)
+++
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12Factory.java
Tue Jun 10 16:55:37 2014
@@ -42,11 +42,11 @@ import org.apache.axiom.soap.SOAPProcess
import org.apache.axiom.soap.SOAPVersion;
import org.apache.axiom.soap.SOAP12Version;
import org.apache.axiom.soap.impl.builder.SOAP12FactoryEx;
-import org.apache.axiom.soap.impl.dom.factory.DOMSOAPFactory;
+import org.apache.axiom.soap.impl.dom.SOAPFactoryImpl;
/**
*/
-public class SOAP12Factory extends DOMSOAPFactory implements SOAP12FactoryEx {
+public class SOAP12Factory extends SOAPFactoryImpl implements SOAP12FactoryEx {
public SOAP12Factory(OMDOMMetaFactory metaFactory) {
super(metaFactory);
}
Modified:
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFactoryImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFactoryImpl.java?rev=1601684&r1=1601683&r2=1601684&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFactoryImpl.java
(original)
+++
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFactoryImpl.java
Tue Jun 10 16:55:37 2014
@@ -36,7 +36,6 @@ public abstract class SOAPFactoryImpl ex
* @deprecated
*/
public SOAPFactoryImpl() {
- super();
}
public final SOAPMessage createSOAPMessage() {
@@ -57,7 +56,7 @@ public abstract class SOAPFactoryImpl ex
}
public final SOAPEnvelope createSOAPEnvelope() {
- return new SOAPEnvelopeImpl(getNamespace(), this);
+ return createSOAPEnvelope(getNamespace());
}
public final SOAPEnvelope createSOAPEnvelope(OMNamespace ns) {
