You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ru...@apache.org on 2006/03/27 10:04:59 UTC
svn commit: r389051 - in /webservices/axis2/trunk/java/modules: adb/
adb/test/org/apache/axis2/databinding/ doom/ integration/ saaj/
saaj/src/org/apache/axis2/saaj/ saaj/src/org/apache/axis2/saaj/util/
saaj/test/org/apache/axis2/saaj/ security/ securit...
Author: ruchithf
Date: Mon Mar 27 00:04:56 2006
New Revision: 389051
URL: http://svn.apache.org/viewcvs?rev=389051&view=rev
Log:
Moving doom into ws-commons axiom from axis2
Removed:
webservices/axis2/trunk/java/modules/doom/
Modified:
webservices/axis2/trunk/java/modules/adb/project.xml
webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java
webservices/axis2/trunk/java/modules/integration/project.xml
webservices/axis2/trunk/java/modules/saaj/project.xml
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/DetailEntryImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/DetailImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/MessageFactoryImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyElementImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPFactoryImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultElementImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderElementImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java
webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java
webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPNamespaceTest.java
webservices/axis2/trunk/java/modules/security/project.xml
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/impl/SCTIssuer.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java
Modified: webservices/axis2/trunk/java/modules/adb/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/adb/project.xml?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/project.xml (original)
+++ webservices/axis2/trunk/java/modules/adb/project.xml Mon Mar 27 00:04:56 2006
@@ -36,6 +36,11 @@
<artifactId>axiom-impl</artifactId>
<version>${axiom.version}</version>
</dependency>
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>axiom-dom</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-common</artifactId>
@@ -49,11 +54,6 @@
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-wsdl</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-doom</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
<dependency>
Modified: webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java (original)
+++ webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java Mon Mar 27 00:04:56 2006
@@ -23,7 +23,7 @@
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axis2.databinding.utils.ADBPullParser;
import org.apache.axis2.databinding.utils.PrintEvents;
-import org.apache.axis2.om.DOOMAbstractFactory;
+import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
import org.custommonkey.xmlunit.XMLTestCase;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
Modified: webservices/axis2/trunk/java/modules/integration/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/project.xml?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/project.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/project.xml Mon Mar 27 00:04:56 2006
@@ -59,7 +59,11 @@
<artifactId>axiom-impl</artifactId>
<version>${axiom.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>axiom-dom</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
<dependency>
<groupId>axis2</groupId>
@@ -86,11 +90,6 @@
<artifactId>axis2-common</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-doom</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
<!-- external JARs -->
<dependency>
Modified: webservices/axis2/trunk/java/modules/saaj/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/project.xml?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/project.xml (original)
+++ webservices/axis2/trunk/java/modules/saaj/project.xml Mon Mar 27 00:04:56 2006
@@ -98,7 +98,11 @@
<artifactId>axiom-impl</artifactId>
<version>${axiom.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>axiom-dom</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-core</artifactId>
@@ -118,11 +122,6 @@
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-common</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-doom</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
<dependency>
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java Mon Mar 27 00:04:56 2006
@@ -16,9 +16,9 @@
package org.apache.axis2.saaj;
import org.apache.axiom.om.OMText;
-import org.apache.axis2.om.DOOMAbstractFactory;
-import org.apache.axis2.om.impl.dom.DocumentImpl;
-import org.apache.axis2.om.impl.dom.TextImpl;
+import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
+import org.apache.axiom.om.impl.dom.DocumentImpl;
+import org.apache.axiom.om.impl.dom.TextImpl;
import org.apache.axis2.transport.http.HTTPConstants;
import javax.activation.DataHandler;
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/DetailEntryImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/DetailEntryImpl.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/DetailEntryImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/DetailEntryImpl.java Mon Mar 27 00:04:56 2006
@@ -15,7 +15,7 @@
*/
package org.apache.axis2.saaj;
-import org.apache.axis2.om.impl.dom.ElementImpl;
+import org.apache.axiom.om.impl.dom.ElementImpl;
import javax.xml.soap.DetailEntry;
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/DetailImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/DetailImpl.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/DetailImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/DetailImpl.java Mon Mar 27 00:04:56 2006
@@ -16,7 +16,7 @@
package org.apache.axis2.saaj;
import org.apache.axiom.soap.SOAPFaultDetail;
-import org.apache.axis2.om.impl.dom.ElementImpl;
+import org.apache.axiom.om.impl.dom.ElementImpl;
import javax.xml.soap.Detail;
import javax.xml.soap.DetailEntry;
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/MessageFactoryImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/MessageFactoryImpl.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/MessageFactoryImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/MessageFactoryImpl.java Mon Mar 27 00:04:56 2006
@@ -15,7 +15,7 @@
*/
package org.apache.axis2.saaj;
-import org.apache.axis2.soap.impl.dom.soap11.SOAP11Factory;
+import org.apache.axiom.soap.impl.dom.soap11.SOAP11Factory;
import javax.xml.soap.MessageFactory;
import javax.xml.soap.MimeHeaders;
@@ -125,7 +125,7 @@
*/
public SOAPMessage createMessage() throws SOAPException {
final SOAPEnvelopeImpl soapEnvelope =
- new SOAPEnvelopeImpl((org.apache.axis2.soap.impl.dom.SOAPEnvelopeImpl)
+ new SOAPEnvelopeImpl((org.apache.axiom.soap.impl.dom.SOAPEnvelopeImpl)
new SOAP11Factory().getDefaultEnvelope());
SOAPMessageImpl soapMessage = new SOAPMessageImpl(soapEnvelope);
soapMessage.setSaveRequired();
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java Mon Mar 27 00:04:56 2006
@@ -20,10 +20,10 @@
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNode;
-import org.apache.axis2.om.impl.dom.ElementImpl;
-import org.apache.axis2.om.impl.dom.NodeImpl;
-import org.apache.axis2.soap.impl.dom.SOAPBodyImpl;
-import org.apache.axis2.soap.impl.dom.SOAPEnvelopeImpl;
+import org.apache.axiom.om.impl.dom.ElementImpl;
+import org.apache.axiom.om.impl.dom.NodeImpl;
+import org.apache.axiom.soap.impl.dom.SOAPBodyImpl;
+import org.apache.axiom.soap.impl.dom.SOAPEnvelopeImpl;
import org.w3c.dom.Attr;
import org.w3c.dom.Comment;
import org.w3c.dom.DOMException;
@@ -212,50 +212,50 @@
parent, prevSiblingDOMNode, nextSiblingDOMNode);
((NodeImpl) domNode).setUserData(SAAJ_NODE, saajTextNode, null);
return saajTextNode;
- } else if (domNode instanceof org.apache.axis2.soap.impl.dom.SOAPBodyImpl) {
- org.apache.axis2.soap.impl.dom.SOAPBodyImpl doomSOAPBody = (SOAPBodyImpl) domNode;
+ } else if (domNode instanceof org.apache.axiom.soap.impl.dom.SOAPBodyImpl) {
+ org.apache.axiom.soap.impl.dom.SOAPBodyImpl doomSOAPBody = (SOAPBodyImpl) domNode;
javax.xml.soap.SOAPBody saajSOAPBody =
new org.apache.axis2.saaj.SOAPBodyImpl(doomSOAPBody);
doomSOAPBody.setUserData(SAAJ_NODE, saajSOAPBody, null);
return saajSOAPBody;
- } else if (domNode instanceof org.apache.axis2.soap.impl.dom.SOAPEnvelopeImpl) {
- org.apache.axis2.soap.impl.dom.SOAPEnvelopeImpl doomSOAPEnv
+ } else if (domNode instanceof org.apache.axiom.soap.impl.dom.SOAPEnvelopeImpl) {
+ org.apache.axiom.soap.impl.dom.SOAPEnvelopeImpl doomSOAPEnv
= (SOAPEnvelopeImpl) domNode;
javax.xml.soap.SOAPEnvelope saajEnvelope
= new org.apache.axis2.saaj.SOAPEnvelopeImpl(doomSOAPEnv);
doomSOAPEnv.setUserData(SAAJ_NODE, saajEnvelope, null);
return saajEnvelope;
- } else if (domNode instanceof org.apache.axis2.soap.impl.dom.SOAPFaultNodeImpl) {
- org.apache.axis2.soap.impl.dom.SOAPFaultNodeImpl doomSOAPFaultNode
- = (org.apache.axis2.soap.impl.dom.SOAPFaultNodeImpl) domNode;
+ } else if (domNode instanceof org.apache.axiom.soap.impl.dom.SOAPFaultNodeImpl) {
+ org.apache.axiom.soap.impl.dom.SOAPFaultNodeImpl doomSOAPFaultNode
+ = (org.apache.axiom.soap.impl.dom.SOAPFaultNodeImpl) domNode;
javax.xml.soap.SOAPFaultElement saajSOAPFaultEle
= new org.apache.axis2.saaj.SOAPFaultElementImpl(doomSOAPFaultNode);
doomSOAPFaultNode.setUserData(SAAJ_NODE, saajSOAPFaultEle, null);
return saajSOAPFaultEle;
- } else if (domNode instanceof org.apache.axis2.soap.impl.dom.SOAPFaultDetailImpl) {
- org.apache.axis2.soap.impl.dom.SOAPFaultDetailImpl doomSOAPFaultDetail
- = (org.apache.axis2.soap.impl.dom.SOAPFaultDetailImpl) domNode;
+ } else if (domNode instanceof org.apache.axiom.soap.impl.dom.SOAPFaultDetailImpl) {
+ org.apache.axiom.soap.impl.dom.SOAPFaultDetailImpl doomSOAPFaultDetail
+ = (org.apache.axiom.soap.impl.dom.SOAPFaultDetailImpl) domNode;
javax.xml.soap.Detail saajDetail
= new org.apache.axis2.saaj.DetailImpl(doomSOAPFaultDetail);
doomSOAPFaultDetail.setUserData(SAAJ_NODE, saajDetail, null);
return saajDetail;
- } else if (domNode instanceof org.apache.axis2.soap.impl.dom.SOAPFaultImpl) {
- org.apache.axis2.soap.impl.dom.SOAPFaultImpl doomSOAPFault
- = (org.apache.axis2.soap.impl.dom.SOAPFaultImpl) domNode;
+ } else if (domNode instanceof org.apache.axiom.soap.impl.dom.SOAPFaultImpl) {
+ org.apache.axiom.soap.impl.dom.SOAPFaultImpl doomSOAPFault
+ = (org.apache.axiom.soap.impl.dom.SOAPFaultImpl) domNode;
javax.xml.soap.SOAPFault saajSOAPFault
= new org.apache.axis2.saaj.SOAPFaultImpl(doomSOAPFault);
doomSOAPFault.setUserData(SAAJ_NODE, saajSOAPFault, null);
return saajSOAPFault;
- } else if (domNode instanceof org.apache.axis2.soap.impl.dom.SOAPHeaderBlockImpl) {
- org.apache.axis2.soap.impl.dom.SOAPHeaderBlockImpl doomSOAPHeaderBlock
- = (org.apache.axis2.soap.impl.dom.SOAPHeaderBlockImpl) domNode;
+ } else if (domNode instanceof org.apache.axiom.soap.impl.dom.SOAPHeaderBlockImpl) {
+ org.apache.axiom.soap.impl.dom.SOAPHeaderBlockImpl doomSOAPHeaderBlock
+ = (org.apache.axiom.soap.impl.dom.SOAPHeaderBlockImpl) domNode;
javax.xml.soap.SOAPHeaderElement saajSOAPHeaderEle
= new org.apache.axis2.saaj.SOAPHeaderElementImpl(doomSOAPHeaderBlock);
doomSOAPHeaderBlock.setUserData(SAAJ_NODE, saajSOAPHeaderEle, null);
return saajSOAPHeaderEle;
- } else if (domNode instanceof org.apache.axis2.soap.impl.dom.SOAPHeaderImpl) {
- org.apache.axis2.soap.impl.dom.SOAPHeaderImpl doomSOAPHeader
- = (org.apache.axis2.soap.impl.dom.SOAPHeaderImpl) domNode;
+ } else if (domNode instanceof org.apache.axiom.soap.impl.dom.SOAPHeaderImpl) {
+ org.apache.axiom.soap.impl.dom.SOAPHeaderImpl doomSOAPHeader
+ = (org.apache.axiom.soap.impl.dom.SOAPHeaderImpl) domNode;
javax.xml.soap.SOAPHeader saajSOAPHeader
= new org.apache.axis2.saaj.SOAPHeaderImpl(doomSOAPHeader);
doomSOAPHeader.setUserData(SAAJ_NODE, saajSOAPHeader, null);
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyElementImpl.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyElementImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyElementImpl.java Mon Mar 27 00:04:56 2006
@@ -15,7 +15,7 @@
*/
package org.apache.axis2.saaj;
-import org.apache.axis2.om.impl.dom.ElementImpl;
+import org.apache.axiom.om.impl.dom.ElementImpl;
import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPBodyElement;
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java Mon Mar 27 00:04:56 2006
@@ -17,11 +17,11 @@
import org.apache.axiom.om.OMNode;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axis2.om.impl.dom.DocumentImpl;
-import org.apache.axis2.om.impl.dom.ElementImpl;
-import org.apache.axis2.om.impl.dom.NamespaceImpl;
-import org.apache.axis2.om.impl.dom.NodeImpl;
-import org.apache.axis2.soap.impl.dom.soap11.SOAP11FaultImpl;
+import org.apache.axiom.om.impl.dom.DocumentImpl;
+import org.apache.axiom.om.impl.dom.ElementImpl;
+import org.apache.axiom.om.impl.dom.NamespaceImpl;
+import org.apache.axiom.om.impl.dom.NodeImpl;
+import org.apache.axiom.soap.impl.dom.soap11.SOAP11FaultImpl;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java Mon Mar 27 00:04:56 2006
@@ -21,10 +21,10 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.OMOutputImpl;
-import org.apache.axis2.om.impl.dom.DocumentImpl;
-import org.apache.axis2.om.impl.dom.ElementImpl;
-import org.apache.axis2.om.impl.dom.NodeImpl;
-import org.apache.axis2.om.impl.dom.TextImpl;
+import org.apache.axiom.om.impl.dom.DocumentImpl;
+import org.apache.axiom.om.impl.dom.ElementImpl;
+import org.apache.axiom.om.impl.dom.NodeImpl;
+import org.apache.axiom.om.impl.dom.TextImpl;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
@@ -46,7 +46,7 @@
/**
* Using a delegate because we can't extend from
- * org.apache.axis2.om.impl.dom.ElementImpl since this class
+ * org.apache.axiom.om.impl.dom.ElementImpl since this class
* must extend SNodeImpl
*/
protected ElementImpl element;
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java Mon Mar 27 00:04:56 2006
@@ -16,11 +16,11 @@
package org.apache.axis2.saaj;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axis2.om.impl.dom.DocumentImpl;
-import org.apache.axis2.om.impl.dom.NodeImpl;
-import org.apache.axis2.om.impl.dom.TextImpl;
-import org.apache.axis2.soap.impl.dom.soap11.SOAP11BodyImpl;
-import org.apache.axis2.soap.impl.dom.soap11.SOAP11HeaderImpl;
+import org.apache.axiom.om.impl.dom.DocumentImpl;
+import org.apache.axiom.om.impl.dom.NodeImpl;
+import org.apache.axiom.om.impl.dom.TextImpl;
+import org.apache.axiom.soap.impl.dom.soap11.SOAP11BodyImpl;
+import org.apache.axiom.soap.impl.dom.soap11.SOAP11HeaderImpl;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -35,9 +35,9 @@
*/
public class SOAPEnvelopeImpl extends SOAPElementImpl implements javax.xml.soap.SOAPEnvelope {
- private org.apache.axis2.soap.impl.dom.SOAPEnvelopeImpl omSOAPEnvelope;
+ private org.apache.axiom.soap.impl.dom.SOAPEnvelopeImpl omSOAPEnvelope;
- public SOAPEnvelopeImpl(final org.apache.axis2.soap.impl.dom.SOAPEnvelopeImpl envelope) {
+ public SOAPEnvelopeImpl(final org.apache.axiom.soap.impl.dom.SOAPEnvelopeImpl envelope) {
super(envelope);
omSOAPEnvelope = envelope;
}
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPFactoryImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPFactoryImpl.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPFactoryImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPFactoryImpl.java Mon Mar 27 00:04:56 2006
@@ -17,9 +17,9 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axis2.om.DOOMAbstractFactory;
-import org.apache.axis2.om.impl.dom.ElementImpl;
-import org.apache.axis2.om.impl.dom.factory.OMDOMFactory;
+import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
+import org.apache.axiom.om.impl.dom.ElementImpl;
+import org.apache.axiom.om.impl.dom.factory.OMDOMFactory;
import javax.xml.soap.Detail;
import javax.xml.soap.Name;
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultElementImpl.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultElementImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultElementImpl.java Mon Mar 27 00:04:56 2006
@@ -15,7 +15,7 @@
*/
package org.apache.axis2.saaj;
-import org.apache.axis2.om.impl.dom.ElementImpl;
+import org.apache.axiom.om.impl.dom.ElementImpl;
import javax.xml.soap.SOAPFaultElement;
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java Mon Mar 27 00:04:56 2006
@@ -6,13 +6,13 @@
import org.apache.axiom.soap.SOAPFaultRole;
import org.apache.axiom.soap.SOAPFaultText;
import org.apache.axiom.soap.SOAPFaultValue;
-import org.apache.axis2.om.DOOMAbstractFactory;
-import org.apache.axis2.om.impl.dom.ElementImpl;
-import org.apache.axis2.om.impl.dom.NodeImpl;
-import org.apache.axis2.soap.impl.dom.soap11.SOAP11FaultDetailImpl;
-import org.apache.axis2.soap.impl.dom.soap11.SOAP11FaultReasonImpl;
-import org.apache.axis2.soap.impl.dom.soap11.SOAP11FaultRoleImpl;
-import org.apache.axis2.soap.impl.dom.soap11.SOAP11FaultTextImpl;
+import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
+import org.apache.axiom.om.impl.dom.ElementImpl;
+import org.apache.axiom.om.impl.dom.NodeImpl;
+import org.apache.axiom.soap.impl.dom.soap11.SOAP11FaultDetailImpl;
+import org.apache.axiom.soap.impl.dom.soap11.SOAP11FaultReasonImpl;
+import org.apache.axiom.soap.impl.dom.soap11.SOAP11FaultRoleImpl;
+import org.apache.axiom.soap.impl.dom.soap11.SOAP11FaultTextImpl;
import javax.xml.namespace.QName;
import javax.xml.soap.Detail;
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderElementImpl.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderElementImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderElementImpl.java Mon Mar 27 00:04:56 2006
@@ -16,7 +16,7 @@
package org.apache.axis2.saaj;
import org.apache.axiom.soap.SOAPHeaderBlock;
-import org.apache.axis2.om.impl.dom.ElementImpl;
+import org.apache.axiom.om.impl.dom.ElementImpl;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java Mon Mar 27 00:04:56 2006
@@ -19,10 +19,10 @@
import org.apache.axiom.om.OMNode;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeaderBlock;
-import org.apache.axis2.om.impl.dom.ElementImpl;
-import org.apache.axis2.om.impl.dom.NamespaceImpl;
-import org.apache.axis2.om.impl.dom.NodeImpl;
-import org.apache.axis2.soap.impl.dom.soap11.SOAP11HeaderBlockImpl;
+import org.apache.axiom.om.impl.dom.ElementImpl;
+import org.apache.axiom.om.impl.dom.NamespaceImpl;
+import org.apache.axiom.om.impl.dom.NodeImpl;
+import org.apache.axiom.soap.impl.dom.soap11.SOAP11HeaderBlockImpl;
import javax.xml.namespace.QName;
import javax.xml.soap.Name;
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java Mon Mar 27 00:04:56 2006
@@ -17,7 +17,7 @@
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axis2.saaj.util.IDGenerator;
-import org.apache.axis2.soap.impl.dom.soap11.SOAP11Factory;
+import org.apache.axiom.soap.impl.dom.soap11.SOAP11Factory;
import org.apache.axis2.transport.http.HTTPConstants;
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
@@ -83,7 +83,7 @@
new SOAP11Factory(),
null);
org.apache.axiom.soap.SOAPEnvelope soapEnvelope = builder.getSOAPEnvelope();
- envelope = new SOAPEnvelopeImpl((org.apache.axis2.soap.impl.dom.SOAPEnvelopeImpl)soapEnvelope);
+ envelope = new SOAPEnvelopeImpl((org.apache.axiom.soap.impl.dom.SOAPEnvelopeImpl)soapEnvelope);
envelope.element.build();
this.document = envelope.getOwnerDocument();
} catch (XMLStreamException e) {
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java Mon Mar 27 00:04:56 2006
@@ -18,8 +18,8 @@
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.impl.OMOutputImpl;
-import org.apache.axis2.om.DOOMAbstractFactory;
-import org.apache.axis2.om.impl.dom.TextImpl;
+import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
+import org.apache.axiom.om.impl.dom.TextImpl;
import org.w3c.dom.DOMException;
import javax.xml.soap.SOAPElement;
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java Mon Mar 27 00:04:56 2006
@@ -22,7 +22,7 @@
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
-import org.apache.axis2.om.DOOMAbstractFactory;
+import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -69,7 +69,7 @@
* @param env An org.apache.axiom.soap.SOAPEnvelope instance
* @return the org.apache.axis2.soap.impl.dom.SOAPEnvelopeImpl of the given SOAP Envelope
*/
- public static org.apache.axis2.soap.impl.dom.SOAPEnvelopeImpl
+ public static org.apache.axiom.soap.impl.dom.SOAPEnvelopeImpl
toDOOMSOAPEnvelope(org.apache.axiom.soap.SOAPEnvelope env) {
env.build();
@@ -89,7 +89,7 @@
SOAPEnvelope envelope = (stAXSOAPModelBuilder).getSOAPEnvelope();
envelope.build();
- return (org.apache.axis2.soap.impl.dom.SOAPEnvelopeImpl) envelope;
+ return (org.apache.axiom.soap.impl.dom.SOAPEnvelopeImpl) envelope;
}
public static org.apache.axiom.soap.SOAPEnvelope
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java Mon Mar 27 00:04:56 2006
@@ -16,7 +16,7 @@
package org.apache.axis2.saaj;
import junit.framework.TestCase;
-import org.apache.axis2.om.impl.dom.NodeImpl;
+import org.apache.axiom.om.impl.dom.NodeImpl;
import javax.xml.soap.MessageFactory;
import javax.xml.soap.Name;
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPNamespaceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPNamespaceTest.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPNamespaceTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPNamespaceTest.java Mon Mar 27 00:04:56 2006
@@ -24,6 +24,10 @@
import junit.framework.TestCase;
+/**
+ * Ref: JIRA- Axis2-517
+ *
+ */
public class SOAPNamespaceTest extends TestCase {
public SOAPNamespaceTest(String arg0) {
Modified: webservices/axis2/trunk/java/modules/security/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/project.xml?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/project.xml (original)
+++ webservices/axis2/trunk/java/modules/security/project.xml Mon Mar 27 00:04:56 2006
@@ -36,6 +36,11 @@
<artifactId>axiom-impl</artifactId>
<version>${axiom.version}</version>
</dependency>
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>axiom-dom</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-common</artifactId>
@@ -61,12 +66,7 @@
<groupId>axis2</groupId>
<artifactId>axis2-adb</artifactId>
<version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-doom</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
+ </dependency>
<!-- external JARs -->
<dependency>
<groupId>axis</groupId>
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java Mon Mar 27 00:04:56 2006
@@ -17,13 +17,13 @@
package org.apache.axis2.security;
import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.impl.dom.jaxp.DocumentBuilderFactoryImpl;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.om.impl.dom.jaxp.DocumentBuilderFactoryImpl;
import org.apache.axis2.security.handler.WSDoAllHandler;
import org.apache.axis2.security.handler.WSSHandlerConstants;
import org.apache.axis2.security.util.Axis2Util;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java Mon Mar 27 00:04:56 2006
@@ -16,11 +16,11 @@
package org.apache.axis2.security;
+import org.apache.axiom.om.impl.dom.jaxp.DocumentBuilderFactoryImpl;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.om.impl.dom.jaxp.DocumentBuilderFactoryImpl;
import org.apache.axis2.security.handler.WSDoAllHandler;
import org.apache.axis2.security.handler.WSSHandlerConstants;
import org.apache.axis2.security.util.Axis2Util;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/impl/SCTIssuer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/impl/SCTIssuer.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/impl/SCTIssuer.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/impl/SCTIssuer.java Mon Mar 27 00:04:56 2006
@@ -17,10 +17,10 @@
package org.apache.axis2.security.trust.impl;
import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.DOOMAbstractFactory;
import org.apache.axis2.security.trust.Constants;
import org.apache.axis2.security.trust.SimpleTokenStore;
import org.apache.axis2.security.trust.Token;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java?rev=389051&r1=389050&r2=389051&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java Mon Mar 27 00:04:56 2006
@@ -18,12 +18,12 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
-import org.apache.axis2.om.DOOMAbstractFactory;
import org.apache.axis2.security.handler.WSSHandlerConstants;
import org.apache.ws.security.WSSecurityException;
import org.apache.xml.security.utils.XMLUtils;
@@ -35,6 +35,7 @@
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;