You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/04/21 22:26:28 UTC
svn commit: r1328733 - in /axis/axis2/java/core/trunk/modules:
addressing/test/org/apache/axis2/handlers/addressing/
clustering/test/org/apache/axis2/clustering/
integration/test/org/apache/axis2/engine/
jaxws-integration/test/org/apache/axis2/jaxws/xm...
Author: veithen
Date: Sat Apr 21 20:26:28 2012
New Revision: 1328733
URL: http://svn.apache.org/viewvc?rev=1328733&view=rev
Log:
Eliminated a couple of references to deprecated classes so that we don't need to add a dependency to axiom-compat.
Modified:
axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
axis/axis2/java/core/trunk/modules/clustering/test/org/apache/axis2/clustering/ContextReplicationTest.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveATest.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveBTest.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveCTest.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSourceTests.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/Attachment.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/util/MessageContextBuilderTest.java
axis/axis2/java/core/trunk/modules/mex/src/org/apache/axis2/mex/util/MexUtil.java
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java
Modified: axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java?rev=1328733&r1=1328732&r2=1328733&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java (original)
+++ axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java Sat Apr 21 20:26:28 2012
@@ -23,7 +23,6 @@ import org.apache.axiom.om.OMAbstractFac
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.OMNamespaceImpl;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeaderBlock;
@@ -406,9 +405,10 @@ public class AddressingOutHandlerTest ex
// Need to add a SOAP Header to stop this error from XMLComparator:
// "There is no Header element under Envelope"
- SOAPEnvelope envelope = OMAbstractFactory.getSOAP11Factory().getDefaultEnvelope();
+ SOAPFactory factory = OMAbstractFactory.getSOAP11Factory();
+ SOAPEnvelope envelope = factory.getDefaultEnvelope();
SOAPHeaderBlock soapHeaderBlock = envelope.getHeader().addHeaderBlock(
- "testHeader", new OMNamespaceImpl("http://test.com", "test"));
+ "testHeader", factory.createOMNamespace("http://test.com", "test"));
msgCtxt.setEnvelope(envelope);
outHandler.invoke(msgCtxt);
@@ -515,9 +515,10 @@ public class AddressingOutHandlerTest ex
// Need to add a SOAP Header to stop this error from XMLComparator:
// "There is no Header element under Envelope"
- SOAPEnvelope envelope = OMAbstractFactory.getSOAP11Factory().getDefaultEnvelope();
+ SOAPFactory factory = OMAbstractFactory.getSOAP11Factory();
+ SOAPEnvelope envelope = factory.getDefaultEnvelope();
SOAPHeaderBlock soapHeaderBlock = envelope.getHeader().addHeaderBlock(
- "testHeader", new OMNamespaceImpl("http://test.com", "test"));
+ "testHeader", factory.createOMNamespace("http://test.com", "test"));
msgCtxt.setEnvelope(envelope);
outHandler.invoke(msgCtxt);
Modified: axis/axis2/java/core/trunk/modules/clustering/test/org/apache/axis2/clustering/ContextReplicationTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/clustering/test/org/apache/axis2/clustering/ContextReplicationTest.java?rev=1328733&r1=1328732&r2=1328733&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/clustering/test/org/apache/axis2/clustering/ContextReplicationTest.java (original)
+++ axis/axis2/java/core/trunk/modules/clustering/test/org/apache/axis2/clustering/ContextReplicationTest.java Sat Apr 21 20:26:28 2012
@@ -20,7 +20,8 @@
package org.apache.axis2.clustering;
import junit.framework.TestCase;
-import org.apache.axiom.om.util.UUIDGenerator;
+
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.clustering.management.DefaultNodeManager;
import org.apache.axis2.clustering.management.NodeManager;
@@ -56,7 +57,7 @@ public class ContextReplicationTest exte
private static final Parameter domainParam =
new Parameter(ClusteringConstants.Parameters.DOMAIN,
- "axis2.domain." + UUIDGenerator.getUUID());
+ "axis2.domain." + UIDGenerator.generateUID());
// --------------- Cluster-1 ------------------------------------------------------
private ClusteringAgent clusterManager1;
@@ -361,7 +362,7 @@ public class ContextReplicationTest exte
return;
}
- String sgcID = UUIDGenerator.getUUID();
+ String sgcID = UIDGenerator.generateUID();
ServiceGroupContext serviceGroupContext1 =
configurationContext1.createServiceGroupContext(serviceGroup1);
@@ -389,7 +390,7 @@ public class ContextReplicationTest exte
}
// Add the property
- String sgcID = UUIDGenerator.getUUID();
+ String sgcID = UIDGenerator.generateUID();
ServiceGroupContext serviceGroupContext1 =
configurationContext1.createServiceGroupContext(serviceGroup1);
Modified: axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveATest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveATest.java?rev=1328733&r1=1328732&r2=1328733&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveATest.java (original)
+++ axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveATest.java Sat Apr 21 20:26:28 2012
@@ -21,8 +21,8 @@ package org.apache.axis2.engine;
import junit.framework.TestCase;
import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
@@ -279,7 +279,7 @@ public class MessageContextSaveATest ext
mc.setSoapAction(operationName.getLocalPart());
// System.out.flush();
- mc.setMessageID(UUIDGenerator.getUUID());
+ mc.setMessageID(UIDGenerator.generateURNString());
//operationContext.addMessageContext(mc); gets done via the register
axisOperation.registerOperationContext(mc, operationContext);
Modified: axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveBTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveBTest.java?rev=1328733&r1=1328732&r2=1328733&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveBTest.java (original)
+++ axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveBTest.java Sat Apr 21 20:26:28 2012
@@ -21,8 +21,8 @@ package org.apache.axis2.engine;
import junit.framework.TestCase;
import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
@@ -529,7 +529,7 @@ public class MessageContextSaveBTest ext
mc.setSoapAction(action);
// System.out.flush();
- mc.setMessageID(UUIDGenerator.getUUID());
+ mc.setMessageID(UIDGenerator.generateURNString());
axisOperation.registerOperationContext(mc, oc);
mc.setOperationContext(oc);
Modified: axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveCTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveCTest.java?rev=1328733&r1=1328732&r2=1328733&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveCTest.java (original)
+++ axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSaveCTest.java Sat Apr 21 20:26:28 2012
@@ -21,8 +21,8 @@ package org.apache.axis2.engine;
import junit.framework.TestCase;
import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
@@ -523,7 +523,7 @@ public class MessageContextSaveCTest ext
mc.setSoapAction(action);
// System.out.flush();
- mc.setMessageID(UUIDGenerator.getUUID());
+ mc.setMessageID(UIDGenerator.generateURNString());
axisOperation.registerOperationContext(mc, oc);
mc.setOperationContext(oc);
Modified: axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java?rev=1328733&r1=1328732&r2=1328733&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java (original)
+++ axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java Sat Apr 21 20:26:28 2012
@@ -21,8 +21,8 @@ package org.apache.axis2.engine;
import junit.framework.TestCase;
import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
@@ -315,7 +315,7 @@ public class MessageContextSelfManagedDa
axisOperation.getRemainingPhasesInFlow().add(phase3);
- mc.setMessageID(UUIDGenerator.getUUID());
+ mc.setMessageID(UIDGenerator.generateURNString());
//operationContext.addMessageContext(mc); gets done via the register
axisOperation.registerOperationContext(mc, operationContext);
Modified: axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java?rev=1328733&r1=1328732&r2=1328733&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java (original)
+++ axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java Sat Apr 21 20:26:28 2012
@@ -21,8 +21,8 @@ package org.apache.axis2.engine;
import junit.framework.TestCase;
import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
@@ -209,7 +209,7 @@ public class OperationContextSaveTest ex
mc.setSoapAction(operationName.getLocalPart());
System.out.flush();
- mc.setMessageID(UUIDGenerator.getUUID());
+ mc.setMessageID(UIDGenerator.generateURNString());
//operationContext.addMessageContext(mc); gets done via the register
axisOperation.registerOperationContext(mc, operationContext);
Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSourceTests.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSourceTests.java?rev=1328733&r1=1328732&r2=1328733&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSourceTests.java (original)
+++ axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSourceTests.java Sat Apr 21 20:26:28 2012
@@ -25,7 +25,7 @@ import org.apache.axis2.jaxws.framework.
import org.apache.axis2.jaxws.provider.DataSourceImpl;
import org.apache.axiom.attachments.utils.IOUtils;
import org.apache.axiom.attachments.impl.BufferUtils;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import javax.activation.DataSource;
import javax.activation.FileDataSource;
@@ -121,7 +121,7 @@ public class DispatchXMessageDataSourceT
requestContext.put(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS,
attachments);
- attachments.put(UUIDGenerator.getUUID(), new DataHandler(attachmentDS));
+ attachments.put(UIDGenerator.generateContentId(), new DataHandler(attachmentDS));
DataSource request = txtDS;
DataSource response = dispatch.invoke(request);
@@ -143,7 +143,7 @@ public class DispatchXMessageDataSourceT
requestContext.put(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS,
attachments);
- attachments.put(UUIDGenerator.getUUID(), new DataHandler(attachmentDS));
+ attachments.put(UIDGenerator.generateContentId(), new DataHandler(attachmentDS));
DataSource request = imageDS;
DataSource response = dispatch.invoke(request);
@@ -164,8 +164,8 @@ public class DispatchXMessageDataSourceT
requestContext.put(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS,
attachments);
- attachments.put(UUIDGenerator.getUUID(), new DataHandler(attachmentDS));
- attachments.put(UUIDGenerator.getUUID(), new DataHandler(imageDS));
+ attachments.put(UIDGenerator.generateContentId(), new DataHandler(attachmentDS));
+ attachments.put(UIDGenerator.generateContentId(), new DataHandler(imageDS));
DataSource request = txtDS;
DataSource response = dispatch.invoke(request);
Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/Attachment.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/Attachment.java?rev=1328733&r1=1328732&r2=1328733&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/Attachment.java (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/Attachment.java Sat Apr 21 20:26:28 2012
@@ -19,7 +19,7 @@
package org.apache.axis2.jaxws.marshaller.impl.alt;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.jaxws.ExceptionFactory;
import org.apache.axis2.jaxws.description.AttachmentDescription;
import org.apache.axis2.jaxws.i18n.Messages;
@@ -113,7 +113,7 @@ class Attachment {
*/
public String getContentID() {
if (cid == null) {
- cid = UUIDGenerator.getUUID();
+ cid = UIDGenerator.generateContentId();
// Per spec, use the partName in the content-id
// http://www.ws-i.org/Profiles/AttachmentsProfile-1.0.html#Value-space_of_Content-Id_Header
if (partName != null) {
Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java?rev=1328733&r1=1328732&r2=1328733&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java Sat Apr 21 20:26:28 2012
@@ -22,7 +22,8 @@ package org.apache.axis2.jaxws.utility;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.OMSourcedElement;
-import org.apache.axiom.om.impl.MIMEOutputUtils;
+import org.apache.axiom.om.impl.OMMultipartWriter;
+import org.apache.axiom.util.activation.DataHandlerWrapper;
import org.apache.axis2.AxisFault;
import org.apache.axis2.jaxws.handler.AttachmentsAdapter;
import org.apache.axis2.jaxws.message.databinding.DataSourceBlock;
@@ -66,12 +67,25 @@ public class DataSourceFormatter impleme
} catch (XMLStreamException e) {
throw AxisFault.makeFault(e);
}
- MIMEOutputUtils.writeDataHandlerWithAttachmentsMessage(
- new DataHandler(busObject),
- contentType,
- outputStream,
- attachments,
- format);
+ OMMultipartWriter mpw = new OMMultipartWriter(outputStream, format);
+ DataHandler rootDataHandler = new DataHandler(busObject);
+ if (!rootDataHandler.getContentType().equals(contentType)) {
+ rootDataHandler = new DataHandlerWrapper(rootDataHandler) {
+ public String getContentType() {
+ return contentType;
+ }
+ };
+ }
+ try {
+ mpw.writePart(rootDataHandler, format.getRootContentId());
+ for (String cid : attachments.keySet()) {
+ mpw.writePart(attachments.get(cid), cid);
+ }
+ mpw.complete();
+ outputStream.flush();
+ } catch (IOException ex) {
+ throw AxisFault.makeFault(ex);
+ }
} else {
OMElement omElement = messageContext.getEnvelope().getBody().getFirstElement();
if (omElement != null) {
Modified: axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/util/MessageContextBuilderTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/util/MessageContextBuilderTest.java?rev=1328733&r1=1328732&r2=1328733&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/util/MessageContextBuilderTest.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/util/MessageContextBuilderTest.java Sat Apr 21 20:26:28 2012
@@ -8,8 +8,9 @@ import javax.xml.stream.XMLStreamExcepti
import junit.framework.TestCase;
+import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.OMNamespaceImpl;
+import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPConstants;
@@ -27,7 +28,7 @@ import org.apache.axis2.AxisFault;
public class MessageContextBuilderTest extends AbstractTestCase {
- private OMNamespaceImpl nsp = new OMNamespaceImpl(Constants.URI_SOAP11_ENV, "soapenv");
+ private OMNamespace nsp = OMAbstractFactory.getOMFactory().createOMNamespace(Constants.URI_SOAP11_ENV, "soapenv");
public MessageContextBuilderTest(String testName) {
super(testName);
Modified: axis/axis2/java/core/trunk/modules/mex/src/org/apache/axis2/mex/util/MexUtil.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/mex/src/org/apache/axis2/mex/util/MexUtil.java?rev=1328733&r1=1328732&r2=1328733&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/mex/src/org/apache/axis2/mex/util/MexUtil.java (original)
+++ axis/axis2/java/core/trunk/modules/mex/src/org/apache/axis2/mex/util/MexUtil.java Sat Apr 21 20:26:28 2012
@@ -22,7 +22,7 @@ package org.apache.axis2.mex.util;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.impl.OMNamespaceImpl;
+import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -132,14 +132,14 @@ public class MexUtil {
* @throws AxisFault
*/
- public static OMNamespaceImpl getAddressingNameSpace(OMElement toAddress)
+ public static OMNamespace getAddressingNameSpace(OMElement toAddress)
throws MexException {
OMFactory factory = OMAbstractFactory.getOMFactory();
- OMNamespaceImpl wsa = null;
+ OMNamespace wsa = null;
try {
String prefix = toAddress.getNamespace().getPrefix();
String nsURI = toAddress.getNamespace().getNamespaceURI();
- wsa = (OMNamespaceImpl) factory.createOMNamespace(nsURI, prefix);
+ wsa = factory.createOMNamespace(nsURI, prefix);
} catch (Exception e) {
throw new MexException(e);
}
Modified: axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java?rev=1328733&r1=1328732&r2=1328733&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java Sat Apr 21 20:26:28 2012
@@ -24,7 +24,6 @@ import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.impl.OMNamespaceImpl;
import org.apache.axiom.om.impl.dom.ElementImpl;
import org.apache.axiom.om.impl.dom.NodeImpl;
import org.apache.axiom.om.impl.dom.TextImpl;
@@ -491,7 +490,7 @@ public class SOAPElementImpl extends Nod
throw new SOAPException("changing this element name is not allowed");
}
OMNamespace omNamespace =
- new OMNamespaceImpl(newName.getNamespaceURI(), newName.getPrefix());
+ getOMFactory().createOMNamespace(newName.getNamespaceURI(), newName.getPrefix());
this.element.setNamespace(omNamespace);
this.element.setLocalName(newName.getLocalPart());
return this;
Modified: axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java?rev=1328733&r1=1328732&r2=1328733&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java Sat Apr 21 20:26:28 2012
@@ -19,8 +19,8 @@
package org.apache.axis2.saaj;
+import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.impl.OMNamespaceImpl;
import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
import org.apache.axiom.om.impl.dom.ElementImpl;
import org.apache.axiom.om.impl.dom.NodeImpl;
@@ -715,16 +715,17 @@ public class SOAPFaultImpl extends SOAPB
.equals("")) ? qname.getPrefix() : this.fault.getQName()
.getPrefix();
- if (this.element.getOMFactory() instanceof SOAP11Factory) {
+ OMFactory factory = element.getOMFactory();
+ if (factory instanceof SOAP11Factory) {
soapFaultCode.setText(prefix + ":" + qname.getLocalPart());
- OMNamespace omNamespace = new OMNamespaceImpl(qname.getNamespaceURI(),
+ OMNamespace omNamespace = factory.createOMNamespace(qname.getNamespaceURI(),
qname.getPrefix());
soapFaultCode.declareNamespace(omNamespace);
- } else if (this.element.getOMFactory() instanceof SOAP12Factory) {
+ } else if (factory instanceof SOAP12Factory) {
SOAPFaultValue soapFaultValue = soapFactory.createSOAPFaultValue(soapFaultCode);
// don't just use the default prefix, use the passed one or the parent's
soapFaultValue.setText(prefix + ":" + qname.getLocalPart());
- OMNamespace omNamespace = new OMNamespaceImpl(qname.getNamespaceURI(),
+ OMNamespace omNamespace = factory.createOMNamespace(qname.getNamespaceURI(),
qname.getPrefix());
soapFaultValue.declareNamespace(omNamespace);
soapFaultCode.setValue(soapFaultValue);