cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bimargul...@apache.org
Subject svn commit: r731729 [1/2] - in /cxf/sandbox/benson/lessjdom: ./ api/src/main/java/org/apache/cxf/ api/src/main/java/org/apache/cxf/service/model/ api/src/main/java/org/apache/cxf/wsdl/ api/src/test/java/org/apache/cxf/ common/common/src/main/java/org/a...
Date Mon, 05 Jan 2009 21:21:39 GMT
Author: bimargulies
Date: Mon Jan  5 13:21:36 2009
New Revision: 731729

URL: http://svn.apache.org/viewvc?rev=731729&view=rev
Log:
Downmerge.

Added:
    cxf/sandbox/benson/lessjdom/common/common/src/main/java/org/apache/cxf/common/WSDLConstants.java
      - copied unchanged from r731681, cxf/trunk/common/common/src/main/java/org/apache/cxf/common/WSDLConstants.java
    cxf/sandbox/benson/lessjdom/common/common/src/main/java/org/apache/cxf/common/xmlschema/Messages.properties
      - copied unchanged from r731681, cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/Messages.properties
    cxf/sandbox/benson/lessjdom/common/common/src/main/java/org/apache/cxf/common/xmlschema/UnsupportedConstruct.java
      - copied unchanged from r731681, cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/UnsupportedConstruct.java
    cxf/sandbox/benson/lessjdom/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java
      - copied unchanged from r731681, cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java
    cxf/sandbox/benson/lessjdom/common/common/src/resources/
      - copied from r731681, cxf/trunk/common/common/src/resources/
    cxf/sandbox/benson/lessjdom/common/common/src/resources/META-INF/
      - copied from r731681, cxf/trunk/common/common/src/resources/META-INF/
    cxf/sandbox/benson/lessjdom/common/common/src/resources/META-INF/spring.schemas
      - copied unchanged from r731681, cxf/trunk/common/common/src/resources/META-INF/spring.schemas
    cxf/sandbox/benson/lessjdom/common/common/src/resources/schemas/
      - copied from r731681, cxf/trunk/common/common/src/resources/schemas/
    cxf/sandbox/benson/lessjdom/common/common/src/resources/schemas/configuration/
      - copied from r731681, cxf/trunk/common/common/src/resources/schemas/configuration/
    cxf/sandbox/benson/lessjdom/common/common/src/resources/schemas/configuration/cxf-beans.xsd
      - copied unchanged from r731681, cxf/trunk/common/common/src/resources/schemas/configuration/cxf-beans.xsd
Removed:
    cxf/sandbox/benson/lessjdom/api/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java
    cxf/sandbox/benson/lessjdom/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaTools.java
    cxf/sandbox/benson/lessjdom/common/common/src/main/resources/
    cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/XmlSchemaUtils.java
Modified:
    cxf/sandbox/benson/lessjdom/   (props changed)
    cxf/sandbox/benson/lessjdom/api/src/main/java/org/apache/cxf/NSManager.java
    cxf/sandbox/benson/lessjdom/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
    cxf/sandbox/benson/lessjdom/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
    cxf/sandbox/benson/lessjdom/api/src/test/java/org/apache/cxf/NSManagerTest.java
    cxf/sandbox/benson/lessjdom/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DatabindingOutSetupInterceptor.java
    cxf/sandbox/benson/lessjdom/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
    cxf/sandbox/benson/lessjdom/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java
    cxf/sandbox/benson/lessjdom/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
    cxf/sandbox/benson/lessjdom/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
    cxf/sandbox/benson/lessjdom/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/HttpAddressPlugin.java
    cxf/sandbox/benson/lessjdom/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
    cxf/sandbox/benson/lessjdom/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
    cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
    cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
    cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
    cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
    cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
    cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
    cxf/sandbox/benson/lessjdom/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
    cxf/sandbox/benson/lessjdom/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WeatherService2Test.java
    cxf/sandbox/benson/lessjdom/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/XMLBeansServiceTest.java
    cxf/sandbox/benson/lessjdom/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/WeatherServiceRPCLitTest.java
    cxf/sandbox/benson/lessjdom/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
    cxf/sandbox/benson/lessjdom/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchOutDatabindingInterceptor.java
    cxf/sandbox/benson/lessjdom/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
    cxf/sandbox/benson/lessjdom/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
    cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/AttributeInfo.java
    cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
    cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
    cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
    cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java
    cxf/sandbox/benson/lessjdom/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
    cxf/sandbox/benson/lessjdom/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java
    cxf/sandbox/benson/lessjdom/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java
    cxf/sandbox/benson/lessjdom/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java
    cxf/sandbox/benson/lessjdom/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java
    cxf/sandbox/benson/lessjdom/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java
    cxf/sandbox/benson/lessjdom/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
    cxf/sandbox/benson/lessjdom/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java
    cxf/sandbox/benson/lessjdom/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
    cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/Stax2DOM.java
    cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java
    cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
    cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XBinding.java
    cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XDef.java
    cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XFault.java
    cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XInput.java
    cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XMessage.java
    cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOperation.java
    cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOutput.java
    cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPort.java
    cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPortType.java
    cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XService.java
    cxf/sandbox/benson/lessjdom/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java
    cxf/sandbox/benson/lessjdom/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
    cxf/sandbox/benson/lessjdom/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
    cxf/sandbox/benson/lessjdom/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessor.java
    cxf/sandbox/benson/lessjdom/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java
    cxf/sandbox/benson/lessjdom/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java
    cxf/sandbox/benson/lessjdom/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java
    cxf/sandbox/benson/lessjdom/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/SoapAddress.java
    cxf/sandbox/benson/lessjdom/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java

