Author: richard.opalka(a)jboss.com Date: 2011-05-06 17:39:51 -0400 (Fri, 06 May 2011) New Revision: 14291 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/jaxrpcmapping/JavaWsdlMappingFactory.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/JavaToXSD.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLLocatorImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java Log: [JBWS-3289] final refactoring of common packages Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java 2011-05-06 20:24:57 UTC (rev 14290) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java 2011-05-06 21:39:51 UTC (rev 14291) @@ -36,9 +36,9 @@ import org.jboss.util.NotImplementedException; import org.jboss.ws.WSException; import org.jboss.ws.core.soap.SOAPContentElement; -import org.jboss.ws.core.utils.XMLPredefinedEntityReferenceResolver; import org.jboss.ws.common.DOMUtils; import org.jboss.ws.common.DOMWriter; +import org.jboss.ws.common.utils.XMLPredefinedEntityReferenceResolver; import org.w3c.dom.Element; import org.w3c.dom.Node; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java 2011-05-06 20:24:57 UTC (rev 14290) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java 2011-05-06 21:39:51 UTC (rev 14291) @@ -51,8 +51,8 @@ import org.jboss.ws.core.jaxrpc.binding.QNameSerializerFactory; import org.jboss.ws.core.jaxrpc.binding.SimpleDeserializerFactory; import org.jboss.ws.core.jaxrpc.binding.SimpleSerializerFactory; -import org.jboss.ws.core.utils.HashCodeUtil; import org.jboss.ws.common.JavaUtils; +import org.jboss.ws.common.utils.HashCodeUtil; /** * This is the representation of a type mapping. Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java 2011-05-06 20:24:57 UTC (rev 14290) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java 2011-05-06 21:39:51 UTC (rev 14291) @@ -35,7 +35,7 @@ import org.jboss.util.xml.JBossEntityResolver; import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.ws.core.utils.JBossWSEntityResolver; +import org.jboss.ws.common.utils.JBossWSEntityResolver; import org.jboss.ws.extensions.xop.jaxrpc.JBossXBContentAdapter; import org.jboss.ws.metadata.jaxrpcmapping.ExceptionMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java 2011-05-06 20:24:57 UTC (rev 14290) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java 2011-05-06 21:39:51 UTC (rev 14291) @@ -21,9 +21,9 @@ */ package org.jboss.ws.core.jaxws; +import org.jboss.ws.common.utils.HashCodeUtil; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.core.utils.HashCodeUtil; import org.jboss.ws.metadata.umdm.EndpointMetaData; import javax.xml.bind.JAXBContext; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2011-05-06 20:24:57 UTC (rev 14290) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2011-05-06 21:39:51 UTC (rev 14291) @@ -64,7 +64,6 @@ import org.jboss.ws.core.jaxws.handler.HandlerResolverImpl; import org.jboss.ws.core.jaxws.wsaddressing.EndpointReferenceUtil; import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference; -import org.jboss.ws.core.utils.DelegateClassLoader; import org.jboss.ws.metadata.builder.jaxws.JAXWSClientMetaDataBuilder; import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilder; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; @@ -77,6 +76,7 @@ import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.common.ResourceLoaderAdapter; +import org.jboss.ws.common.utils.DelegateClassLoader; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2011-05-06 20:24:57 UTC (rev 14290) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2011-05-06 21:39:51 UTC (rev 14291) @@ -28,7 +28,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.core.utils.DelegateClassLoader; +import org.jboss.ws.common.utils.DelegateClassLoader; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2011-05-06 20:24:57 UTC (rev 14290) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2011-05-06 21:39:51 UTC (rev 14291) @@ -23,7 +23,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.core.utils.DelegateClassLoader; +import org.jboss.ws.common.utils.DelegateClassLoader; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2011-05-06 20:24:57 UTC (rev 14290) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2011-05-06 21:39:51 UTC (rev 14291) @@ -29,12 +29,12 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.core.utils.DelegateClassLoader; -import org.jboss.ws.core.utils.JBossWSEntityResolver; import org.jboss.ws.metadata.config.binding.OMFactoryJAXRPC; import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC; import org.jboss.ws.common.DOMUtils; import org.jboss.ws.common.ResourceLoaderAdapter; +import org.jboss.ws.common.utils.DelegateClassLoader; +import org.jboss.ws.common.utils.JBossWSEntityResolver; import org.jboss.wsf.spi.classloading.ClassLoaderProvider; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.config.CommonConfig; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/jaxrpcmapping/JavaWsdlMappingFactory.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/jaxrpcmapping/JavaWsdlMappingFactory.java 2011-05-06 20:24:57 UTC (rev 14290) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/jaxrpcmapping/JavaWsdlMappingFactory.java 2011-05-06 21:39:51 UTC (rev 14291) @@ -28,7 +28,7 @@ import javax.xml.namespace.QName; import org.jboss.logging.Logger; -import org.jboss.ws.core.utils.ResourceURL; +import org.jboss.ws.common.utils.ResourceURL; import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java 2011-05-06 20:24:57 UTC (rev 14290) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java 2011-05-06 21:39:51 UTC (rev 14291) @@ -35,8 +35,8 @@ import org.apache.xerces.xni.parser.XMLInputSource; import org.jboss.logging.Logger; import org.jboss.ws.Constants; -import org.jboss.ws.core.utils.ResourceURL; import org.jboss.ws.common.IOUtils; +import org.jboss.ws.common.utils.ResourceURL; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; import org.xml.sax.SAXException; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java 2011-05-06 20:24:57 UTC (rev 14290) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java 2011-05-06 21:39:51 UTC (rev 14291) @@ -28,7 +28,7 @@ import java.util.HashMap; import org.jboss.logging.Logger; -import org.jboss.ws.core.utils.ResourceURL; +import org.jboss.ws.common.utils.ResourceURL; import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.SimpleTypeBindings; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/JavaToXSD.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/JavaToXSD.java 2011-05-06 20:24:57 UTC (rev 14290) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/JavaToXSD.java 2011-05-06 21:39:51 UTC (rev 14291) @@ -37,8 +37,8 @@ import org.apache.xerces.xs.XSModel; import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.core.utils.JBossWSEntityResolver; -import org.jboss.ws.core.utils.ResourceURL; +import org.jboss.ws.common.utils.ResourceURL; +import org.jboss.ws.common.utils.JBossWSEntityResolver; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSEntityResolver; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSErrorHandler; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2011-05-06 20:24:57 UTC (rev 14290) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2011-05-06 21:39:51 UTC (rev 14291) @@ -33,9 +33,9 @@ import org.jboss.ws.WSException; import org.jboss.ws.metadata.builder.jaxws.JAXWSWebServiceMetaDataBuilder; import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.ws.tools.io.NullPrintStream; import org.jboss.ws.api.tools.WSContractProvider; import org.jboss.ws.common.ResourceLoaderAdapter; +import org.jboss.ws.common.utils.NullPrintStream; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Deployment; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2011-05-06 20:24:57 UTC (rev 14290) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2011-05-06 21:39:51 UTC (rev 14291) @@ -23,8 +23,8 @@ import com.sun.tools.ws.wscompile.WsimportTool; -import org.jboss.ws.core.utils.JBossWSEntityResolver; -import org.jboss.ws.tools.io.NullPrintStream; +import org.jboss.ws.common.utils.JBossWSEntityResolver; +import org.jboss.ws.common.utils.NullPrintStream; import org.jboss.ws.api.tools.WSContractConsumer; import java.io.File; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java 2011-05-06 20:24:57 UTC (rev 14290) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java 2011-05-06 21:39:51 UTC (rev 14291) @@ -27,7 +27,7 @@ import com.ibm.wsdl.util.xml.DOMUtils; import com.ibm.wsdl.util.xml.QNameUtils; import com.ibm.wsdl.util.xml.XPathUtils; -import org.jboss.ws.core.utils.JBossWSEntityResolver; +import org.jboss.ws.common.utils.JBossWSEntityResolver; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java 2011-05-06 20:24:57 UTC (rev 14290) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java 2011-05-06 21:39:51 UTC (rev 14291) @@ -30,7 +30,7 @@ import javax.wsdl.xml.WSDLReader; import org.jboss.logging.Logger; -import org.jboss.ws.core.utils.JBossWSEntityResolver; +import org.jboss.ws.common.utils.JBossWSEntityResolver; import org.xml.sax.EntityResolver; /** Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2011-05-06 20:24:57 UTC (rev 14290) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2011-05-06 21:39:51 UTC (rev 14291) @@ -76,8 +76,6 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.core.soap.Style; -import org.jboss.ws.core.utils.JBossWSEntityResolver; -import org.jboss.ws.core.utils.ResourceURL; import org.jboss.ws.metadata.wsdl.Extendable; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLBindingMessageReference; @@ -109,6 +107,8 @@ import org.jboss.ws.tools.JavaToXSD; import org.jboss.ws.common.DOMUtils; import org.jboss.ws.common.DOMWriter; +import org.jboss.ws.common.utils.JBossWSEntityResolver; +import org.jboss.ws.common.utils.ResourceURL; import org.jboss.ws.api.addressing.AddressingConstants; import org.w3c.dom.Attr; import org.w3c.dom.Element; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2011-05-06 20:24:57 UTC (rev 14290) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2011-05-06 21:39:51 UTC (rev 14291) @@ -23,11 +23,11 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; -import org.jboss.ws.core.utils.JBossWSEntityResolver; -import org.jboss.ws.core.utils.ResourceURL; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLException; import org.jboss.ws.common.DOMUtils; +import org.jboss.ws.common.utils.JBossWSEntityResolver; +import org.jboss.ws.common.utils.ResourceURL; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.xml.sax.EntityResolver; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLLocatorImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLLocatorImpl.java 2011-05-06 20:24:57 UTC (rev 14290) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLLocatorImpl.java 2011-05-06 21:39:51 UTC (rev 14291) @@ -31,7 +31,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.core.utils.ResourceURL; +import org.jboss.ws.common.utils.ResourceURL; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2011-05-06 20:24:57 UTC (rev 14290) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2011-05-06 21:39:51 UTC (rev 14291) @@ -21,9 +21,9 @@ */ package org.jboss.wsf.stack.jbws; -import org.jboss.ws.core.utils.DelegateClassLoader; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.common.integration.AbstractDeploymentAspect; +import org.jboss.ws.common.utils.DelegateClassLoader; import org.jboss.wsf.spi.deployment.Deployment; /** Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2011-05-06 20:24:57 UTC (rev 14290) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2011-05-06 21:39:51 UTC (rev 14291) @@ -35,12 +35,12 @@ import org.jboss.util.NotImplementedException; import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.ws.core.utils.AbstractWSDLFilePublisher; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLWriter; import org.jboss.ws.common.IOUtils; +import org.jboss.ws.common.utils.AbstractWSDLFilePublisher; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.w3c.dom.Document; Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java 2011-05-06 20:24:57 UTC (rev 14290) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java 2011-05-06 21:39:51 UTC (rev 14291) @@ -46,7 +46,7 @@ import org.apache.xerces.xs.XSTerm; import org.apache.xerces.xs.XSTypeDefinition; import org.apache.xerces.xs.XSWildcard; -import org.jboss.ws.core.utils.JBossWSEntityResolver; +import org.jboss.ws.common.utils.JBossWSEntityResolver; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSComplexTypeDefinition; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSElementDeclaration; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSEntityResolver;