Modified: cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java (original) +++ cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java Thu Jul 11 20:47:46 2013 @@ -29,12 +29,10 @@ import java.util.logging.Logger; import javax.xml.namespace.QName; - import org.apache.cxf.binding.soap.SoapBindingConstants; 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; @@ -54,6 +52,7 @@ import org.apache.cxf.service.model.Mess import org.apache.cxf.service.model.MessagePartInfo; import org.apache.cxf.service.model.OperationInfo; 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;
Modified: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java (original) +++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java Thu Jul 11 20:47:46 2013 @@ -38,12 +38,12 @@ import javax.xml.stream.XMLStreamExcepti import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; -import org.apache.cxf.common.WSDLConstants; import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.staxutils.DelegatingXMLStreamWriter; import org.apache.cxf.staxutils.DepthXMLStreamReader; import org.apache.cxf.staxutils.DocumentDepthProperties; import org.apache.cxf.staxutils.transform.IgnoreNamespacesWriter; +import org.apache.cxf.wsdl.WSDLConstants; import org.codehaus.jettison.AbstractXMLStreamWriter; import org.codehaus.jettison.badgerfish.BadgerFishXMLInputFactory; import org.codehaus.jettison.badgerfish.BadgerFishXMLOutputFactory; Modified: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceAegisElementProvider.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceAegisElementProvider.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceAegisElementProvider.java (original) +++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceAegisElementProvider.java Thu Jul 11 20:47:46 2013 @@ -31,7 +31,7 @@ import org.apache.cxf.aegis.type.TypeCre import org.apache.cxf.aegis.type.TypeMapping; import org.apache.cxf.aegis.type.XMLTypeCreator; import org.apache.cxf.aegis.type.java5.Java5TypeCreator; -import org.apache.cxf.common.util.SOAPConstants; +import org.apache.ws.commons.schema.constants.Constants; /** * Class that sets options to disable xml namespaces. @@ -76,7 +76,7 @@ class NoNamespaceAegisElementProvider<T> context.setTypeCreationOptions(tco); context.setRootClasses(rootClasses); TypeMapping baseMapping = DefaultTypeMapping.createSoap11TypeMapping(true, false, false); - DefaultTypeMapping mapping = new DefaultTypeMapping(SOAPConstants.XSD, baseMapping); + DefaultTypeMapping mapping = new DefaultTypeMapping(Constants.URI_2001_SCHEMA_XSD, baseMapping); TypeCreator stockTypeCreator = createTypeCreator(tco); mapping.setTypeCreator(stockTypeCreator); Modified: cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java (original) +++ cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java Thu Jul 11 20:47:46 2013 @@ -46,7 +46,6 @@ import javax.jms.StreamMessage; import javax.jms.Topic; import org.apache.cxf.common.logging.LogUtils; -import org.apache.cxf.common.util.SOAPConstants; import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.helpers.HttpHeaderHelper; @@ -630,7 +629,7 @@ public final class JMSUtils { String soapAction = null; if (headers != null) { - List<String> action = headers.remove(SOAPConstants.SOAP_ACTION); + List<String> action = headers.remove("SOAPAction"); if (action != null && action.size() > 0) { soapAction = action.get(0); } Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java (original) +++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java Thu Jul 11 20:47:46 2013 @@ -34,11 +34,9 @@ import javax.management.ObjectName; import javax.management.openmbean.CompositeData; import javax.xml.namespace.QName; - import org.apache.cxf.Bus; import org.apache.cxf.binding.soap.model.SoapBindingInfo; import org.apache.cxf.bus.spring.SpringBusFactory; -import org.apache.cxf.common.WSDLConstants; import org.apache.cxf.endpoint.Endpoint; import org.apache.cxf.endpoint.EndpointImpl; import org.apache.cxf.management.InstrumentationManager; @@ -51,6 +49,7 @@ import org.apache.cxf.service.model.Serv import org.apache.cxf.ws.addressing.EndpointReferenceType; import org.apache.cxf.ws.rm.v200702.Identifier; import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement; +import org.apache.cxf.wsdl.WSDLConstants; import org.easymock.EasyMock; import org.easymock.IMocksControl; Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java Thu Jul 11 20:47:46 2013 @@ -57,7 +57,6 @@ import org.w3c.dom.NodeList; import org.apache.cxf.Bus; import org.apache.cxf.binding.soap.SoapMessage; import org.apache.cxf.binding.soap.saaj.SAAJUtils; -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; @@ -78,6 +77,7 @@ import org.apache.cxf.ws.security.Securi import org.apache.cxf.ws.security.tokenstore.SecurityToken; import org.apache.cxf.ws.security.tokenstore.TokenStore; import org.apache.cxf.ws.security.tokenstore.TokenStoreFactory; +import org.apache.cxf.wsdl.WSDLConstants; import org.apache.neethi.Assertion; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java (from r1502294, cxf/trunk/api/src/main/java/org/apache/cxf/common/WSDLConstants.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/common/WSDLConstants.java&r1=1502294&r2=1502354&rev=1502354&view=diff ============================================================================== --- cxf/trunk/api/src/main/java/org/apache/cxf/common/WSDLConstants.java (original) +++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java Thu Jul 11 20:47:46 2013 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.cxf.common; +package org.apache.cxf.wsdl; import javax.xml.namespace.QName; Modified: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java (original) +++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java Thu Jul 11 20:47:46 2013 @@ -63,7 +63,6 @@ import org.apache.cxf.BusException; import org.apache.cxf.annotations.EvaluateAllEndpoints; import org.apache.cxf.binding.BindingFactoryManager; import org.apache.cxf.catalog.CatalogXmlSchemaURIResolver; -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; @@ -108,6 +107,7 @@ import org.apache.cxf.service.model.Oper 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.wsdl.WSDLManager; import org.apache.cxf.wsdl11.WSDLServiceBuilder; import org.apache.cxf.wsdl11.WSDLServiceFactory; Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/NSManager.java (from r1502294, cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/NSManager.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/NSManager.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/NSManager.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/NSManager.java&r1=1502294&r2=1502354&rev=1502354&view=diff ============================================================================== --- cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/NSManager.java (original) +++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/NSManager.java Thu Jul 11 20:47:46 2013 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.cxf.ws.addressing; +package org.apache.cxf.wsdl11; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -25,7 +25,8 @@ import java.util.HashMap; 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 @@ -38,7 +39,7 @@ import org.apache.cxf.common.WSDLConstan public static final String NS_WSAW = "http://www.w3.org/2006/05/addressing/wsdl";; ***/ -public final class NSManager { +final class NSManager { private final Map<String, String> cache = new HashMap<String, String>(); Modified: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java (original) +++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java Thu Jul 11 20:47:46 2013 @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.wsdl.Binding; import javax.wsdl.BindingFault; import javax.wsdl.BindingInput; @@ -49,9 +50,9 @@ import javax.wsdl.extensions.soap12.SOAP import javax.wsdl.extensions.soap12.SOAP12Operation; import javax.xml.namespace.QName; -import org.apache.cxf.common.WSDLConstants; import org.apache.cxf.common.util.ExtensionInvocationHandler; import org.apache.cxf.common.util.StringUtils; +import org.apache.cxf.wsdl.WSDLConstants; public final class SOAPBindingUtil { Modified: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java (original) +++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java Thu Jul 11 20:47:46 2013 @@ -60,7 +60,6 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.apache.cxf.Bus; -import org.apache.cxf.common.WSDLConstants; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.service.model.AbstractMessageContainer; @@ -77,7 +76,7 @@ import org.apache.cxf.service.model.Mess 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.ws.addressing.NSManager; +import org.apache.cxf.wsdl.WSDLConstants; import org.apache.cxf.wsdl.WSDLManager; import org.apache.ws.commons.schema.XmlSchemaExternal; import org.apache.ws.commons.schema.XmlSchemaImport; Modified: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java (original) +++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java Thu Jul 11 20:47:46 2013 @@ -45,12 +45,12 @@ import org.xml.sax.InputSource; import org.apache.cxf.Bus; import org.apache.cxf.BusException; -import org.apache.cxf.common.WSDLConstants; import org.apache.cxf.common.injection.NoJSR250Annotations; import org.apache.cxf.common.util.CacheMap; import org.apache.cxf.configuration.ConfiguredBeanLocator; import org.apache.cxf.service.model.ServiceSchemaInfo; import org.apache.cxf.staxutils.StaxUtils; +import org.apache.cxf.wsdl.WSDLConstants; import org.apache.cxf.wsdl.WSDLExtensionLoader; import org.apache.cxf.wsdl.WSDLManager; Copied: cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/NSManagerTest.java (from r1502294, cxf/trunk/api/src/test/java/org/apache/cxf/NSManagerTest.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/NSManagerTest.java?p2=cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/NSManagerTest.java&p1=cxf/trunk/api/src/test/java/org/apache/cxf/NSManagerTest.java&r1=1502294&r2=1502354&rev=1502354&view=diff ============================================================================== --- cxf/trunk/api/src/test/java/org/apache/cxf/NSManagerTest.java (original) +++ cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/NSManagerTest.java Thu Jul 11 20:47:46 2013 @@ -17,11 +17,10 @@ * under the License. */ -package org.apache.cxf; +package org.apache.cxf.wsdl11; -import org.apache.cxf.common.WSDLConstants; import org.apache.cxf.ws.addressing.JAXWSAConstants; -import org.apache.cxf.ws.addressing.NSManager; +import org.apache.cxf.wsdl.WSDLConstants; import org.junit.Assert; import org.junit.Test; Modified: cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java (original) +++ cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java Thu Jul 11 20:47:46 2013 @@ -34,7 +34,6 @@ import org.w3c.dom.NodeList; import org.apache.cxf.Bus; import org.apache.cxf.aegis.databinding.AegisDatabinding; import org.apache.cxf.aegis.type.mtom.AbstractXOPType; -import org.apache.cxf.common.util.SOAPConstants; import org.apache.cxf.endpoint.Server; import org.apache.cxf.frontend.ClientProxyFactoryBean; import org.apache.cxf.helpers.IOUtils; @@ -44,6 +43,7 @@ import org.apache.cxf.systest.aegis.mtom import org.apache.cxf.systest.aegis.mtom.fortest.MtomTestService; import org.apache.cxf.test.TestUtilities; import org.apache.cxf.testutil.common.TestUtil; +import org.apache.ws.commons.schema.constants.Constants; import org.junit.Assert; import org.junit.Test; @@ -165,7 +165,7 @@ public class MtomTest extends AbstractJU Assert.assertEquals("base64Binary", pieces[1]); Node elementNode = typeAttr.getOwnerElement(); String url = testUtilities.resolveNamespacePrefix(pieces[0], elementNode); - Assert.assertEquals(SOAPConstants.XSD, url); + Assert.assertEquals(Constants.URI_2001_SCHEMA_XSD, url); s = testUtilities.getServerForAddress("http://localhost:"; + PORT + "/mtomXmime"); wsdl = testUtilities.getWSDLDocument(s); Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java (original) +++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java Thu Jul 11 20:47:46 2013 @@ -56,7 +56,6 @@ import org.apache.cxf.anonymous_complex_ import org.apache.cxf.anonymous_complex_type.SplitNameResponse.Names; import org.apache.cxf.binding.soap.Soap11; import org.apache.cxf.binding.soap.SoapFault; -import org.apache.cxf.common.WSDLConstants; import org.apache.cxf.common.util.ASMHelper; import org.apache.cxf.common.util.ReflectionUtil; import org.apache.cxf.endpoint.Client; @@ -82,6 +81,7 @@ import org.apache.cxf.tests.inherit.obje import org.apache.cxf.tests.inherit.objects.SubTypeB; import org.apache.cxf.tests.inherit.types.ObjectInfo; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; +import org.apache.cxf.wsdl.WSDLConstants; import org.junit.BeforeClass; import org.junit.Test; Modified: cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java (original) +++ cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java Thu Jul 11 20:47:46 2013 @@ -19,7 +19,7 @@ package org.apache.cxf.tools.common; -import org.apache.cxf.common.WSDLConstants; +import org.apache.cxf.wsdl.WSDLConstants; import org.junit.Assert; import org.junit.Test; Modified: cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java (original) +++ cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java Thu Jul 11 20:47:46 2013 @@ -45,8 +45,8 @@ import org.apache.cxf.binding.corba.wsdl 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.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.XmlSchemaExternal; Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java (original) +++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java Thu Jul 11 20:47:46 2013 @@ -37,7 +37,6 @@ import javax.xml.ws.soap.SOAPBinding; 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; @@ -55,6 +54,7 @@ import org.apache.cxf.tools.common.ToolC 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; public class JavaToJSProcessor implements Processor { private static final Logger LOG = LogUtils.getL7dLogger(JavaToJSProcessor.class); Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java (original) +++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java Thu Jul 11 20:47:46 2013 @@ -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/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java (original) +++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java Thu Jul 11 20:47:46 2013 @@ -40,7 +40,6 @@ import javax.xml.stream.XMLStreamExcepti import org.w3c.dom.Element; -import org.apache.cxf.common.WSDLConstants; import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.service.model.SchemaInfo; @@ -50,6 +49,7 @@ import org.apache.cxf.tools.java2wsdl.ge import org.apache.cxf.tools.util.FileWriterUtil; import org.apache.cxf.tools.util.OutputStreamCreator; import org.apache.cxf.tools.wsdlto.core.WSDLDefinitionBuilder; +import org.apache.cxf.wsdl.WSDLConstants; import org.apache.cxf.wsdl11.ServiceWSDLBuilder; public class WSDL11Generator extends AbstractGenerator<Definition> { Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java (original) +++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java Thu Jul 11 20:47:46 2013 @@ -31,7 +31,6 @@ import javax.xml.ws.soap.SOAPBinding; 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; @@ -48,6 +47,7 @@ import org.apache.cxf.tools.java2wsdl.ge 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; public class JavaToWSDLProcessor implements Processor { Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java (original) +++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java Thu Jul 11 20:47:46 2013 @@ -19,8 +19,9 @@ 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/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java (original) +++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java Thu Jul 11 20:47:46 2013 @@ -32,7 +32,6 @@ import javax.xml.namespace.QName; import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.apache.cxf.common.WSDLConstants; import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.staxutils.StaxUtils; @@ -44,6 +43,7 @@ import org.apache.cxf.tools.wsdlto.core. 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.apache.cxf.wsdl.WSDLHelper; import org.junit.After; Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java (original) +++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java Thu Jul 11 20:47:46 2013 @@ -30,6 +30,7 @@ import java.util.List; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; + import javax.wsdl.Definition; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -39,16 +40,17 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; + 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/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java (original) +++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java Thu Jul 11 20:47:46 2013 @@ -32,6 +32,7 @@ import java.util.Map; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; + import javax.wsdl.Binding; import javax.wsdl.BindingOperation; import javax.wsdl.Definition; @@ -52,7 +53,6 @@ import org.w3c.dom.Node; 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; @@ -74,6 +74,7 @@ import org.apache.cxf.tools.validator.in 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/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XBinding.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XBinding.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XBinding.java (original) +++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XBinding.java Thu Jul 11 20:47:46 2013 @@ -19,7 +19,7 @@ package org.apache.cxf.tools.validator.internal.model; -import org.apache.cxf.common.WSDLConstants; +import org.apache.cxf.wsdl.WSDLConstants; public final class XBinding extends XWsdl { Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XDef.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XDef.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XDef.java (original) +++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XDef.java Thu Jul 11 20:47:46 2013 @@ -19,7 +19,7 @@ package org.apache.cxf.tools.validator.internal.model; -import org.apache.cxf.common.WSDLConstants; +import org.apache.cxf.wsdl.WSDLConstants; public final class XDef extends XWsdl { Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XFault.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XFault.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XFault.java (original) +++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XFault.java Thu Jul 11 20:47:46 2013 @@ -19,7 +19,7 @@ package org.apache.cxf.tools.validator.internal.model; -import org.apache.cxf.common.WSDLConstants; +import org.apache.cxf.wsdl.WSDLConstants; public final class XFault extends XWsdl { public XFault() { Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XInput.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XInput.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XInput.java (original) +++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XInput.java Thu Jul 11 20:47:46 2013 @@ -19,7 +19,7 @@ package org.apache.cxf.tools.validator.internal.model; -import org.apache.cxf.common.WSDLConstants; +import org.apache.cxf.wsdl.WSDLConstants; public final class XInput extends XWsdl { public XInput() { Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XMessage.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XMessage.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XMessage.java (original) +++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XMessage.java Thu Jul 11 20:47:46 2013 @@ -19,7 +19,7 @@ package org.apache.cxf.tools.validator.internal.model; -import org.apache.cxf.common.WSDLConstants; +import org.apache.cxf.wsdl.WSDLConstants; public final class XMessage extends XWsdl { public XMessage() { Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOperation.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOperation.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOperation.java (original) +++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOperation.java Thu Jul 11 20:47:46 2013 @@ -19,7 +19,7 @@ package org.apache.cxf.tools.validator.internal.model; -import org.apache.cxf.common.WSDLConstants; +import org.apache.cxf.wsdl.WSDLConstants; public final class XOperation extends XWsdl { public XOperation() { Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOutput.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOutput.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOutput.java (original) +++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOutput.java Thu Jul 11 20:47:46 2013 @@ -19,7 +19,7 @@ package org.apache.cxf.tools.validator.internal.model; -import org.apache.cxf.common.WSDLConstants; +import org.apache.cxf.wsdl.WSDLConstants; public final class XOutput extends XWsdl { public XOutput() { Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPort.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPort.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPort.java (original) +++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPort.java Thu Jul 11 20:47:46 2013 @@ -19,7 +19,7 @@ package org.apache.cxf.tools.validator.internal.model; -import org.apache.cxf.common.WSDLConstants; +import org.apache.cxf.wsdl.WSDLConstants; public final class XPort extends XWsdl { Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPortType.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPortType.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPortType.java (original) +++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPortType.java Thu Jul 11 20:47:46 2013 @@ -19,7 +19,7 @@ package org.apache.cxf.tools.validator.internal.model; -import org.apache.cxf.common.WSDLConstants; +import org.apache.cxf.wsdl.WSDLConstants; public final class XPortType extends XWsdl { public XPortType() { Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XService.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XService.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XService.java (original) +++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XService.java Thu Jul 11 20:47:46 2013 @@ -19,7 +19,7 @@ package org.apache.cxf.tools.validator.internal.model; -import org.apache.cxf.common.WSDLConstants; +import org.apache.cxf.wsdl.WSDLConstants; public final class XService extends XWsdl { Modified: cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java (original) +++ cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java Thu Jul 11 20:47:46 2013 @@ -19,7 +19,7 @@ package org.apache.cxf.tools.validator.internal.model; -import org.apache.cxf.common.WSDLConstants; +import org.apache.cxf.wsdl.WSDLConstants; import org.junit.Assert; import org.junit.Test; Modified: cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java (original) +++ cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java Thu Jul 11 20:47:46 2013 @@ -55,7 +55,6 @@ import javax.xml.namespace.QName; 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; @@ -89,6 +88,7 @@ import org.apache.cxf.tools.validator.Se 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.wsdl.WSDLManager; import org.apache.cxf.wsdl11.WSDLServiceBuilder; import org.apache.ws.commons.schema.XmlSchema; Modified: cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java (original) +++ cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java Thu Jul 11 20:47:46 2013 @@ -52,7 +52,6 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathFactory; - import org.w3c.dom.Attr; import org.w3c.dom.DOMException; import org.w3c.dom.Document; @@ -98,7 +97,6 @@ import com.sun.tools.xjc.reader.xmlschem import org.apache.cxf.Bus; import org.apache.cxf.catalog.OASISCatalogManager; import org.apache.cxf.catalog.OASISCatalogManagerHelper; -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.ReflectionUtil; @@ -123,6 +121,7 @@ import org.apache.cxf.tools.util.OutputS import org.apache.cxf.tools.wsdlto.core.DataBindingProfile; import org.apache.cxf.tools.wsdlto.core.DefaultValueProvider; import org.apache.cxf.tools.wsdlto.core.RandomValueProvider; +import org.apache.cxf.wsdl.WSDLConstants; import org.apache.ws.commons.schema.XmlSchema; import org.apache.ws.commons.schema.XmlSchemaSerializer; import org.apache.ws.commons.schema.XmlSchemaSerializer.XmlSchemaSerializerException; Modified: cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java (original) +++ cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java Thu Jul 11 20:47:46 2013 @@ -34,7 +34,6 @@ import java.util.logging.Level; import javax.wsdl.Definition; 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; @@ -55,6 +54,7 @@ import org.apache.cxf.tools.wsdlto.WSDLT 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/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessor.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessor.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessor.java (original) +++ cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessor.java Thu Jul 11 20:47:46 2013 @@ -22,6 +22,7 @@ package org.apache.cxf.tools.misc.proces import java.io.IOException; import java.io.Writer; import java.util.Map; + import javax.wsdl.Binding; import javax.wsdl.Port; import javax.wsdl.Service; @@ -30,13 +31,13 @@ import javax.wsdl.extensions.Extensibili 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.helpers.CastUtils; 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/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java (original) +++ cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java Thu Jul 11 20:47:46 2013 @@ -45,11 +45,11 @@ import org.apache.cxf.binding.soap.wsdl. import org.apache.cxf.binding.soap.wsdl.extensions.SoapBody; import org.apache.cxf.binding.soap.wsdl.extensions.SoapFault; import org.apache.cxf.binding.soap.wsdl.extensions.SoapOperation; -import org.apache.cxf.common.WSDLConstants; import org.apache.cxf.common.i18n.Message; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.tools.common.ToolConstants; import org.apache.cxf.tools.common.ToolException; +import org.apache.cxf.wsdl.WSDLConstants; public class WSDLToSoapProcessor extends AbstractWSDLToProcessor { Modified: cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java (original) +++ cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java Thu Jul 11 20:47:46 2013 @@ -24,6 +24,7 @@ import java.io.Writer; import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.wsdl.Binding; import javax.wsdl.BindingInput; import javax.wsdl.BindingOperation; @@ -39,13 +40,13 @@ import javax.wsdl.extensions.Extensibili 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.helpers.CastUtils; 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/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java (original) +++ cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java Thu Jul 11 20:47:46 2013 @@ -39,7 +39,6 @@ import javax.xml.namespace.QName; 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; @@ -52,6 +51,7 @@ import org.apache.cxf.tools.util.OutputS 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); Modified: cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/SoapAddress.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/SoapAddress.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/SoapAddress.java (original) +++ cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/SoapAddress.java Thu Jul 11 20:47:46 2013 @@ -22,9 +22,9 @@ package org.apache.cxf.tools.misc.proces import java.util.HashMap; import java.util.Map; -import org.apache.cxf.common.WSDLConstants; import org.apache.cxf.tools.common.ToolConstants; import org.apache.cxf.tools.common.ToolContext; +import org.apache.cxf.wsdl.WSDLConstants; public class SoapAddress extends XmlAddress { public Map<String, String> getNamespaces(final ToolContext context) { Modified: cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java (original) +++ cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java Thu Jul 11 20:47:46 2013 @@ -41,11 +41,12 @@ import org.apache.cxf.binding.soap.wsdl. import org.apache.cxf.binding.soap.wsdl.extensions.SoapBody; import org.apache.cxf.binding.soap.wsdl.extensions.SoapFault; import org.apache.cxf.binding.soap.wsdl.extensions.SoapOperation; -import org.apache.cxf.common.WSDLConstants; 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.misc.WSDLToSoap; +import org.apache.cxf.wsdl.WSDLConstants; + import org.junit.Before; import org.junit.Test;