Propchange: cxf/sandbox/benson/lessjdom/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan  5 13:21:36 2009
@@ -1 +1 @@
-/cxf/sandbox/benson/aegis_xmlschema:1-730867 /cxf/trunk:1-731646
+/cxf/sandbox/benson/aegis_xmlschema:1-730867 /cxf/trunk:1-731684

Modified: cxf/sandbox/benson/lessjdom/api/src/main/java/org/apache/cxf/NSManager.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/api/src/main/java/org/apache/cxf/NSManager.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/api/src/main/java/org/apache/cxf/NSManager.java (original)
+++ cxf/sandbox/benson/lessjdom/api/src/main/java/org/apache/cxf/NSManager.java Mon Jan  5 13:21:36 2009
@@ -25,8 +25,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.ws.addressing.JAXWSAConstants;
-import org.apache.cxf.wsdl.WSDLConstants;
 
 /***
  * Only public/static/final fields can be resolved

Modified: cxf/sandbox/benson/lessjdom/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java (original)
+++ cxf/sandbox/benson/lessjdom/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java Mon Jan  5 13:21:36 2009
@@ -25,10 +25,10 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.cxf.helpers.XMLUtils;
 import org.apache.cxf.io.CachedOutputStream;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaForm;

Modified: cxf/sandbox/benson/lessjdom/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java (original)
+++ cxf/sandbox/benson/lessjdom/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java Mon Jan  5 13:21:36 2009
@@ -65,6 +65,7 @@
 import org.xml.sax.InputSource;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.StringUtils;

Modified: cxf/sandbox/benson/lessjdom/api/src/test/java/org/apache/cxf/NSManagerTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/api/src/test/java/org/apache/cxf/NSManagerTest.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/api/src/test/java/org/apache/cxf/NSManagerTest.java (original)
+++ cxf/sandbox/benson/lessjdom/api/src/test/java/org/apache/cxf/NSManagerTest.java Mon Jan  5 13:21:36 2009
@@ -19,8 +19,8 @@
 
 package org.apache.cxf;
 
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.ws.addressing.JAXWSAConstants;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: cxf/sandbox/benson/lessjdom/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DatabindingOutSetupInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DatabindingOutSetupInterceptor.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DatabindingOutSetupInterceptor.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DatabindingOutSetupInterceptor.java Mon Jan  5 13:21:36 2009
@@ -27,6 +27,7 @@
 import org.apache.cxf.binding.http.HttpConstants;
 import org.apache.cxf.binding.http.URIMapper;
 import org.apache.cxf.binding.xml.interceptor.XMLMessageOutInterceptor;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.helpers.MapNamespaceContext;
@@ -39,7 +40,6 @@
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.staxutils.W3CDOMStreamWriter;
-import org.apache.cxf.wsdl.WSDLConstants;
 
 public class DatabindingOutSetupInterceptor extends AbstractPhaseInterceptor<Message> {
     private static final WrappedOutInterceptor WRAPPED_OUT = new WrappedOutInterceptor();

Modified: cxf/sandbox/benson/lessjdom/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java Mon Jan  5 13:21:36 2009
@@ -57,6 +57,7 @@
 import org.apache.cxf.binding.soap.model.SoapBodyInfo;
 import org.apache.cxf.binding.soap.model.SoapHeaderInfo;
 import org.apache.cxf.binding.soap.model.SoapOperationInfo;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
 import org.apache.cxf.endpoint.Endpoint;
@@ -87,7 +88,6 @@
 import org.apache.cxf.transport.Destination;
 import org.apache.cxf.transport.MessageObserver;
 import org.apache.cxf.transport.MultipleEndpointObserver;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.cxf.wsdl.WSDLManager;
 import org.apache.cxf.wsdl11.WSDLServiceBuilder;
 

Modified: cxf/sandbox/benson/lessjdom/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java Mon Jan  5 13:21:36 2009
@@ -22,12 +22,12 @@
 import org.apache.cxf.binding.soap.Soap11;
 import org.apache.cxf.binding.soap.Soap12;
 import org.apache.cxf.binding.soap.SoapVersion;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.service.model.BindingInfo;
 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.wsdl.WSDLConstants;
 
 public class SoapBindingInfo extends BindingInfo {
     private SoapVersion soapVersion;

Modified: cxf/sandbox/benson/lessjdom/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java Mon Jan  5 13:21:36 2009
@@ -36,6 +36,7 @@
 import org.apache.cxf.binding.soap.model.SoapBindingInfo;
 import org.apache.cxf.binding.soap.model.SoapBodyInfo;
 import org.apache.cxf.binding.soap.model.SoapOperationInfo;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.service.model.BindingFaultInfo;
 import org.apache.cxf.service.model.BindingInfo;
 import org.apache.cxf.service.model.BindingMessageInfo;
@@ -43,7 +44,6 @@
 import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.cxf.transport.DestinationFactoryManager;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.cxf.wsdl11.WSDLServiceBuilder;
 import org.easymock.IMocksControl;
 import org.junit.Assert;

Modified: cxf/sandbox/benson/lessjdom/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java Mon Jan  5 13:21:36 2009
@@ -27,13 +27,13 @@
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.bindings.xformat.XMLBindingMessageFormat;
+import org.apache.cxf.common.WSDLConstants;
 
 import org.apache.cxf.service.model.BindingInfo;
 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.validator.ServiceValidator;
-import org.apache.cxf.wsdl.WSDLConstants;
 
 public class XMLFormatValidator extends ServiceValidator {
 

Modified: cxf/sandbox/benson/lessjdom/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/HttpAddressPlugin.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/HttpAddressPlugin.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/HttpAddressPlugin.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/HttpAddressPlugin.java Mon Jan  5 13:21:36 2009
@@ -25,9 +25,9 @@
 import javax.wsdl.extensions.ExtensibilityElement;
 import javax.wsdl.extensions.http.HTTPAddress;
 
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.wsdl.AbstractWSDLPlugin;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.cxf.wsdl.http.AddressType;
 
 public final class HttpAddressPlugin extends AbstractWSDLPlugin {

Modified: cxf/sandbox/benson/lessjdom/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java Mon Jan  5 13:21:36 2009
@@ -59,6 +59,7 @@
 import com.ibm.wsdl.extensions.schema.SchemaImpl;
 import org.apache.cxf.Bus;
 import org.apache.cxf.NSManager;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.XMLUtils;
 import org.apache.cxf.helpers.XPathUtils;
@@ -76,7 +77,6 @@
 import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.service.model.SchemaInfo;
 import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.cxf.wsdl.WSDLManager;
 import org.apache.ws.commons.schema.utils.NamespacePrefixList;
 

Modified: cxf/sandbox/benson/lessjdom/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java Mon Jan  5 13:21:36 2009
@@ -51,12 +51,12 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusException;
 import org.apache.cxf.catalog.CatalogWSDLLocator;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.CacheMap;
 import org.apache.cxf.common.util.PropertiesLoaderUtils;
 import org.apache.cxf.service.model.ServiceSchemaInfo;
 import org.apache.cxf.wsdl.JAXBExtensionHelper;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.cxf.wsdl.WSDLManager;
 
 /**

Modified: cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java Mon Jan  5 13:21:36 2009
@@ -46,7 +46,7 @@
 import org.apache.cxf.aegis.type.java5.Java5TypeCreator;
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.common.util.SOAPConstants;
-import org.apache.cxf.common.xmlschema.XmlSchemaTools;
+import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
 import org.apache.cxf.helpers.XMLUtils;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
@@ -239,7 +239,7 @@
     }
 
     public static boolean schemaImportsUtilityTypes(XmlSchema schema) {
-        return XmlSchemaTools.schemaImportsNamespace(schema, UTILITY_TYPES_SCHEMA_NS);
+        return XmlSchemaUtils.schemaImportsNamespace(schema, UTILITY_TYPES_SCHEMA_NS);
     }
     
     private Document getSchemaDocument(String resourcePath) { 
@@ -278,7 +278,7 @@
     }
 
     public static void addUtilityTypesToSchema(XmlSchema root) {
-        XmlSchemaTools.addImportIfNeeded(root, UTILITY_TYPES_SCHEMA_NS);
+        XmlSchemaUtils.addImportIfNeeded(root, UTILITY_TYPES_SCHEMA_NS);
     }
 
     /**

Modified: cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java Mon Jan  5 13:21:36 2009
@@ -41,12 +41,13 @@
 import org.apache.cxf.aegis.type.TypeCreator;
 import org.apache.cxf.aegis.type.TypeMapping;
 import org.apache.cxf.aegis.type.mtom.AbstractXOPType;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
 import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
-import org.apache.cxf.common.xmlschema.XmlSchemaTools;
+import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
 import org.apache.cxf.databinding.AbstractDataBinding;
 import org.apache.cxf.databinding.DataReader;
 import org.apache.cxf.databinding.DataWriter;
@@ -60,7 +61,6 @@
 import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.service.model.SchemaInfo;
 import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaAnnotated;
 import org.apache.ws.commons.schema.XmlSchemaForm;
@@ -505,7 +505,7 @@
     }
 
     private boolean schemaImportsXmime(XmlSchema schema) {
-        return XmlSchemaTools.schemaImportsNamespace(schema, AbstractXOPType.XML_MIME_NS);
+        return XmlSchemaUtils.schemaImportsNamespace(schema, AbstractXOPType.XML_MIME_NS);
     }
 
     public QName getSuggestedName(Service s, TypeMapping tm, OperationInfo op, int param) {

Modified: cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java Mon Jan  5 13:21:36 2009
@@ -34,8 +34,8 @@
 import org.apache.cxf.aegis.type.collection.MapType;
 import org.apache.cxf.aegis.util.NamespaceHelper;
 import org.apache.cxf.aegis.util.ServiceUtils;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.util.XMLSchemaQNames;
-import org.apache.cxf.wsdl.WSDLConstants;
 
 /**
  * @author Hani Suleiman Date: Jun 14, 2005 Time: 11:59:57 PM

Modified: cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java Mon Jan  5 13:21:36 2009
@@ -25,7 +25,7 @@
 import org.apache.cxf.aegis.AegisContext;
 import org.apache.cxf.aegis.util.NamespaceHelper;
 import org.apache.cxf.common.util.SOAPConstants;
-import org.apache.cxf.common.xmlschema.XmlSchemaTools;
+import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
 import org.apache.ws.commons.schema.XmlSchema;
 
 
@@ -159,6 +159,6 @@
     
     public static void setAttributeAttributes(QName name, Type type, XmlSchema root) {
         String ns = type.getSchemaType().getNamespaceURI();
-        XmlSchemaTools.addImportIfNeeded(root, ns);
+        XmlSchemaUtils.addImportIfNeeded(root, ns);
     }
 }

Modified: cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java Mon Jan  5 13:21:36 2009
@@ -40,7 +40,7 @@
 import org.apache.cxf.aegis.xml.MessageReader;
 import org.apache.cxf.aegis.xml.MessageWriter;
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
-import org.apache.cxf.common.xmlschema.XmlSchemaTools;
+import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaAny;
@@ -584,7 +584,7 @@
     }
 
     private void addXmimeToSchema(XmlSchema root) {
-        XmlSchemaTools.addImportIfNeeded(root, AbstractXOPType.XML_MIME_NS);
+        XmlSchemaUtils.addImportIfNeeded(root, AbstractXOPType.XML_MIME_NS);
     }
 
     @Override
@@ -697,7 +697,7 @@
             attribute.setSchemaTypeName(type.getSchemaType());
             String ns = name.getNamespaceURI();
             if (!ns.equals(root.getTargetNamespace())) {
-                XmlSchemaTools.addImportIfNeeded(root, ns);
+                XmlSchemaUtils.addImportIfNeeded(root, ns);
             }
         }
 

Modified: cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java Mon Jan  5 13:21:36 2009
@@ -41,6 +41,7 @@
 import org.apache.cxf.binding.soap.SoapBindingFactory;
 import org.apache.cxf.binding.soap.SoapTransportFactory;
 import org.apache.cxf.bus.extension.ExtensionManagerBus;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.util.SOAPConstants;
 import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.cxf.endpoint.Server;
@@ -54,7 +55,6 @@
 import org.apache.cxf.transport.ConduitInitiatorManager;
 import org.apache.cxf.transport.DestinationFactoryManager;
 import org.apache.cxf.transport.local.LocalTransportFactory;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.cxf.wsdl.WSDLManager;
 import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
 import org.apache.cxf.wsdl11.WSDLDefinitionBuilder;

Modified: cxf/sandbox/benson/lessjdom/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java Mon Jan  5 13:21:36 2009
@@ -36,18 +36,18 @@
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.namespace.QName;
 
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.ReflectionInvokationHandler;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
-import org.apache.cxf.common.xmlschema.XmlSchemaTools;
+import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.service.ServiceModelVisitor;
 import org.apache.cxf.service.model.FaultInfo;
 import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.service.model.SchemaInfo;
 import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaComplexType;
 import org.apache.ws.commons.schema.XmlSchemaElement;
@@ -326,7 +326,7 @@
 
     private XmlSchemaElement createXsElement(MessagePartInfo part, QName typeName, SchemaInfo schemaInfo) {
         XmlSchemaElement el = new XmlSchemaElement();
-        XmlSchemaTools.setElementQName(el, part.getElementQName());
+        XmlSchemaUtils.setElementQName(el, part.getElementQName());
         el.setNillable(true);
         el.setSchemaTypeName(typeName);
         part.setXmlSchema(el);
@@ -349,7 +349,7 @@
                 && !isExistSchemaElement(schemaInfo.getSchema(), part.getElementQName())) {
                     
                 XmlSchemaElement el = new XmlSchemaElement();
-                XmlSchemaTools.setElementQName(el, part.getElementQName());
+                XmlSchemaUtils.setElementQName(el, part.getElementQName());
                 el.setNillable(true);
                 
                 schemaInfo.getSchema().getItems().add(el);
@@ -382,7 +382,7 @@
             }
                 
             XmlSchemaElement el = new XmlSchemaElement();
-            XmlSchemaTools.setElementQName(el, part.getElementQName());
+            XmlSchemaUtils.setElementQName(el, part.getElementQName());
             
             schemaInfo.getSchema().getItems().add(el);
             schemaInfo.getSchema().getElements().add(el.getQName(), el);
@@ -411,7 +411,7 @@
                             String ns = schemaInfo.getSchema().getElementFormDefault()
                                 .getValue().equals(XmlSchemaForm.UNQUALIFIED) 
                                 ? "" : part.getElementQName().getLocalPart();
-                            XmlSchemaTools.setElementQName(el, 
+                            XmlSchemaUtils.setElementQName(el, 
                                                            new QName(ns, m.getName().substring(beginIdx)));
                             Iterator<QName> itr = beanInfo.getTypeNames().iterator();
                             if (!itr.hasNext()) {
@@ -470,7 +470,7 @@
         }
         
         XmlSchemaElement el = new XmlSchemaElement();
-        XmlSchemaTools.setElementQName(el, part.getElementQName());
+        XmlSchemaUtils.setElementQName(el, part.getElementQName());
         schema.getItems().add(el);
         schema.getElements().add(el.getQName(), el);
         part.setXmlSchema(el);
@@ -531,7 +531,7 @@
                            QName name, boolean isArray) {    
         XmlSchemaElement el = new XmlSchemaElement();
         el.setName(name.getLocalPart());
-        XmlSchemaTools.setElementQName(el, name);
+        XmlSchemaUtils.setElementQName(el, name);
 
         if (isArray) {
             el.setMinOccurs(0);
@@ -546,8 +546,8 @@
             QName ename = new QName(beanInfo.getElementNamespaceURI(null), 
                                    beanInfo.getElementLocalName(null));
             XmlSchemaElement el2 = schemas.getElementByQName(ename);
-            XmlSchemaTools.setElementQName(el, null);
-            XmlSchemaTools.setElementRefName(el, el2.getRefName());
+            XmlSchemaUtils.setElementQName(el, null);
+            XmlSchemaUtils.setElementRefName(el, el2.getRefName());
         } else {
             Iterator<QName> itr = beanInfo.getTypeNames().iterator();
             if (!itr.hasNext()) {

Modified: cxf/sandbox/benson/lessjdom/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WeatherService2Test.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WeatherService2Test.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WeatherService2Test.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WeatherService2Test.java Mon Jan  5 13:21:36 2009
@@ -21,8 +21,8 @@
 
 import org.w3c.dom.Node;
 
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.util.SOAPConstants;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: cxf/sandbox/benson/lessjdom/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/XMLBeansServiceTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/XMLBeansServiceTest.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/XMLBeansServiceTest.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/XMLBeansServiceTest.java Mon Jan  5 13:21:36 2009
@@ -22,8 +22,8 @@
 
 import org.w3c.dom.Node;
 
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.util.SOAPConstants;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: cxf/sandbox/benson/lessjdom/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/WeatherServiceRPCLitTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/WeatherServiceRPCLitTest.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/WeatherServiceRPCLitTest.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/WeatherServiceRPCLitTest.java Mon Jan  5 13:21:36 2009
@@ -28,8 +28,8 @@
 
 import net.webservicex.WeatherData;
 
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.util.SOAPConstants;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.cxf.xmlbeans.AbstractXmlBeansTest;
 import org.junit.Before;
 import org.junit.Test;

Modified: cxf/sandbox/benson/lessjdom/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java Mon Jan  5 13:21:36 2009
@@ -47,6 +47,7 @@
 import org.w3c.dom.Node;
 
 import org.apache.cxf.binding.soap.SoapMessage;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.helpers.XMLUtils;
 import org.apache.cxf.interceptor.Fault;
@@ -55,7 +56,6 @@
 import org.apache.cxf.message.XMLMessage;
 import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.cxf.staxutils.W3CDOMStreamWriter;
-import org.apache.cxf.wsdl.WSDLConstants;
 
 
 public class LogicalMessageImpl implements LogicalMessage {

Modified: cxf/sandbox/benson/lessjdom/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchOutDatabindingInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchOutDatabindingInterceptor.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchOutDatabindingInterceptor.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchOutDatabindingInterceptor.java Mon Jan  5 13:21:36 2009
@@ -55,6 +55,7 @@
 import org.apache.cxf.binding.soap.Soap12;
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.binding.soap.SoapVersion;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.databinding.DataWriter;
 import org.apache.cxf.databinding.source.NodeDataWriter;
@@ -72,7 +73,6 @@
 import org.apache.cxf.message.XMLMessage;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.staxutils.W3CDOMStreamWriter;
-import org.apache.cxf.wsdl.WSDLConstants;
 
 public class DispatchOutDatabindingInterceptor extends AbstractOutDatabindingInterceptor {
     private static final Logger LOG = LogUtils.getL7dLogger(DispatchOutDatabindingInterceptor.class);

Modified: cxf/sandbox/benson/lessjdom/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java Mon Jan  5 13:21:36 2009
@@ -43,6 +43,7 @@
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.io.CachedOutputStream;
@@ -51,7 +52,6 @@
 import org.apache.cxf.jaxws.ServiceImpl;
 import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.cxf.ws.addressing.JAXWSAConstants;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.cxf.wsdl.WSDLManager;
 
 public class ProviderImpl extends javax.xml.ws.spi.Provider {

Modified: cxf/sandbox/benson/lessjdom/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Mon Jan  5 13:21:36 2009
@@ -54,11 +54,12 @@
 import org.apache.cxf.BusException;
 import org.apache.cxf.binding.BindingFactoryManager;
 import org.apache.cxf.catalog.CatalogXmlSchemaURIResolver;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
-import org.apache.cxf.common.xmlschema.XmlSchemaTools;
+import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
 import org.apache.cxf.databinding.DataBinding;
 import org.apache.cxf.databinding.source.mime.MimeAttribute;
 import org.apache.cxf.databinding.source.mime.MimeSerializer;
@@ -94,7 +95,6 @@
 import org.apache.cxf.service.model.SchemaInfo;
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.cxf.service.model.UnwrappedOperationInfo;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.cxf.wsdl11.WSDLServiceBuilder;
 import org.apache.cxf.wsdl11.WSDLServiceFactory;
 import org.apache.ws.commons.schema.XmlSchema;
@@ -885,7 +885,7 @@
         XmlSchema schema = si.getSchema();
 
         XmlSchemaElement el = new XmlSchemaElement();
-        XmlSchemaTools.setElementQName(el, mpi.getElementQName());
+        XmlSchemaUtils.setElementQName(el, mpi.getElementQName());
         if (!isExistSchemaElement(schema, mpi.getElementQName())) {
             SchemaCollection.addGlobalElementToSchema(schema, el);
         }
@@ -992,7 +992,7 @@
             }
 
             XmlSchemaElement el = new XmlSchemaElement();
-            XmlSchemaTools.setElementQName(el, qname);
+            XmlSchemaUtils.setElementQName(el, qname);
             el.setNillable(true);
 
             if (!isExistSchemaElement(schema, qname)) {
@@ -1086,7 +1086,7 @@
                                             QName wrapperName) {
 
         XmlSchemaElement el = new XmlSchemaElement();
-        XmlSchemaTools.setElementQName(el, wrapperName);
+        XmlSchemaUtils.setElementQName(el, wrapperName);
         SchemaCollection.addGlobalElementToSchema(schema, el);
 
         wrappedMessage.getMessageParts().get(0).setXmlSchema(el);
@@ -1105,12 +1105,12 @@
 
         for (MessagePartInfo mpi : unwrappedMessage.getMessageParts()) {
             el = new XmlSchemaElement();
-            XmlSchemaTools.setElementQName(el, mpi.getName());
+            XmlSchemaUtils.setElementQName(el, mpi.getName());
             Map<Class, Boolean> jaxbAnnoMap = getJaxbAnnoMap(mpi);
             if (mpi.isElement()) {
                 addImport(schema, mpi.getElementQName().getNamespaceURI());
-                XmlSchemaTools.setElementQName(el, null);
-                XmlSchemaTools.setElementRefName(el, mpi.getElementQName());
+                XmlSchemaUtils.setElementQName(el, null);
+                XmlSchemaUtils.setElementRefName(el, mpi.getElementQName());
             } else {
                 if (mpi.getTypeQName() != null && !jaxbAnnoMap.containsKey(XmlList.class)) {
                     el.setSchemaTypeName(mpi.getTypeQName());
@@ -1154,7 +1154,7 @@
                     mpi.setElement(true);
                     mpi.setElementQName(newName);
                     mpi.setConcreteName(newName); 
-                    XmlSchemaTools.setElementQName(el, newName);
+                    XmlSchemaUtils.setElementQName(el, newName);
                 }
                 
                 if (Collection.class.isAssignableFrom(mpi.getTypeClass())
@@ -1178,7 +1178,7 @@
             if (Boolean.TRUE.equals(mpi.getProperty(HEADER))) {
                 QName qn = (QName)mpi.getProperty(ELEMENT_NAME);
 
-                XmlSchemaTools.setElementQName(el, qn);
+                XmlSchemaUtils.setElementQName(el, qn);
 
                 SchemaInfo headerSchemaInfo = getOrCreateSchema(serviceInfo, qn.getNamespaceURI(),
                                                                 getQualifyWrapperSchema());

Modified: cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/AttributeInfo.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/AttributeInfo.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/AttributeInfo.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/AttributeInfo.java Mon Jan  5 13:21:36 2009
@@ -26,6 +26,7 @@
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
 import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
+import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaAnnotated;
 import org.apache.ws.commons.schema.XmlSchemaAnyAttribute;

Modified: cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java Mon Jan  5 13:21:36 2009
@@ -30,10 +30,11 @@
 import org.w3c.dom.Attr;
 
 import org.apache.cxf.aegis.type.mtom.AbstractXOPType;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
 import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
+import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
 import org.apache.cxf.databinding.source.mime.MimeAttribute;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.ws.commons.schema.XmlSchemaComplexType;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaObject;

Modified: cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java Mon Jan  5 13:21:36 2009
@@ -27,6 +27,7 @@
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
 import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
+import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaObject;

Modified: cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java Mon Jan  5 13:21:36 2009
@@ -34,16 +34,17 @@
 import org.apache.cxf.binding.soap.SoapBindingFactory;
 import org.apache.cxf.binding.soap.SoapVersion;
 import org.apache.cxf.binding.soap.model.SoapBindingInfo;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
+import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
 import org.apache.cxf.javascript.JavascriptUtils;
 import org.apache.cxf.javascript.NameManager;
 import org.apache.cxf.javascript.NamespacePrefixAccumulator;
 import org.apache.cxf.javascript.ParticleInfo;
 import org.apache.cxf.javascript.UnsupportedConstruct;
-import org.apache.cxf.javascript.XmlSchemaUtils;
 import org.apache.cxf.service.ServiceModelVisitor;
 import org.apache.cxf.service.model.BindingInfo;
 import org.apache.cxf.service.model.EndpointInfo;
@@ -54,7 +55,6 @@
 import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.cxf.transport.local.LocalTransportFactory;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaAny;
 import org.apache.ws.commons.schema.XmlSchemaComplexType;

Modified: cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/javascript/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java Mon Jan  5 13:21:36 2009
@@ -29,7 +29,7 @@
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
-import org.apache.cxf.common.xmlschema.XmlSchemaTools;
+import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
 import org.apache.cxf.javascript.AttributeInfo;
 import org.apache.cxf.javascript.ItemInfo;
 import org.apache.cxf.javascript.JavascriptUtils;
@@ -37,7 +37,6 @@
 import org.apache.cxf.javascript.NamespacePrefixAccumulator;
 import org.apache.cxf.javascript.ParticleInfo;
 import org.apache.cxf.javascript.UnsupportedConstruct;
-import org.apache.cxf.javascript.XmlSchemaUtils;
 import org.apache.cxf.service.model.SchemaInfo;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaAnnotated;
@@ -111,8 +110,8 @@
                 }
             } else if (xmlSchemaObject instanceof XmlSchemaSimpleType) {
                 XmlSchemaSimpleType simpleType = (XmlSchemaSimpleType)xmlSchemaObject;
-                if (XmlSchemaTools.isEumeration(simpleType)) {
-                    List<String> values = XmlSchemaTools.enumeratorValues(simpleType);
+                if (XmlSchemaUtils.isEumeration(simpleType)) {
+                    List<String> values = XmlSchemaUtils.enumeratorValues(simpleType);
                     code.append("//\n");
                     code.append("// Simple type (enumeration) " + simpleType.getQName() + "\n");
                     code.append("//\n");

Modified: cxf/sandbox/benson/lessjdom/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java (original)
+++ cxf/sandbox/benson/lessjdom/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java Mon Jan  5 13:21:36 2009
@@ -53,6 +53,7 @@
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.binding.soap.SoapMessage;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
@@ -88,7 +89,6 @@
 import org.apache.cxf.ws.security.tokenstore.MemoryTokenStore;
 import org.apache.cxf.ws.security.tokenstore.SecurityToken;
 import org.apache.cxf.ws.security.tokenstore.TokenStore;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.velocity.util.ClassUtils;
 import org.apache.ws.security.WSConstants;
 import org.apache.ws.security.WSEncryptionPart;

Modified: cxf/sandbox/benson/lessjdom/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java Mon Jan  5 13:21:36 2009
@@ -50,6 +50,7 @@
 import javax.wsdl.extensions.soap12.SOAP12Operation;
 import javax.xml.namespace.QName;
 
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.tools.common.ExtensionInvocationHandler;
 import org.apache.cxf.tools.common.extensions.soap.SoapAddress;
@@ -58,7 +59,6 @@
 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: cxf/sandbox/benson/lessjdom/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java Mon Jan  5 13:21:36 2009
@@ -19,7 +19,8 @@
 
 package org.apache.cxf.tools.common;
 
-import org.apache.cxf.wsdl.WSDLConstants;
+import org.apache.cxf.common.WSDLConstants;
+
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: cxf/sandbox/benson/lessjdom/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java Mon Jan  5 13:21:36 2009
@@ -45,9 +45,9 @@
 import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
 import org.apache.cxf.binding.corba.wsdl.OperationType;
 import org.apache.cxf.binding.corba.wsdl.TypeMappingType;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.wsdl.JAXBExtensionHelper;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.apache.ws.commons.schema.XmlSchemaImport;

Modified: cxf/sandbox/benson/lessjdom/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java Mon Jan  5 13:21:36 2009
@@ -38,6 +38,7 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.BusApplicationContext;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.StringUtils;
@@ -55,7 +56,6 @@
 import org.apache.cxf.tools.common.ToolException;
 import org.apache.cxf.tools.java2wsdl.processor.internal.ServiceBuilderFactory;
 import org.apache.cxf.tools.util.AnnotationUtil;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.ApplicationContext;

Modified: cxf/sandbox/benson/lessjdom/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java Mon Jan  5 13:21:36 2009
@@ -19,9 +19,9 @@
 
 package org.apache.cxf.tools.java2wsdl.generator;
 
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.util.PackageUtils;
 import org.apache.cxf.tools.common.ToolException;
-import org.apache.cxf.wsdl.WSDLConstants;
 
 public final class WSDLGeneratorFactory {
     private WSDLConstants.WSDLVersion wsdlVersion;

Modified: cxf/sandbox/benson/lessjdom/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java Mon Jan  5 13:21:36 2009
@@ -32,6 +32,7 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.BusApplicationContext;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.StringUtils;
@@ -48,7 +49,6 @@
 import org.apache.cxf.tools.java2wsdl.generator.wsdl11.WrapperBeanGenerator;
 import org.apache.cxf.tools.java2wsdl.processor.internal.ServiceBuilderFactory;
 import org.apache.cxf.tools.util.AnnotationUtil;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.ApplicationContext;

Modified: cxf/sandbox/benson/lessjdom/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java Mon Jan  5 13:21:36 2009
@@ -19,8 +19,8 @@
 
 package org.apache.cxf.tools.java2wsdl.generator;
 
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.tools.java2wsdl.generator.wsdl11.WSDL11Generator;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: cxf/sandbox/benson/lessjdom/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java Mon Jan  5 13:21:36 2009
@@ -27,6 +27,7 @@
 import javax.wsdl.Service;
 import javax.xml.namespace.QName;
 
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.helpers.WSDLHelper;
 import org.apache.cxf.tools.common.ProcessorTestBase;
 import org.apache.cxf.tools.common.ToolConstants;
@@ -36,7 +37,6 @@
 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.Before;
 import org.junit.Test;

Modified: cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/Stax2DOM.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/Stax2DOM.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/Stax2DOM.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/Stax2DOM.java Mon Jan  5 13:21:36 2009
@@ -41,11 +41,11 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
+import org.apache.cxf.common.WSDLConstants;
 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.util.URIParserUtil;
-import org.apache.cxf.wsdl.WSDLConstants;
 
 public class Stax2DOM {
 

Modified: cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java Mon Jan  5 13:21:36 2009
@@ -42,13 +42,13 @@
 import org.xml.sax.SAXException;
 
 import org.apache.cxf.BusFactory;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.cxf.tools.common.ToolException;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.cxf.wsdl11.SchemaUtil;
 
 public final class ValidatorUtil {

Modified: cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java Mon Jan  5 13:21:36 2009
@@ -52,6 +52,7 @@
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.StringUtils;
@@ -73,7 +74,6 @@
 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.wsdl.WSDLManager;
 import org.apache.cxf.wsdl11.SchemaUtil;
 import org.apache.ws.commons.schema.XmlSchemaElement;

Modified: cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XBinding.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XBinding.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XBinding.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XBinding.java Mon Jan  5 13:21:36 2009
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.tools.validator.internal.model;
 
-import org.apache.cxf.wsdl.WSDLConstants;
+import org.apache.cxf.common.WSDLConstants;
 
 public final class XBinding extends XWsdl {
 

Modified: cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XDef.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XDef.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XDef.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XDef.java Mon Jan  5 13:21:36 2009
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.tools.validator.internal.model;
 
-import org.apache.cxf.wsdl.WSDLConstants;
+import org.apache.cxf.common.WSDLConstants;
 
 public final class XDef extends XWsdl {
 

Modified: cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XFault.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XFault.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XFault.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XFault.java Mon Jan  5 13:21:36 2009
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.tools.validator.internal.model;
 
-import org.apache.cxf.wsdl.WSDLConstants;
+import org.apache.cxf.common.WSDLConstants;
 
 public final class XFault extends XWsdl {
     public XFault() {

Modified: cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XInput.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XInput.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XInput.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XInput.java Mon Jan  5 13:21:36 2009
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.tools.validator.internal.model;
 
-import org.apache.cxf.wsdl.WSDLConstants;
+import org.apache.cxf.common.WSDLConstants;
 
 public final class XInput extends XWsdl {
     public XInput() {

Modified: cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XMessage.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XMessage.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XMessage.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XMessage.java Mon Jan  5 13:21:36 2009
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.tools.validator.internal.model;
 
-import org.apache.cxf.wsdl.WSDLConstants;
+import org.apache.cxf.common.WSDLConstants;
 
 public final class XMessage extends XWsdl {
     public XMessage() {

Modified: cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOperation.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOperation.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOperation.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOperation.java Mon Jan  5 13:21:36 2009
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.tools.validator.internal.model;
 
-import org.apache.cxf.wsdl.WSDLConstants;
+import org.apache.cxf.common.WSDLConstants;
 
 public final class XOperation extends XWsdl {
     public XOperation() {

Modified: cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOutput.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOutput.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOutput.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOutput.java Mon Jan  5 13:21:36 2009
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.tools.validator.internal.model;
 
-import org.apache.cxf.wsdl.WSDLConstants;
+import org.apache.cxf.common.WSDLConstants;
 
 public final class XOutput extends XWsdl {
     public XOutput() {

Modified: cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPort.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPort.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPort.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPort.java Mon Jan  5 13:21:36 2009
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.tools.validator.internal.model;
 
-import org.apache.cxf.wsdl.WSDLConstants;
+import org.apache.cxf.common.WSDLConstants;
 
 public final class XPort extends XWsdl {
 

Modified: cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPortType.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPortType.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPortType.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPortType.java Mon Jan  5 13:21:36 2009
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.tools.validator.internal.model;
 
-import org.apache.cxf.wsdl.WSDLConstants;
+import org.apache.cxf.common.WSDLConstants;
 
 public final class XPortType extends XWsdl {
     public XPortType() {

Modified: cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XService.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XService.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XService.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XService.java Mon Jan  5 13:21:36 2009
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.tools.validator.internal.model;
 
-import org.apache.cxf.wsdl.WSDLConstants;
+import org.apache.cxf.common.WSDLConstants;
 
 public final class XService extends XWsdl {
 

Modified: cxf/sandbox/benson/lessjdom/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java Mon Jan  5 13:21:36 2009
@@ -19,7 +19,8 @@
 
 package org.apache.cxf.tools.validator.internal.model;
 
-import org.apache.cxf.wsdl.WSDLConstants;
+import org.apache.cxf.common.WSDLConstants;
+
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: cxf/sandbox/benson/lessjdom/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java Mon Jan  5 13:21:36 2009
@@ -42,6 +42,7 @@
 import org.w3c.dom.Element;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.PropertiesLoaderUtils;
@@ -67,7 +68,6 @@
 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;
 
 public class WSDLToJavaContainer extends AbstractCXFToolContainer {

Modified: cxf/sandbox/benson/lessjdom/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java Mon Jan  5 13:21:36 2009
@@ -36,6 +36,7 @@
 import org.w3c.dom.Element;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.util.PropertiesLoaderUtils;
 import org.apache.cxf.common.util.StringUtils;
@@ -56,7 +57,6 @@
 import org.apache.cxf.tools.wsdlto.core.AbstractWSDLBuilder;
 import org.apache.cxf.tools.wsdlto.core.FrontEndProfile;
 import org.apache.cxf.tools.wsdlto.core.PluginLoader;
-import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.cxf.wsdl11.WSDLServiceBuilder;
 
 public class JavaScriptContainer extends WSDLToJavaContainer {

Modified: cxf/sandbox/benson/lessjdom/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessor.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessor.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessor.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessor.java Mon Jan  5 13:21:36 2009
@@ -31,12 +31,12 @@
 import javax.wsdl.xml.WSDLWriter;
 import javax.xml.namespace.QName;
 
+import org.apache.cxf.common.WSDLConstants;
 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.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: cxf/sandbox/benson/lessjdom/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java Mon Jan  5 13:21:36 2009
@@ -40,6 +40,7 @@
 import javax.wsdl.xml.WSDLWriter;
 import javax.xml.namespace.QName;
 
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.tools.common.ToolException;
@@ -48,7 +49,6 @@
 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: cxf/sandbox/benson/lessjdom/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java Mon Jan  5 13:21:36 2009
@@ -40,12 +40,12 @@
 import javax.wsdl.xml.WSDLWriter;
 import javax.xml.namespace.QName;
 
+import org.apache.cxf.common.WSDLConstants;
 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.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: cxf/sandbox/benson/lessjdom/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/lessjdom/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java?rev=731729&r1=731728&r2=731729&view=diff
==============================================================================
--- cxf/sandbox/benson/lessjdom/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java (original)
+++ cxf/sandbox/benson/lessjdom/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java Mon Jan  5 13:21:36 2009
@@ -39,6 +39,7 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.tools.common.Processor;
@@ -50,7 +51,6 @@
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBinding;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBindingDeserializer;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBindingSerializer;
-import org.apache.cxf.wsdl.WSDLConstants;
 
 public class XSDToWSDLProcessor implements Processor {
     private static final Logger LOG = LogUtils.getL7dLogger(XSDToWSDLProcessor.class);



Mime
View raw message