Author: veithen
Date: Sat Dec 4 13:50:31 2010
New Revision: 1042179
URL: http://svn.apache.org/viewvc?rev=1042179&view=rev
Log:
AXIS2-4902: Eliminated a couple of illegal references to Axiom implementation
classes.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/DataSourceBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/unknowncontent/UnknownContentBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/DataSourceBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/DataSourceBuilder.java?rev=1042179&r1=1042178&r2=1042179&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/DataSourceBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/DataSourceBuilder.java
Sat Dec 4 13:50:31 2010
@@ -35,8 +35,6 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.impl.OMNamespaceImpl;
-import org.apache.axiom.om.impl.llom.OMSourcedElementImpl;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
@@ -47,8 +45,8 @@ public class DataSourceBuilder implement
throws AxisFault {
msgContext.setDoingREST(true);
- OMNamespace ns = new OMNamespaceImpl("", "");
OMFactory factory = OMAbstractFactory.getOMFactory();
+ OMNamespace ns = factory.createOMNamespace("", "");
byte[] bytes;
try {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -59,7 +57,7 @@ public class DataSourceBuilder implement
throw AxisFault.makeFault(e);
}
ByteArrayDataSourceEx ds = new ByteArrayDataSourceEx(bytes,
contentType);
- return new OMSourcedElementImpl("dummy", ns, factory, ds);
+ return factory.createOMElement(ds, "dummy", ns);
}
public class ByteArrayDataSourceEx extends
javax.mail.util.ByteArrayDataSource implements OMDataSource {
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/unknowncontent/UnknownContentBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/unknowncontent/UnknownContentBuilder.java?rev=1042179&r1=1042178&r2=1042179&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/unknowncontent/UnknownContentBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/unknowncontent/UnknownContentBuilder.java
Sat Dec 4 13:50:31 2010
@@ -26,7 +26,6 @@ import javax.activation.DataHandler;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.impl.llom.OMSourcedElementImpl;
import org.apache.axis2.AxisFault;
import org.apache.axis2.builder.Builder;
import org.apache.axis2.context.MessageContext;
@@ -47,9 +46,7 @@ public class UnknownContentBuilder imple
OMFactory factory = OMAbstractFactory.getOMFactory();
messageContext.setDoingSwA(false);
messageContext.setDoingMTOM(false);
- return new OMSourcedElementImpl(
-
UnknownContentOMDataSource.unknownContentQName, factory,
- unknownContentDataSource);
+ return
factory.createOMElement(unknownContentDataSource,
UnknownContentOMDataSource.unknownContentQName);
}
InputStreamDataSource inStreamDataSource = new
InputStreamDataSource(
inputStream);
@@ -58,8 +55,6 @@ public class UnknownContentBuilder imple
UnknownContentOMDataSource unknownContentDataSource = new
UnknownContentOMDataSource(
dataHandler);
OMFactory factory = OMAbstractFactory.getOMFactory();
- return new OMSourcedElementImpl(
- UnknownContentOMDataSource.unknownContentQName,
factory,
- unknownContentDataSource);
+ return factory.createOMElement(unknownContentDataSource,
UnknownContentOMDataSource.unknownContentQName);
}
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java?rev=1042179&r1=1042178&r2=1042179&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
Sat Dec 4 13:50:31 2010
@@ -23,6 +23,7 @@ package org.apache.axis2.transport;
import org.apache.axiom.attachments.Attachments;
import org.apache.axiom.attachments.CachedFileDataSource;
import org.apache.axiom.attachments.lifecycle.LifecycleManager;
+import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMOutputFormat;
@@ -32,7 +33,6 @@ import org.apache.axiom.soap.SOAP11Const
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.impl.llom.soap11.SOAP11Factory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.builder.Builder;
@@ -154,7 +154,7 @@ public class TransportUtils {
} else {
// If it is not a SOAPEnvelope we wrap that with a fake
// SOAPEnvelope.
- SOAPFactory soapFactory = new SOAP11Factory();
+ SOAPFactory soapFactory = OMAbstractFactory.getSOAP11Factory();
envelope = soapFactory.getDefaultEnvelope();
if (documentElement != null) {
envelope.getBody().addChild(documentElement);
