cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r544419 - in /incubator/cxf/trunk: api/src/main/java/org/apache/cxf/tools/common/ api/src/main/java/org/apache/cxf/wsdl/ rt/bindings/jbi/ rt/bindings/object/ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/ rt/bindings/soap...
Date Tue, 05 Jun 2007 08:33:54 GMT
Author: mmao
Date: Tue Jun  5 01:33:51 2007
New Revision: 544419

URL: http://svn.apache.org/viewvc?view=rev&rev=544419
Log:
* Move the ToolConstans into API, Reasons are
   ** it should be API doc-ed, 
   ** Time to Remove the depencies of tool-common in rt modules
* Combine the WsdlConstants of tools-common with the one in API

* Update poms
  

Added:
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
      - copied unchanged from r544352, incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
Removed:
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/WSDLConstants.java
Modified:
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java
    incubator/cxf/trunk/rt/bindings/jbi/pom.xml
    incubator/cxf/trunk/rt/bindings/object/pom.xml
    incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java
    incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
    incubator/cxf/trunk/rt/bindings/xml/pom.xml
    incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
    incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/HttpAddressPlugin.java
    incubator/cxf/trunk/rt/databinding/aegis/pom.xml
    incubator/cxf/trunk/rt/transports/http-jetty/pom.xml
    incubator/cxf/trunk/rt/transports/http/pom.xml
    incubator/cxf/trunk/rt/transports/jms/pom.xml
    incubator/cxf/trunk/rt/ws/policy/pom.xml
    incubator/cxf/trunk/rt/ws/security/pom.xml
    incubator/cxf/trunk/tools/common/pom.xml
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java
    incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java
    incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java
    incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessor.java
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
    incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/Stax2DOM.java
    incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java
    incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
    incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XBinding.java
    incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XDef.java
    incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XFault.java
    incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XInput.java
    incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XMessage.java
    incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOperation.java
    incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOutput.java
    incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPort.java
    incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPortType.java
    incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XService.java
    incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java
    incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
    incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessor.java
    incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java
    incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java
    incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java
    incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java

Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java Tue Jun  5 01:33:51 2007
@@ -25,7 +25,8 @@
 
 public final class WSDLConstants {
 
-    public static final String WSDL11_NAMESPACE = "http://schemas.xmlsoap.org/wsdl";
+    public static final String WSDL_PREFIX = "wsdl";
+    public static final String WSDL11_NAMESPACE = "http://schemas.xmlsoap.org/wsdl/";
 
     public static final String NP_XMLNS = "xmlns";
     public static final String NU_XMLNS = "http://www.w3.org/2000/xmlns/";
@@ -59,9 +60,71 @@
         NS_PREFIX_PAIR.put(SOAP11_NAMESPACE, SOAP11_PREFIX);
         NS_PREFIX_PAIR.put(SOAP12_NAMESPACE, SOAP12_PREFIX);
     }
+
+    public static final String NS_SOAP11_HTTP_BINDING = "http://schemas.xmlsoap.org/soap/http";
+    //public static final String SOAP_HTTP_TRANSPORT =    "http://schemas.xmlsoap.org/soap/http";
     
