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 ch...@apache.org on 2006/03/24 08:33:20 UTC
svn commit: r388431 [7/7] - in /webservices/axis2/trunk/java:
modules/adb/src/org/apache/axis2/databinding/typemapping/
modules/adb/src/org/apache/axis2/databinding/utils/
modules/adb/test/org/apache/axis2/databinding/
modules/adb/test/org/apache/axis2...
Modified: webservices/axis2/trunk/java/modules/samples/src/userguide/example2/MyService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/userguide/example2/MyService.java?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/userguide/example2/MyService.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/userguide/example2/MyService.java Thu Mar 23 23:32:50 2006
@@ -17,7 +17,7 @@
package userguide.example2;
-import org.apache.ws.commons.om.OMElement;
+import org.apache.axiom.om.OMElement;
import javax.xml.stream.XMLStreamException;
Modified: webservices/axis2/trunk/java/modules/samples/src/userguide/example3/MyService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/userguide/example3/MyService.java?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/userguide/example3/MyService.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/userguide/example3/MyService.java Thu Mar 23 23:32:50 2006
@@ -15,7 +15,7 @@
*/
package userguide.example3;
-import org.apache.ws.commons.om.OMElement;
+import org.apache.axiom.om.OMElement;
import javax.xml.stream.XMLStreamException;
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=388431&r1=388430&r2=388431&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 Thu Mar 23 23:32:50 2006
@@ -16,6 +16,7 @@
package org.apache.axis2.security;
+import org.apache.axiom.om.OMException;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.context.MessageContext;
@@ -27,7 +28,6 @@
import org.apache.axis2.security.util.HandlerParameterDecoder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.commons.om.OMException;
import org.apache.ws.commons.soap.SOAPHeader;
import org.apache.ws.commons.soap.SOAPHeaderBlock;
import org.apache.ws.security.SOAPConstants;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/InflowConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/InflowConfiguration.java?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/InflowConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/InflowConfiguration.java Thu Mar 23 23:32:50 2006
@@ -16,12 +16,12 @@
package org.apache.axis2.security.handler.config;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.security.handler.WSSHandlerConstants;
-import org.apache.ws.commons.om.OMAbstractFactory;
-import org.apache.ws.commons.om.OMElement;
-import org.apache.ws.commons.om.OMFactory;
-import org.apache.ws.commons.om.OMNamespace;
import org.apache.ws.security.handler.WSHandlerConstants;
import java.util.HashMap;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/OutflowConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/OutflowConfiguration.java?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/OutflowConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/OutflowConfiguration.java Thu Mar 23 23:32:50 2006
@@ -16,12 +16,12 @@
package org.apache.axis2.security.handler.config;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.security.handler.WSSHandlerConstants;
-import org.apache.ws.commons.om.OMAbstractFactory;
-import org.apache.ws.commons.om.OMElement;
-import org.apache.ws.commons.om.OMFactory;
-import org.apache.ws.commons.om.OMNamespace;
import org.apache.ws.security.handler.WSHandlerConstants;
import java.util.HashMap;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/STSMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/STSMessageReceiver.java?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/STSMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/STSMessageReceiver.java Thu Mar 23 23:32:50 2006
@@ -16,14 +16,14 @@
package org.apache.axis2.security.trust;
-import javax.xml.namespace.QName;
-
+import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
-import org.apache.ws.commons.om.OMElement;
import org.apache.ws.commons.soap.SOAPEnvelope;
+
+import javax.xml.namespace.QName;
public class STSMessageReceiver extends AbstractInOutSyncMessageReceiver {
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/Token.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/Token.java?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/Token.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/Token.java Thu Mar 23 23:32:50 2006
@@ -16,7 +16,7 @@
package org.apache.axis2.security.trust;
-import org.apache.ws.commons.om.OMElement;
+import org.apache.axiom.om.OMElement;
import java.util.HashMap;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenCanceler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenCanceler.java?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenCanceler.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenCanceler.java Thu Mar 23 23:32:50 2006
@@ -16,8 +16,8 @@
package org.apache.axis2.security.trust;
+import org.apache.axiom.om.OMElement;
import org.apache.axis2.context.MessageContext;
-import org.apache.ws.commons.om.OMElement;
import org.apache.ws.commons.soap.SOAPEnvelope;
public interface TokenCanceler {
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenIssuer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenIssuer.java?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenIssuer.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenIssuer.java Thu Mar 23 23:32:50 2006
@@ -16,8 +16,8 @@
package org.apache.axis2.security.trust;
+import org.apache.axiom.om.OMElement;
import org.apache.axis2.context.MessageContext;
-import org.apache.ws.commons.om.OMElement;
import org.apache.ws.commons.soap.SOAPEnvelope;
/**
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenRequestDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenRequestDispatcher.java?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenRequestDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenRequestDispatcher.java Thu Mar 23 23:32:50 2006
@@ -16,14 +16,14 @@
package org.apache.axis2.security.trust;
-import javax.xml.namespace.QName;
-
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.databinding.types.URI;
import org.apache.axis2.security.trust.types.RequestSecurityTokenType;
-import org.apache.ws.commons.om.OMElement;
-import org.apache.ws.commons.om.impl.builder.StAXOMBuilder;
import org.apache.ws.commons.soap.SOAPEnvelope;
+
+import javax.xml.namespace.QName;
public class TokenRequestDispatcher {
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenRequestDispatcherConfig.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenRequestDispatcherConfig.java?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenRequestDispatcherConfig.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenRequestDispatcherConfig.java Thu Mar 23 23:32:50 2006
@@ -16,8 +16,8 @@
package org.apache.axis2.security.trust;
-import org.apache.ws.commons.om.OMElement;
-import org.apache.ws.commons.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.ws.security.util.Loader;
import javax.xml.namespace.QName;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenValidator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenValidator.java?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenValidator.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenValidator.java Thu Mar 23 23:32:50 2006
@@ -16,8 +16,8 @@
package org.apache.axis2.security.trust;
+import org.apache.axiom.om.OMElement;
import org.apache.axis2.context.MessageContext;
-import org.apache.ws.commons.om.OMElement;
import org.apache.ws.commons.soap.SOAPEnvelope;
public interface TokenValidator {
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenVerifier.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenVerifier.java?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenVerifier.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/TokenVerifier.java Thu Mar 23 23:32:50 2006
@@ -16,8 +16,8 @@
package org.apache.axis2.security.trust;
+import org.apache.axiom.om.OMElement;
import org.apache.axis2.context.MessageContext;
-import org.apache.ws.commons.om.OMElement;
import org.apache.ws.commons.soap.SOAPEnvelope;
public interface TokenVerifier {
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=388431&r1=388430&r2=388431&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 Thu Mar 23 23:32:50 2006
@@ -16,13 +16,13 @@
package org.apache.axis2.security.trust.impl;
+import org.apache.axiom.om.OMElement;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.om.DOOMAbstractFactory;
import org.apache.axis2.security.trust.Constants;
import org.apache.axis2.security.trust.TokenIssuer;
import org.apache.axis2.security.trust.TrustException;
-import org.apache.ws.commons.om.OMElement;
import org.apache.ws.commons.soap.SOAP11Constants;
import org.apache.ws.commons.soap.SOAPEnvelope;
import org.apache.ws.security.WSConstants;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/types/RequestSecurityTokenResponseType.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/types/RequestSecurityTokenResponseType.java?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/types/RequestSecurityTokenResponseType.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/types/RequestSecurityTokenResponseType.java Thu Mar 23 23:32:50 2006
@@ -96,7 +96,7 @@
* field for ExtraElement* This was an Array!
*/
- protected org.apache.ws.commons.om.OMElement[] localExtraElement;
+ protected org.apache.axiom.om.OMElement[] localExtraElement;
/*
* This tracker boolean wil be used to detect whether the user called the
@@ -108,9 +108,9 @@
/**
* Auto generated getter method
*
- * @return org.apache.ws.commons.om.OMElement[]
+ * @return org.apache.axiom.om.OMElement[]
*/
- public org.apache.ws.commons.om.OMElement[] getExtraElement() {
+ public org.apache.axiom.om.OMElement[] getExtraElement() {
return localExtraElement;
}
@@ -118,7 +118,7 @@
* validate the array for ExtraElement
*/
protected void validateExtraElement(
- org.apache.ws.commons.om.OMElement[] param) {
+ org.apache.axiom.om.OMElement[] param) {
}
@@ -128,7 +128,7 @@
* @param param
* ExtraElement
*/
- public void setExtraElement(org.apache.ws.commons.om.OMElement[] param) {
+ public void setExtraElement(org.apache.axiom.om.OMElement[] param) {
validateExtraElement(param);
@@ -142,17 +142,17 @@
* Auto generated add method for the array for convenience
*
* @param param
- * org.apache.ws.commons.om.OMElement
+ * org.apache.axiom.om.OMElement
*/
- public void addExtraElement(org.apache.ws.commons.om.OMElement param) {
+ public void addExtraElement(org.apache.axiom.om.OMElement param) {
if (localExtraElement == null) {
- localExtraElement = new org.apache.ws.commons.om.OMElement[] {};
+ localExtraElement = new org.apache.axiom.om.OMElement[] {};
}
java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil
.toList(localExtraElement);
list.add(param);
- this.localExtraElement = (org.apache.ws.commons.om.OMElement[]) list
- .toArray(new org.apache.ws.commons.om.OMElement[list.size()]);
+ this.localExtraElement = (org.apache.axiom.om.OMElement[]) list
+ .toArray(new org.apache.axiom.om.OMElement[list.size()]);
}
@@ -323,9 +323,9 @@
}
object
- .setExtraElement((org.apache.ws.commons.om.OMElement[]) org.apache.axis2.databinding.utils.ConverterUtil
+ .setExtraElement((org.apache.axiom.om.OMElement[]) org.apache.axis2.databinding.utils.ConverterUtil
.convertToArray(
- org.apache.ws.commons.om.OMElement.class,
+ org.apache.axiom.om.OMElement.class,
list3));
} catch (javax.xml.stream.XMLStreamException e) {
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/types/RequestSecurityTokenType.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/types/RequestSecurityTokenType.java?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/types/RequestSecurityTokenType.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/types/RequestSecurityTokenType.java Thu Mar 23 23:32:50 2006
@@ -97,7 +97,7 @@
* field for ExtraElement* This was an Array!
*/
- protected org.apache.ws.commons.om.OMElement[] localExtraElement;
+ protected org.apache.axiom.om.OMElement[] localExtraElement;
/*
* This tracker boolean wil be used to detect whether the user called the
@@ -109,9 +109,9 @@
/**
* Auto generated getter method
*
- * @return org.apache.ws.commons.om.OMElement[]
+ * @return org.apache.axiom.om.OMElement[]
*/
- public org.apache.ws.commons.om.OMElement[] getExtraElement() {
+ public org.apache.axiom.om.OMElement[] getExtraElement() {
return localExtraElement;
}
@@ -119,7 +119,7 @@
* validate the array for ExtraElement
*/
protected void validateExtraElement(
- org.apache.ws.commons.om.OMElement[] param) {
+ org.apache.axiom.om.OMElement[] param) {
}
@@ -129,7 +129,7 @@
* @param param
* ExtraElement
*/
- public void setExtraElement(org.apache.ws.commons.om.OMElement[] param) {
+ public void setExtraElement(org.apache.axiom.om.OMElement[] param) {
validateExtraElement(param);
@@ -143,17 +143,17 @@
* Auto generated add method for the array for convenience
*
* @param param
- * org.apache.ws.commons.om.OMElement
+ * org.apache.axiom.om.OMElement
*/
- public void addExtraElement(org.apache.ws.commons.om.OMElement param) {
+ public void addExtraElement(org.apache.axiom.om.OMElement param) {
if (localExtraElement == null) {
- localExtraElement = new org.apache.ws.commons.om.OMElement[] {};
+ localExtraElement = new org.apache.axiom.om.OMElement[] {};
}
java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil
.toList(localExtraElement);
list.add(param);
- this.localExtraElement = (org.apache.ws.commons.om.OMElement[]) list
- .toArray(new org.apache.ws.commons.om.OMElement[list.size()]);
+ this.localExtraElement = (org.apache.axiom.om.OMElement[]) list
+ .toArray(new org.apache.axiom.om.OMElement[list.size()]);
}
@@ -342,9 +342,9 @@
}
object
- .setExtraElement((org.apache.ws.commons.om.OMElement[]) org.apache.axis2.databinding.utils.ConverterUtil
+ .setExtraElement((org.apache.axiom.om.OMElement[]) org.apache.axis2.databinding.utils.ConverterUtil
.convertToArray(
- org.apache.ws.commons.om.OMElement.class,
+ org.apache.axiom.om.OMElement.class,
list3));
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/types/RequestedSecurityTokenType.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/types/RequestedSecurityTokenType.java?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/types/RequestedSecurityTokenType.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/types/RequestedSecurityTokenType.java Thu Mar 23 23:32:50 2006
@@ -23,14 +23,14 @@
* field for ExtraElement
*/
- protected org.apache.ws.commons.om.OMElement localExtraElement;
+ protected org.apache.axiom.om.OMElement localExtraElement;
/**
* Auto generated getter method
*
- * @return org.apache.ws.commons.om.OMElement
+ * @return org.apache.axiom.om.OMElement
*/
- public org.apache.ws.commons.om.OMElement getExtraElement() {
+ public org.apache.axiom.om.OMElement getExtraElement() {
return localExtraElement;
}
@@ -40,7 +40,7 @@
* @param param
* ExtraElement
*/
- public void setExtraElement(org.apache.ws.commons.om.OMElement param) {
+ public void setExtraElement(org.apache.axiom.om.OMElement param) {
this.localExtraElement = param;
}
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=388431&r1=388430&r2=388431&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 Thu Mar 23 23:32:50 2006
@@ -16,10 +16,10 @@
package org.apache.axis2.security.util;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axis2.om.DOOMAbstractFactory;
import org.apache.axis2.security.handler.WSSHandlerConstants;
-import org.apache.ws.commons.om.OMElement;
-import org.apache.ws.commons.om.impl.builder.StAXOMBuilder;
import org.apache.ws.commons.soap.SOAP11Constants;
import org.apache.ws.commons.soap.SOAP12Constants;
import org.apache.ws.commons.soap.SOAPEnvelope;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/HandlerParameterDecoder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/HandlerParameterDecoder.java?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/HandlerParameterDecoder.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/HandlerParameterDecoder.java Thu Mar 23 23:32:50 2006
@@ -15,13 +15,13 @@
*/
package org.apache.axis2.security.util;
+import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.security.handler.WSSHandlerConstants;
import org.apache.axis2.security.handler.config.InflowConfiguration;
import org.apache.axis2.security.handler.config.OutflowConfiguration;
-import org.apache.ws.commons.om.OMElement;
import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.handler.WSHandlerConstants;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/MessageOptimizer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/MessageOptimizer.java?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/MessageOptimizer.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/MessageOptimizer.java Thu Mar 23 23:32:50 2006
@@ -16,9 +16,9 @@
package org.apache.axis2.security.util;
-import org.apache.ws.commons.om.OMElement;
-import org.apache.ws.commons.om.OMText;
-import org.apache.ws.commons.om.xpath.AXIOMXPath;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMText;
+import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.ws.commons.soap.SOAPEnvelope;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSecurityException;
Modified: webservices/axis2/trunk/java/modules/security/test/org/apache/axis2/security/trust/TempIssuer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/test/org/apache/axis2/security/trust/TempIssuer.java?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/test/org/apache/axis2/security/trust/TempIssuer.java (original)
+++ webservices/axis2/trunk/java/modules/security/test/org/apache/axis2/security/trust/TempIssuer.java Thu Mar 23 23:32:50 2006
@@ -16,8 +16,8 @@
package org.apache.axis2.security.trust;
+import org.apache.axiom.om.OMElement;
import org.apache.axis2.context.MessageContext;
-import org.apache.ws.commons.om.OMElement;
import org.apache.ws.commons.soap.SOAPEnvelope;
public class TempIssuer implements TokenIssuer {
@@ -28,7 +28,7 @@
}
/* (non-Javadoc)
- * @see org.apache.axis2.security.trust.TokenIssuer#getResponseAction(org.apache.ws.commons.om.OMElement, org.apache.axis2.context.MessageContext)
+ * @see org.apache.axis2.security.trust.TokenIssuer#getResponseAction(org.apache.axiom.om.OMElement, org.apache.axis2.context.MessageContext)
*/
public String getResponseAction(OMElement request, MessageContext inMsgCtx) throws TrustException {
// TODO TODO
Modified: webservices/axis2/trunk/java/modules/webapp/HappyAxis.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/HappyAxis.jsp?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/HappyAxis.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/HappyAxis.jsp Thu Mar 23 23:32:50 2006
@@ -1,25 +1,21 @@
<html>
-<%@ page import="org.apache.axis2.AxisFault,
+<%@ page import="org.apache.axiom.om.OMAbstractFactory,
+ org.apache.axis2.AxisFault,
org.apache.axis2.Constants,
org.apache.axis2.addressing.EndpointReference,
org.apache.axis2.client.Options,
org.apache.axis2.client.ServiceClient,
- org.apache.ws.commons.om.OMAbstractFactory,
- org.apache.ws.commons.om.OMElement,
- org.apache.ws.commons.om.OMFactory,
- org.apache.ws.commons.om.OMNamespace,
javax.servlet.ServletContext,
javax.servlet.http.HttpServletRequest,
javax.servlet.http.HttpServletResponse,
javax.servlet.jsp.JspWriter,
- javax.xml.parsers.SAXParser"
+ javax.xml.parsers.SAXParser,
+ javax.xml.parsers.SAXParserFactory,
+ javax.xml.stream.XMLOutputFactory,
+ javax.xml.stream.XMLStreamException"
session="false" %>
-<%@ page import="javax.xml.parsers.SAXParserFactory" %>
-<%@ page import="javax.xml.stream.XMLOutputFactory" %>
-<%@ page import="javax.xml.stream.XMLStreamException" %>
<%@ page import="java.io.IOException" %>
<%@ page import="java.io.InputStream" %>
-
<%@ page import="java.io.StringWriter" %>
<%
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/TypeTable.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/TypeTable.java?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/TypeTable.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/TypeTable.java Thu Mar 23 23:32:50 2006
@@ -1,7 +1,7 @@
package org.apache.axis2.wsdl.builder;
+import org.apache.axiom.om.OMElement;
import org.apache.axis2.namespace.Constants;
-import org.apache.ws.commons.om.OMElement;
import javax.xml.namespace.QName;
import java.util.ArrayList;
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java Thu Mar 23 23:32:50 2006
@@ -1,12 +1,12 @@
package org.apache.axis2.wsdl.writer;
import com.ibm.wsdl.util.xml.DOM2Writer;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axis2.namespace.Constants;
import org.apache.axis2.wsdl.WSDLVersionWrapper;
-import org.apache.ws.commons.om.OMAbstractFactory;
-import org.apache.ws.commons.om.OMElement;
-import org.apache.ws.commons.om.OMFactory;
-import org.apache.ws.commons.om.impl.builder.StAXOMBuilder;
import org.apache.ws.policy.Policy;
import org.apache.ws.policy.PolicyReference;
import org.apache.ws.policy.util.PolicyFactory;
Modified: webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WOMInputOutputTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WOMInputOutputTest.java?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WOMInputOutputTest.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WOMInputOutputTest.java Thu Mar 23 23:32:50 2006
@@ -1,13 +1,13 @@
package org.apache.axis2.wsdl.writer;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMText;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axis2.wsdl.WSDLVersionWrapper;
import org.apache.axis2.wsdl.builder.WOMBuilder;
import org.apache.axis2.wsdl.builder.WOMBuilderFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.commons.om.OMElement;
-import org.apache.ws.commons.om.OMText;
-import org.apache.ws.commons.om.impl.builder.StAXOMBuilder;
import org.custommonkey.xmlunit.XMLTestCase;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
Modified: webservices/axis2/trunk/java/xdocs/0_95/OMTutorial.html
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/xdocs/0_95/OMTutorial.html?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/xdocs/0_95/OMTutorial.html (original)
+++ webservices/axis2/trunk/java/xdocs/0_95/OMTutorial.html Thu Mar 23 23:32:50 2006
@@ -628,9 +628,9 @@
<h2>Appendix</h2>
<h3>Program Listing for complete OM - build and serialize</h3>
-<pre class="code">import org.apache.ws.commons.om.SOAPEnvelope;
-import org.apache.ws.commons.om.OMFactory;
-import org.apache.ws.commons.om.OMXMLParserWrapper;
+<pre class="code">import org.apache.axiom.om.SOAPEnvelope;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axis2.impl.llom.factory.OMXMLBuilderFactory;
import javax.xml.stream.*;
Modified: webservices/axis2/trunk/java/xdocs/latest/OMTutorial.html
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/xdocs/latest/OMTutorial.html?rev=388431&r1=388430&r2=388431&view=diff
==============================================================================
--- webservices/axis2/trunk/java/xdocs/latest/OMTutorial.html (original)
+++ webservices/axis2/trunk/java/xdocs/latest/OMTutorial.html Thu Mar 23 23:32:50 2006
@@ -628,9 +628,9 @@
<h2>Appendix</h2>
<h3>Program Listing for complete OM - build and serialize</h3>
-<pre class="code">import org.apache.ws.commons.om.SOAPEnvelope;
-import org.apache.ws.commons.om.OMFactory;
-import org.apache.ws.commons.om.OMXMLParserWrapper;
+<pre class="code">import org.apache.axiom.om.SOAPEnvelope;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axis2.impl.llom.factory.OMXMLBuilderFactory;
import javax.xml.stream.*;