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 de...@apache.org on 2006/04/08 09:23:49 UTC
svn commit: r392490 [2/2] - in /webservices/axis2/trunk/java/modules: adb/
addressing/ addressing/src/org/apache/axis2/handlers/addressing/
codegen/src/org/apache/axis2/wsdl/codegen/
codegen/src/org/apache/axis2/wsdl/codegen/emitter/ codegen/src/org/ap...
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java?rev=392490&r1=392489&r2=392490&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java Sat Apr 8 00:23:42 2006
@@ -18,38 +18,21 @@
package org.apache.axis2.util;
import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPFaultCode;
-import org.apache.axiom.soap.SOAPFaultSubCode;
-import org.apache.axiom.soap.SOAPFaultValue;
+import org.apache.axiom.soap.*;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.RelatesTo;
import org.apache.axis2.client.Options;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.context.ServiceGroupContext;
-import org.apache.axis2.description.AxisModule;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.AxisServiceGroup;
-import org.apache.axis2.description.Flow;
-import org.apache.axis2.description.HandlerDescription;
-import org.apache.axis2.description.InOutAxisOperation;
-import org.apache.axis2.description.OutInAxisOperation;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.PhaseRule;
+import org.apache.axis2.context.*;
+import org.apache.axis2.description.*;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.Handler;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
-import org.apache.wsdl.WSDLService;
import javax.xml.namespace.QName;
import java.io.File;
@@ -57,7 +40,6 @@
import java.util.Iterator;
public class Utils {
-
public static void addHandler(Flow flow, Handler handler, String phaseName) {
HandlerDescription handlerDesc = new HandlerDescription();
PhaseRule rule = new PhaseRule(phaseName);
@@ -140,7 +122,7 @@
AxisOperation axisOp = new InOutAxisOperation(opName);
axisOp.setMessageReceiver(messageReceiver);
- axisOp.setStyle(WSDLService.STYLE_RPC);
+ axisOp.setStyle(WSDLConstants.STYLE_RPC);
service.addOperation(axisOp);
service.mapActionToOperation(Constants.AXIS2_NAMESPACE_URI + "/" + opName.getLocalPart(), axisOp);
@@ -160,7 +142,7 @@
AxisOperation axisOp = new OutInAxisOperation(opName);
axisOp.setMessageReceiver(messageReceiver);
- axisOp.setStyle(WSDLService.STYLE_RPC);
+ axisOp.setStyle(WSDLConstants.STYLE_RPC);
service.addOperation(axisOp);
return service;
@@ -342,7 +324,7 @@
public static boolean isExplicitlyTrue(MessageContext messageContext, String propertyName) {
Boolean flag = (Boolean) messageContext.getProperty(propertyName);
- if(flag != null) {
+ if (flag != null) {
return flag.booleanValue();
}
return false;
Added: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/wsdl/SOAPHeaderMessage.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/wsdl/SOAPHeaderMessage.java?rev=392490&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/wsdl/SOAPHeaderMessage.java (added)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/wsdl/SOAPHeaderMessage.java Sat Apr 8 00:23:42 2006
@@ -0,0 +1,96 @@
+package org.apache.axis2.wsdl;
+
+import org.apache.axis2.namespace.Constants;
+
+import javax.xml.namespace.QName;
+/*
+* Copyright 2004,2005 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*
+*/
+
+public class SOAPHeaderMessage {
+
+ public static final QName SOAP_11_HEADER = new QName(
+ Constants.URI_WSDL11_SOAP, "header");
+ public static final QName SOAP_12_HEADER = new QName(
+ Constants.URI_WSDL12_SOAP, "header");
+
+ private QName messageName = null;
+ private String part = null;
+ private QName element = null;
+ private QName type;
+ private String use;
+ private String namespaceURI;
+ private boolean required;
+
+
+ public SOAPHeaderMessage() {
+ this.type = SOAP_11_HEADER;
+ }
+
+ public SOAPHeaderMessage(QName type) {
+ this.type = type;
+ }
+
+ public QName getMessage() {
+ return messageName;
+ }
+
+ public void setMessage(QName message) {
+ this.messageName = message;
+ }
+
+ public String part() {
+ return part;
+ }
+
+ public void setPart(String part) {
+ this.part = part;
+ }
+
+ public QName getElement() {
+ return element;
+ }
+
+ public void setElement(QName element) {
+ this.element = element;
+ }
+
+ public String getUse() {
+ return use;
+ }
+
+ public void setUse(String use) {
+ this.use = use;
+ }
+
+ public String getNamespaceURI() {
+ return namespaceURI;
+ }
+
+ public void setNamespaceURI(String namespaceURI) {
+ this.namespaceURI = namespaceURI;
+ }
+
+ public boolean isRequired() {
+ return required;
+ }
+
+ public void setRequired(boolean required) {
+ this.required = required;
+ }
+}
+
Modified: webservices/axis2/trunk/java/modules/integration/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/project.xml?rev=392490&r1=392489&r2=392490&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/project.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/project.xml Sat Apr 8 00:23:42 2006
@@ -32,12 +32,7 @@
<artifactId>axis2-core</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-wsdl</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
+ <dependency>
<groupId>axis2</groupId>
<artifactId>axis2-security</artifactId>
<version>${pom.currentVersion}</version>
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/SunClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/SunClient.java?rev=392490&r1=392489&r2=392490&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/SunClient.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/SunClient.java Sat Apr 8 00:23:42 2006
@@ -19,6 +19,7 @@
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
@@ -27,7 +28,6 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.MessageContextConstants;
-import org.apache.wsdl.WSDLConstants;
import java.net.URL;
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java?rev=392490&r1=392489&r2=392490&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java Sat Apr 8 00:23:42 2006
@@ -34,14 +34,13 @@
import org.apache.axis2.engine.util.FaultHandler;
import org.apache.axis2.engine.util.TestConstants;
import org.apache.axis2.integration.UtilServer;
-import org.apache.wsdl.WSDLConstants;
+import org.apache.axis2.wsdl.WSDLConstants;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.util.ArrayList;
-import java.util.Map;
public class FaultHandlingTest extends TestCase implements TestConstants {
@@ -180,7 +179,7 @@
options.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
sender.setOptions(options);
- sender.sendReceive(payload).toString();
+ sender.sendReceive(payload).toString();
} catch (AxisFault axisFault) {
assertTrue(axisFault.getFaultCodeElement().toString().indexOf(FaultHandler.M_FAULT_EXCEPTION) > -1);
assertTrue(axisFault.getFaultDetailElement().toString().indexOf(FaultHandler.DETAIL_MORE_INFO) > -1);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java?rev=392490&r1=392489&r2=392490&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java Sat Apr 8 00:23:42 2006
@@ -27,6 +27,7 @@
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
@@ -37,7 +38,6 @@
import org.apache.axis2.engine.util.TestConstants;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.util.Utils;
-import org.apache.wsdl.WSDLConstants;
import javax.xml.namespace.QName;
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceCreateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceCreateTest.java?rev=392490&r1=392489&r2=392490&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceCreateTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceCreateTest.java Sat Apr 8 00:23:42 2006
@@ -4,6 +4,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.context.ConfigurationContext;
@@ -13,7 +14,6 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.rpc.client.RPCServiceClient;
-import org.apache.wsdl.WSDLConstants;
import javax.xml.namespace.QName;
import java.util.ArrayList;
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java?rev=392490&r1=392489&r2=392490&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java Sat Apr 8 00:23:42 2006
@@ -26,13 +26,13 @@
import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
import org.apache.axis2.swa.EchoRawSwATest;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.httpclient.*;
import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.params.HttpMethodParams;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.wsdl.WSDLService;
import javax.xml.namespace.QName;
import java.io.IOException;
@@ -63,7 +63,7 @@
AxisOperation axisOp = new OutInAxisOperation(operationName);
axisOp.setMessageReceiver(new RawXMLINOutMessageReceiver());
- axisOp.setStyle(WSDLService.STYLE_DOC);
+ axisOp.setStyle(WSDLConstants.STYLE_DOC);
service.addOperation(axisOp);
UtilServer.deployService(service);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java?rev=392490&r1=392489&r2=392490&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java Sat Apr 8 00:23:42 2006
@@ -26,6 +26,7 @@
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
@@ -46,8 +47,6 @@
import org.apache.axis2.rpc.receivers.RPCMessageReceiver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.wsdl.WSDLConstants;
-import org.apache.wsdl.WSDLService;
import javax.xml.namespace.QName;
import javax.xml.stream.FactoryConfigurationError;
@@ -99,7 +98,7 @@
className));
AxisOperation axisOp = new InOutAxisOperation(operationName);
axisOp.setMessageReceiver(new RPCMessageReceiver());
- axisOp.setStyle(WSDLService.STYLE_RPC);
+ axisOp.setStyle(WSDLConstants.STYLE_RPC);
service.addOperation(axisOp);
UtilServer.deployService(service);
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java?rev=392490&r1=392489&r2=392490&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java Sat Apr 8 00:23:42 2006
@@ -23,6 +23,7 @@
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.context.ConfigurationContext;
@@ -41,7 +42,6 @@
import org.apache.axis2.rpc.receivers.RPCMessageReceiver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.wsdl.WSDLService;
import javax.xml.namespace.QName;
import javax.xml.stream.FactoryConfigurationError;
@@ -139,7 +139,7 @@
className));
AxisOperation axisOp = new InOutAxisOperation(operationName);
axisOp.setMessageReceiver(new RPCMessageReceiver());
- axisOp.setStyle(WSDLService.STYLE_RPC);
+ axisOp.setStyle(WSDLConstants.STYLE_RPC);
service.addOperation(axisOp);
UtilServer.deployService(service);
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java?rev=392490&r1=392489&r2=392490&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java Sat Apr 8 00:23:42 2006
@@ -28,9 +28,9 @@
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.wsdl.WSDLService;
import javax.xml.namespace.QName;
import java.io.BufferedReader;
@@ -69,11 +69,11 @@
service = new AxisService(serviceName.getLocalPart());
service.setClassLoader(Thread.currentThread().getContextClassLoader());
service.addParameter(new Parameter(
- AbstractMessageReceiver.SERVICE_CLASS, EchoSwA.class
- .getName()));
+ AbstractMessageReceiver.SERVICE_CLASS, EchoSwA.class
+ .getName()));
AxisOperation axisOp = new OutInAxisOperation(operationName);
axisOp.setMessageReceiver(new RawXMLINOutMessageReceiver());
- axisOp.setStyle(WSDLService.STYLE_DOC);
+ axisOp.setStyle(WSDLConstants.STYLE_DOC);
service.addOperation(axisOp);
UtilServer.deployService(service);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoSwA.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoSwA.java?rev=392490&r1=392489&r2=392490&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoSwA.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoSwA.java Sat Apr 8 00:23:42 2006
@@ -23,9 +23,9 @@
import org.apache.axiom.om.impl.MTOMConstants;
import org.apache.axiom.om.impl.llom.OMTextImpl;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
-import org.apache.wsdl.WSDLConstants;
import javax.activation.DataHandler;
import javax.xml.namespace.QName;
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java?rev=392490&r1=392489&r2=392490&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java Sat Apr 8 00:23:42 2006
@@ -26,6 +26,7 @@
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
@@ -44,7 +45,6 @@
import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.wsdl.WSDLConstants;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLOutputFactory;
Modified: webservices/axis2/trunk/java/modules/saaj/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/project.xml?rev=392490&r1=392489&r2=392490&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/project.xml (original)
+++ webservices/axis2/trunk/java/modules/saaj/project.xml Sat Apr 8 00:23:42 2006
@@ -83,12 +83,7 @@
</build>
<dependencies>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-wsdl</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
+ <dependency>
<groupId>ws-commons</groupId>
<artifactId>axiom-api</artifactId>
<version>${axiom.version}</version>
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java?rev=392490&r1=392489&r2=392490&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java Sat Apr 8 00:23:42 2006
@@ -22,6 +22,7 @@
import org.apache.axiom.om.impl.llom.OMTextImpl;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
@@ -31,7 +32,6 @@
import org.apache.axis2.saaj.util.SAAJUtil;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.wsdl.WSDLConstants;
import javax.activation.DataHandler;
import javax.xml.namespace.QName;
Modified: webservices/axis2/trunk/java/modules/samples/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/project.xml?rev=392490&r1=392489&r2=392490&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/project.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/project.xml Sat Apr 8 00:23:42 2006
@@ -41,11 +41,7 @@
<artifactId>axiom-impl</artifactId>
<version>${axiom.version}</version>
</dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-wsdl</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
+
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-addressing</artifactId>
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/sgccalculator/CalcClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/sgccalculator/CalcClient.java?rev=392490&r1=392489&r2=392490&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/sgccalculator/CalcClient.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/sgccalculator/CalcClient.java Sat Apr 8 00:23:42 2006
@@ -23,12 +23,12 @@
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.MessageContext;
-import org.apache.wsdl.WSDLConstants;
import javax.xml.namespace.QName;
import javax.xml.stream.FactoryConfigurationError;
Modified: webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java?rev=392490&r1=392489&r2=392490&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java (original)
+++ webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java Sat Apr 8 00:23:42 2006
@@ -3,11 +3,11 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.handler.WSHandlerResult;
-import org.apache.wsdl.WSDLConstants;
import org.xmlsoap.ping.PingDocument;
import org.xmlsoap.ping.PingResponse;
import org.xmlsoap.ping.PingResponseDocument;
Modified: webservices/axis2/trunk/java/modules/security/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/project.xml?rev=392490&r1=392489&r2=392490&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/project.xml (original)
+++ webservices/axis2/trunk/java/modules/security/project.xml Sat Apr 8 00:23:42 2006
@@ -46,12 +46,7 @@
<artifactId>axis2-common</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-wsdl</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
+ <dependency>
<groupId>axis2</groupId>
<artifactId>axis2-codegen</artifactId>
<version>${pom.currentVersion}</version>
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=392490&r1=392489&r2=392490&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 Sat Apr 8 00:23:42 2006
@@ -22,6 +22,7 @@
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.security.handler.WSDoAllHandler;
@@ -39,7 +40,6 @@
import org.apache.ws.security.handler.WSHandlerResult;
import org.apache.ws.security.message.token.Timestamp;
import org.apache.ws.security.util.WSSecurityUtil;
-import org.apache.wsdl.WSDLConstants;
import org.w3c.dom.Document;
import javax.security.auth.callback.CallbackHandler;
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=392490&r1=392489&r2=392490&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 Sat Apr 8 00:23:42 2006
@@ -20,6 +20,7 @@
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.security.handler.WSDoAllHandler;
@@ -34,7 +35,6 @@
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.util.WSSecurityUtil;
-import org.apache.wsdl.WSDLConstants;
import org.w3c.dom.Document;
import java.util.Vector;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasConfiguration.java?rev=392490&r1=392489&r2=392490&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasConfiguration.java Sat Apr 8 00:23:42 2006
@@ -25,10 +25,10 @@
import org.apache.axis2.security.trust.SimpleTokenStore;
import org.apache.axis2.security.trust.TokenStorage;
import org.apache.axis2.security.util.Axis2Util;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.ws.security.components.crypto.Crypto;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.message.token.SecurityContextToken;
-import org.apache.wsdl.WSDLConstants;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: webservices/axis2/trunk/java/modules/tool/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/project.xml?rev=392490&r1=392489&r2=392490&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/project.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/project.xml Sat Apr 8 00:23:42 2006
@@ -48,12 +48,7 @@
</dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-wsdl</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
+ <dependency>
<groupId>axis2</groupId>
<artifactId>axis2-codegen</artifactId>
<version>${pom.currentVersion}</version>