-    public static final String XML_BINDING_NS = "http://cxf.apache.org/bindings/xformat";
+    public static final QName NS_SOAP_BINDING = new QName(SOAP11_NAMESPACE, "binding");
+    public static final QName NS_SOAP_OPERATION = new QName(SOAP11_NAMESPACE, "operation");
+    public static final QName NS_SOAP_BODY = new QName(SOAP11_NAMESPACE, "body");
+    public static final QName NS_SOAP_FAULT = new QName(SOAP11_NAMESPACE, "fault");
+    public static final QName NS_SOAP_BINDING_ADDRESS = new QName(SOAP11_NAMESPACE, "address");
+
+
+    public static final String SOAP12_HTTP_TRANSPORT = "http://www.w3.org/2003/05/soap/bindings/HTTP/";
+    
+    public static final QName NS_SOAP12_BINDING = new QName(SOAP12_NAMESPACE, "binding");
+    public static final QName NS_SOAP12_BINDING_ADDRESS = new QName(SOAP12_NAMESPACE, "address");
+    
+
+    public static final String DOCUMENT = "document";
+    public static final String RPC = "rpc";
+    public static final String LITERAL = "literal";
+    public static final String REPLACE_WITH_ACTUAL_URL = "REPLACE_WITH_ACTUAL_URL";
+
+    public static final String JMS_PREFIX = "jms";
+    public static final String TNS_PREFIX = "tns";
+
+    // WSDL 1.1 definitions
+    public static final QName QNAME_BINDING = new QName(WSDL11_NAMESPACE, "binding");
+    public static final QName QNAME_DEFINITIONS = new QName(WSDL11_NAMESPACE, "definitions");
+    public static final QName QNAME_DOCUMENTATION = new QName(WSDL11_NAMESPACE, "documentation");
+    public static final QName QNAME_IMPORT = new QName(WSDL11_NAMESPACE, "import");
+    public static final QName QNAME_MESSAGE = new QName(WSDL11_NAMESPACE, "message");
+    public static final QName QNAME_PART = new QName(WSDL11_NAMESPACE, "part");
+    public static final QName QNAME_OPERATION = new QName(WSDL11_NAMESPACE, "operation");
+    public static final QName QNAME_INPUT = new QName(WSDL11_NAMESPACE, "input");
+    public static final QName QNAME_OUTPUT = new QName(WSDL11_NAMESPACE, "output");
+
+    public static final QName QNAME_PORT = new QName(WSDL11_NAMESPACE, "port");
+    public static final QName QNAME_ADDRESS = new QName(WSDL11_NAMESPACE, "address");
+    public static final QName QNAME_PORT_TYPE = new QName(WSDL11_NAMESPACE, "portType");
+    public static final QName QNAME_FAULT = new QName(WSDL11_NAMESPACE, "fault");
+    public static final QName QNAME_SERVICE = new QName(WSDL11_NAMESPACE, "service");
+    public static final QName QNAME_TYPES = new QName(WSDL11_NAMESPACE, "types");
+
+    // WSDL Validation
+    public static final String ATTR_PART_ELEMENT = "element";
+    public static final String ATTR_PART_TYPE = "type";
+    public static final String ATTR_TYPE = "type";
+
+    //For Stax2DOM getUserData(location)
+    public static final String NODE_LOCATION = "location";
+
+    public static final int DOC_WRAPPED = 1;
+    public static final int DOC_BARE = 2;
+    public static final int RPC_WRAPPED = 3;
+    public static final int ERORR_STYLE_USE = -1;
 
+    public static final String XML_BINDING_NS = "http://cxf.apache.org/bindings/xformat";
+    public static final QName NS_XMLHTTP_BINDING_ADDRESS = new QName("http://schemas.xmlsoap.org/wsdl/http/",
+                                                                     "address");
+    
+    public static final String ATTR_TRANSPORT = "transport";
+    public static final String ATTR_LOCATION = "location";
+    public static final String ATTR_NAME = "name";
+    public static final String ATTR_TNS = "targetNamespace";
+    
     public static final String WSDL11 = "1.1";
     public static final String WSDL20 = "2.0";
 

Modified: incubator/cxf/trunk/rt/bindings/jbi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/jbi/pom.xml?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/rt/bindings/jbi/pom.xml (original)
+++ incubator/cxf/trunk/rt/bindings/jbi/pom.xml Tue Jun  5 01:33:51 2007
@@ -73,12 +73,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-tools-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-jbi</artifactId>
             <version>3.1-incubating</version>

Modified: incubator/cxf/trunk/rt/bindings/object/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/object/pom.xml?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/rt/bindings/object/pom.xml (original)
+++ incubator/cxf/trunk/rt/bindings/object/pom.xml Tue Jun  5 01:33:51 2007
@@ -40,11 +40,6 @@
 
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-tools-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-testutils</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>

Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java Tue Jun  5 01:33:51 2007
@@ -27,7 +27,7 @@
 import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.service.model.ServiceInfo;
 
-import org.apache.cxf.tools.common.WSDLConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 public class SoapBindingInfo extends BindingInfo {
     private SoapVersion soapVersion;

Modified: incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java Tue Jun  5 01:33:51 2007
@@ -44,8 +44,8 @@
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.tools.common.WSDLConstants;
 import org.apache.cxf.transport.DestinationFactoryManager;
+import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.cxf.wsdl11.WSDLServiceBuilder;
 import org.easymock.IMocksControl;
 
@@ -97,7 +97,7 @@
 
         SoapBindingInfo sbi = (SoapBindingInfo)bi;
         assertEquals("document", sbi.getStyle());
-        assertTrue(WSDLConstants.SOAP_HTTP_TRANSPORT.equalsIgnoreCase(sbi.getTransportURI()));
+        assertTrue(WSDLConstants.NS_SOAP11_HTTP_BINDING.equalsIgnoreCase(sbi.getTransportURI()));
         assertTrue(sbi.getSoapVersion() instanceof Soap11);
 
         BindingOperationInfo boi = sbi.getOperation(new QName("http://apache.org/hello_world_soap_http",

Modified: incubator/cxf/trunk/rt/bindings/xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/pom.xml?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/rt/bindings/xml/pom.xml (original)
+++ incubator/cxf/trunk/rt/bindings/xml/pom.xml Tue Jun  5 01:33:51 2007
@@ -72,13 +72,6 @@
             <scope>test</scope>
         </dependency>
         
-         <dependency>
-	     <groupId>org.apache.cxf</groupId>
-	     <artifactId>cxf-tools-common</artifactId>
-	     <version>${project.version}</version>
-        </dependency>
-       
-        
     </dependencies>
 
     <build>

Modified: incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java (original)
+++ incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java Tue Jun  5 01:33:51 2007
@@ -32,8 +32,8 @@
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.tools.common.WSDLConstants;
 import org.apache.cxf.tools.validator.ServiceValidator;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 public class XMLFormatValidator extends ServiceValidator {
 

Modified: incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/HttpAddressPlugin.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/HttpAddressPlugin.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/HttpAddressPlugin.java (original)
+++ incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/HttpAddressPlugin.java Tue Jun  5 01:33:51 2007
@@ -26,8 +26,8 @@
 import javax.wsdl.extensions.http.HTTPAddress;
 
 import org.apache.cxf.tools.common.ToolConstants;
-import org.apache.cxf.tools.common.WSDLConstants;
 import org.apache.cxf.wsdl.AbstractWSDLPlugin;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 public final class HttpAddressPlugin extends AbstractWSDLPlugin {
 

Modified: incubator/cxf/trunk/rt/databinding/aegis/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/pom.xml?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/pom.xml (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/pom.xml Tue Jun  5 01:33:51 2007
@@ -54,13 +54,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-tools-common</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
             <groupId>jdom</groupId>
             <artifactId>jdom</artifactId>
             <version>1.0</version>

Modified: incubator/cxf/trunk/rt/transports/http-jetty/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/pom.xml?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/rt/transports/http-jetty/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/http-jetty/pom.xml Tue Jun  5 01:33:51 2007
@@ -59,11 +59,6 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-tools-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
         </dependency>

Modified: incubator/cxf/trunk/rt/transports/http/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/pom.xml?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/http/pom.xml Tue Jun  5 01:33:51 2007
@@ -54,11 +54,6 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-tools-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
         </dependency>

Modified: incubator/cxf/trunk/rt/transports/jms/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/pom.xml?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/jms/pom.xml Tue Jun  5 01:33:51 2007
@@ -96,13 +96,6 @@
             <scope>test</scope>
         </dependency>
         
-        <dependency>
-	            <groupId>org.apache.cxf</groupId>
-	            <artifactId>cxf-tools-common</artifactId>
-	            <version>${project.version}</version>
-        </dependency>
-        
-
     </dependencies>
 
     <build>

Modified: incubator/cxf/trunk/rt/ws/policy/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/pom.xml?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/pom.xml (original)
+++ incubator/cxf/trunk/rt/ws/policy/pom.xml Tue Jun  5 01:33:51 2007
@@ -36,18 +36,13 @@
             <artifactId>neethi</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-tools-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
             <groupId>javax.xml.ws</groupId>
             <artifactId>jaxws-api</artifactId>
-        </dependency>
-		<dependency>
-	        <groupId>org.apache.geronimo.specs</groupId>
-	        <artifactId>geronimo-annotation_1.0_spec</artifactId>
-		</dependency>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.geronimo.specs</groupId>
+	    <artifactId>geronimo-annotation_1.0_spec</artifactId>
+	</dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-common-utilities</artifactId>

Modified: incubator/cxf/trunk/rt/ws/security/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/pom.xml?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/rt/ws/security/pom.xml (original)
+++ incubator/cxf/trunk/rt/ws/security/pom.xml Tue Jun  5 01:33:51 2007
@@ -81,12 +81,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-tools-common</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>

Modified: incubator/cxf/trunk/tools/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/pom.xml?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/common/pom.xml (original)
+++ incubator/cxf/trunk/tools/common/pom.xml Tue Jun  5 01:33:51 2007
@@ -70,6 +70,12 @@
 	    <groupId>javax.xml.soap</groupId>
 	    <artifactId>saaj-api</artifactId>
 	</dependency>
+
+	<dependency>
+	    <groupId>org.apache.cxf</groupId>
+	    <artifactId>cxf-api</artifactId>
+	    <version>${project.version}</version>
+	</dependency>
 	
 	<dependency>
 	    <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java (original)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java Tue Jun  5 01:33:51 2007
@@ -26,7 +26,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-
 import javax.wsdl.Binding;
 import javax.wsdl.BindingFault;
 import javax.wsdl.BindingInput;
@@ -53,13 +52,13 @@
 
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.tools.common.ExtensionInvocationHandler;
-import org.apache.cxf.tools.common.WSDLConstants;
 import org.apache.cxf.tools.common.extensions.soap.SoapAddress;
 import org.apache.cxf.tools.common.extensions.soap.SoapBinding;
 import org.apache.cxf.tools.common.extensions.soap.SoapBody;
 import org.apache.cxf.tools.common.extensions.soap.SoapFault;
 import org.apache.cxf.tools.common.extensions.soap.SoapHeader;
 import org.apache.cxf.tools.common.extensions.soap.SoapOperation;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 public final class SOAPBindingUtil {
     private static Map<String, String> bindingMap = new HashMap<String, String>();

Modified: incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java (original)
+++ incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java Tue Jun  5 01:33:51 2007
@@ -21,6 +21,8 @@
 
 import junit.framework.TestCase;
 
+import org.apache.cxf.wsdl.WSDLConstants;
+
 public class WSDLVersionTest extends TestCase {
     
     public void testWSDLVersion() {

Modified: incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java (original)
+++ incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java Tue Jun  5 01:33:51 2007
@@ -20,7 +20,7 @@
 package org.apache.cxf.tools.java2wsdl.generator;
 
 import org.apache.cxf.tools.common.ToolException;
-import org.apache.cxf.tools.common.WSDLConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 public final class WSDLGeneratorFactory {
     private WSDLConstants.WSDLVersion wsdlVersion;

Modified: incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessor.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessor.java (original)
+++ incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessor.java Tue Jun  5 01:33:51 2007
@@ -43,7 +43,6 @@
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.tools.common.ToolContext;
 import org.apache.cxf.tools.common.ToolException;
-import org.apache.cxf.tools.common.WSDLConstants;
 import org.apache.cxf.tools.java2wsdl.generator.AbstractGenerator;
 import org.apache.cxf.tools.java2wsdl.generator.WSDLGeneratorFactory;
 import org.apache.cxf.tools.java2wsdl.generator.wsdl11.FaultBeanGenerator;
@@ -51,6 +50,7 @@
 import org.apache.cxf.tools.java2wsdl.processor.internal.ServiceBuilder;
 import org.apache.cxf.tools.java2wsdl.processor.internal.ServiceBuilderFactory;
 import org.apache.cxf.tools.util.AnnotationUtil;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 public class JavaToProcessor implements Processor {
     private static final Logger LOG = LogUtils.getL7dLogger(JavaToProcessor.class);

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java Tue Jun  5 01:33:51 2007
@@ -20,8 +20,8 @@
 package org.apache.cxf.tools.java2wsdl.generator;
 
 import junit.framework.TestCase;
-import org.apache.cxf.tools.common.WSDLConstants;
 import org.apache.cxf.tools.java2wsdl.generator.wsdl11.WSDL11Generator;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 public class WSDLGeneratorFactoryTest extends TestCase {
 

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java Tue Jun  5 01:33:51 2007
@@ -34,12 +34,12 @@
 import org.apache.cxf.tools.common.ProcessorTestBase;
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.tools.common.ToolContext;
-import org.apache.cxf.tools.common.WSDLConstants;
 import org.apache.cxf.tools.java2wsdl.JavaToWSDL;
 import org.apache.cxf.tools.wsdlto.core.DataBindingProfile;
 import org.apache.cxf.tools.wsdlto.core.FrontEndProfile;
 import org.apache.cxf.tools.wsdlto.core.PluginLoader;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.JAXWSContainer;
+import org.apache.cxf.wsdl.WSDLConstants;
 import org.junit.After;
 import org.junit.Ignore;
 import org.junit.Test;

Modified: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/Stax2DOM.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/Stax2DOM.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/Stax2DOM.java (original)
+++ incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/Stax2DOM.java Tue Jun  5 01:33:51 2007
@@ -40,7 +40,7 @@
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.helpers.XMLUtils;
 import org.apache.cxf.tools.common.ToolException;
-import org.apache.cxf.tools.common.WSDLConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 public class Stax2DOM {
 

Modified: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java (original)
+++ incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java Tue Jun  5 01:33:51 2007
@@ -44,7 +44,7 @@
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.tools.common.ToolException;
-import org.apache.cxf.tools.common.WSDLConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 
@@ -78,7 +78,7 @@
         baseURI = baseURI.replaceAll(" ", "%20");
         XmlSchemaCollection schemaCol = new XmlSchemaCollection();
         NodeList nodes = document.getElementsByTagNameNS(
-            WSDLConstants.NS_XMLNS, "schema");
+            WSDLConstants.NU_SCHEMA_XSD, "schema");
         for (int x = 0; x < nodes.getLength(); x++) {
             Node schemaNode = nodes.item(x);
             Element schemaEl = (Element) schemaNode;
@@ -134,7 +134,7 @@
             throw new ToolException(e);
         }
         
-        NodeList nodes = document.getElementsByTagNameNS(WSDLConstants.NS_WSDL, "import");
+        NodeList nodes = document.getElementsByTagNameNS(WSDLConstants.WSDL11_NAMESPACE, "import");
         //
         // Remove the scheme part of a URI - need to escape spaces in
         // case we are on Windows and have spaces in directory names.

Modified: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java (original)
+++ incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java Tue Jun  5 01:33:51 2007
@@ -53,7 +53,6 @@
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.helpers.XPathUtils;
 import org.apache.cxf.tools.common.ToolException;
-import org.apache.cxf.tools.common.WSDLConstants;
 import org.apache.cxf.tools.util.URIParserUtil;
 import org.apache.cxf.tools.validator.internal.model.FailureLocation;
 import org.apache.cxf.tools.validator.internal.model.XBinding;
@@ -67,6 +66,7 @@
 import org.apache.cxf.tools.validator.internal.model.XPort;
 import org.apache.cxf.tools.validator.internal.model.XPortType;
 import org.apache.cxf.tools.validator.internal.model.XService;
+import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.cxf.wsdl11.WSDLDefinitionBuilder;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.apache.ws.commons.schema.XmlSchemaElement;
@@ -237,7 +237,7 @@
             Port port = (Port)portIte.next();
             Binding binding = port.getBinding();
             bindings.put(binding.getQName(), getXNode(service, port));
-            if (WSDLConstants.NS_WSDL.equals(binding.getQName().getNamespaceURI())) {
+            if (WSDLConstants.WSDL11_NAMESPACE.equals(binding.getQName().getNamespaceURI())) {
                 throw new ToolException("Binding "
                                         + binding.getQName().getLocalPart()
                                         + " namespace set improperly.");
@@ -490,14 +490,14 @@
 
         boolean partvalid = false;
 
-        if (namespace.equals(WSDLConstants.NS_XMLNS)) {
+        if (namespace.equals(WSDLConstants.NU_SCHEMA_XSD)) {
             if (isElement) {
                 XmlSchemaElement  schemaEle = 
-                    schemaCollection.getElementByQName(new QName(WSDLConstants.NS_XMLNS, name));    
+                    schemaCollection.getElementByQName(new QName(WSDLConstants.NU_SCHEMA_XSD, name));    
                 partvalid = schemaEle != null ? true : false;
             } else {
                 XmlSchemaType schemaType = 
-                    schemaCollection.getTypeByQName(new QName(WSDLConstants.NS_XMLNS, name));  
+                    schemaCollection.getTypeByQName(new QName(WSDLConstants.NU_SCHEMA_XSD, name));  
                 partvalid = schemaType != null ? true : false;
             }
             

Modified: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XBinding.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XBinding.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XBinding.java (original)
+++ incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XBinding.java Tue Jun  5 01:33:51 2007
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.tools.validator.internal.model;
 
-import org.apache.cxf.tools.common.WSDLConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 public final class XBinding extends XWsdl {
 

Modified: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XDef.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XDef.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XDef.java (original)
+++ incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XDef.java Tue Jun  5 01:33:51 2007
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.tools.validator.internal.model;
 
-import org.apache.cxf.tools.common.WSDLConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 public final class XDef extends XWsdl {
 

Modified: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XFault.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XFault.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XFault.java (original)
+++ incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XFault.java Tue Jun  5 01:33:51 2007
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.tools.validator.internal.model;
 
-import org.apache.cxf.tools.common.WSDLConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 public final class XFault extends XWsdl {
     public XFault() {

Modified: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XInput.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XInput.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XInput.java (original)
+++ incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XInput.java Tue Jun  5 01:33:51 2007
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.tools.validator.internal.model;
 
-import org.apache.cxf.tools.common.WSDLConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 public final class XInput extends XWsdl {
     public XInput() {

Modified: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XMessage.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XMessage.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XMessage.java (original)
+++ incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XMessage.java Tue Jun  5 01:33:51 2007
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.tools.validator.internal.model;
 
-import org.apache.cxf.tools.common.WSDLConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 public final class XMessage extends XWsdl {
     public XMessage() {

Modified: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOperation.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOperation.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOperation.java (original)
+++ incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOperation.java Tue Jun  5 01:33:51 2007
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.tools.validator.internal.model;
 
-import org.apache.cxf.tools.common.WSDLConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 public final class XOperation extends XWsdl {
     public XOperation() {

Modified: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOutput.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOutput.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOutput.java (original)
+++ incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOutput.java Tue Jun  5 01:33:51 2007
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.tools.validator.internal.model;
 
-import org.apache.cxf.tools.common.WSDLConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 public final class XOutput extends XWsdl {
     public XOutput() {

Modified: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPort.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPort.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPort.java (original)
+++ incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPort.java Tue Jun  5 01:33:51 2007
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.tools.validator.internal.model;
 
-import org.apache.cxf.tools.common.WSDLConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 public final class XPort extends XWsdl {
 

Modified: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPortType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPortType.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPortType.java (original)
+++ incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPortType.java Tue Jun  5 01:33:51 2007
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.tools.validator.internal.model;
 
-import org.apache.cxf.tools.common.WSDLConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 public final class XPortType extends XWsdl {
     public XPortType() {

Modified: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XService.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XService.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XService.java (original)
+++ incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XService.java Tue Jun  5 01:33:51 2007
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.tools.validator.internal.model;
 
-import org.apache.cxf.tools.common.WSDLConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 public final class XService extends XWsdl {
 

Modified: incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java (original)
+++ incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java Tue Jun  5 01:33:51 2007
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.tools.validator.internal.model;
 
-import org.apache.cxf.tools.common.WSDLConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java Tue Jun  5 01:33:51 2007
@@ -53,7 +53,6 @@
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.tools.common.ToolContext;
 import org.apache.cxf.tools.common.ToolException;
-import org.apache.cxf.tools.common.WSDLConstants;
 import org.apache.cxf.tools.common.toolspec.ToolSpec;
 import org.apache.cxf.tools.common.toolspec.parser.BadUsageException;
 import org.apache.cxf.tools.common.toolspec.parser.CommandDocument;
@@ -64,6 +63,7 @@
 import org.apache.cxf.tools.wsdlto.core.AbstractWSDLBuilder;
 import org.apache.cxf.tools.wsdlto.core.DataBindingProfile;
 import org.apache.cxf.tools.wsdlto.core.FrontEndProfile;
+import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.cxf.wsdl11.WSDLServiceBuilder;
 
 

Modified: incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessor.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessor.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessor.java Tue Jun  5 01:33:51 2007
@@ -35,9 +35,9 @@
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.tools.common.ToolException;
-import org.apache.cxf.tools.common.WSDLConstants;
 import org.apache.cxf.tools.misc.processor.address.Address;
 import org.apache.cxf.tools.misc.processor.address.AddressFactory;
+import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.cxf.wsdl.WSDLExtensibilityPlugin;
 
 public class WSDLToServiceProcessor extends AbstractWSDLToProcessor {

Modified: incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java Tue Jun  5 01:33:51 2007
@@ -44,12 +44,12 @@
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.tools.common.ToolException;
-import org.apache.cxf.tools.common.WSDLConstants;
 import org.apache.cxf.tools.common.extensions.soap.SoapBinding;
 import org.apache.cxf.tools.common.extensions.soap.SoapBody;
 import org.apache.cxf.tools.common.extensions.soap.SoapFault;
 import org.apache.cxf.tools.common.extensions.soap.SoapOperation;
 import org.apache.cxf.tools.util.SOAPBindingUtil;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 
 public class WSDLToSoapProcessor extends AbstractWSDLToProcessor {

Modified: incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java Tue Jun  5 01:33:51 2007
@@ -44,9 +44,9 @@
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.tools.common.ToolException;
-import org.apache.cxf.tools.common.WSDLConstants;
 import org.apache.cxf.tools.misc.processor.address.Address;
 import org.apache.cxf.tools.misc.processor.address.AddressFactory;
+import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.cxf.wsdl.WSDLExtensibilityPlugin;
 
 public class WSDLToXMLProcessor extends AbstractWSDLToProcessor {

Modified: incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java Tue Jun  5 01:33:51 2007
@@ -44,12 +44,12 @@
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.tools.common.ToolContext;
 import org.apache.cxf.tools.common.ToolException;
-import org.apache.cxf.tools.common.WSDLConstants;
 import org.apache.cxf.tools.common.dom.ExtendedDocumentBuilder;
 import org.apache.cxf.tools.util.FileWriterUtil;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion.JAXWSBinding;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion.JAXWSBindingDeserializer;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion.JAXWSBindingSerializer;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 public class XSDToWSDLProcessor implements Processor {
     private static final Logger LOG = LogUtils.getL7dLogger(XSDToWSDLProcessor.class);
@@ -121,7 +121,7 @@
 
         this.wsdlDefinition.setTargetNamespace((String)env.get(ToolConstants.CFG_NAMESPACE));
         this.wsdlDefinition
-            .setQName(new QName(WSDLConstants.NS_WSDL, (String)env.get(ToolConstants.CFG_NAME)));
+            .setQName(new QName(WSDLConstants.WSDL11_NAMESPACE, (String)env.get(ToolConstants.CFG_NAME)));
 
         Types types = this.wsdlDefinition.createTypes();
         ExtensibilityElement extElement;
@@ -130,8 +130,7 @@
             registerJAXWSBinding(Definition.class);
             registerJAXWSBinding(Types.class);
             registerJAXWSBinding(Schema.class);
-            extElement = registry.createExtension(Types.class, new QName(WSDLConstants.XSD_NAMESPACE,
-                                                                         "schema"));
+            extElement = registry.createExtension(Types.class, WSDLConstants.SCHEMA_QNAME);
         } catch (WSDLException wse) {
             Message msg = new Message("FAIL_TO_CREATE_SCHEMA_EXTENSION", LOG);
             throw new ToolException(msg, wse);

Modified: incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java?view=diff&rev=544419&r1=544418&r2=544419
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java Tue Jun  5 01:33:51 2007
@@ -37,13 +37,13 @@
 import org.apache.cxf.tools.common.ProcessorTestBase;
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.tools.common.ToolException;
-import org.apache.cxf.tools.common.WSDLConstants;
 import org.apache.cxf.tools.common.extensions.soap.SoapBinding;
 import org.apache.cxf.tools.common.extensions.soap.SoapBody;
 import org.apache.cxf.tools.common.extensions.soap.SoapFault;
 import org.apache.cxf.tools.common.extensions.soap.SoapOperation;
 import org.apache.cxf.tools.misc.WSDLToSoap;
 import org.apache.cxf.tools.util.SOAPBindingUtil;
+import org.apache.cxf.wsdl.WSDLConstants;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -415,7 +415,8 @@
                 SoapBinding soapBinding = SOAPBindingUtil.getSoapBinding(obj);
                 assertNotNull(soapBinding);
                 assertTrue("document".equalsIgnoreCase(soapBinding.getStyle()));
-                assertTrue(WSDLConstants.SOAP_HTTP_TRANSPORT.equalsIgnoreCase(soapBinding.getTransportURI()));
+                assertTrue(WSDLConstants.NS_SOAP11_HTTP_BINDING.
+                           equalsIgnoreCase(soapBinding.getTransportURI()));
             }
             
             BindingOperation bo = binding.getBindingOperation("sayHi", null, null);



Mime
View raw message