Author: heiko.braun(a)jboss.com Date: 2007-07-18 07:21:21 -0400 (Wed, 18 Jul 2007) New Revision: 3923 Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/DOMUtils.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/DOMWriter.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/IOUtils.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/JavaUtils.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/ObjectNameFactory.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/ServiceLoader.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/log/ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/log/JBossLogHandler.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/log/JDKLogRedirector.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/log/NamespaceFilter.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/annotation/ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/annotation/WebContext.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumerFactory.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProviderFactory.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/cmd/ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/package.html Removed: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/annotation/ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/tools/ Modified: branches/hbraun/trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java branches/hbraun/trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployerMBean.java branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21MBean.java branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3MBean.java branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSEMBean.java branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java branches/hbraun/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java branches/hbraun/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java branches/hbraun/trunk/integration/spi/src/main/etc/wsconsume.bat branches/hbraun/trunk/integration/spi/src/main/etc/wsconsume.sh branches/hbraun/trunk/integration/spi/src/main/etc/wsprovide.bat branches/hbraun/trunk/integration/spi/src/main/etc/wsprovide.sh branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/BasicInvocationHandler.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/BasicServerConfig.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/BasicServerConfigMBean.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTest.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployer.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/XOPTestSupport.java branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/DDEndpoints.java branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerFactoryImpl.java branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerImpl.java branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderFactoryImpl.java branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderImpl.java branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java branches/hbraun/trunk/jbossws-core/ant-import-tests/build-testsuite.xml branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/EndpointInvocation.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/MessageTrace.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SerializationContextJAXRPC.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializer.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializer.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializer.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializer.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBMarshallerImpl.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/PortProxy.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPMessageMarshaller.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/HttpServer.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/DetailImpl.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/HRefInlineHandler.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementMessage.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPDocument.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementWriter.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPHeaderElementImpl.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLContent.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/AttachmentPartImpl.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/ByteArrayContentHandler.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/SwapableMemoryDataSource.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/XmlDataContentHandler.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/MimeUtils.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/EndpointReferenceImpl.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractSubscriptionManagerEndpoint.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/NotificationFailure.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/Subscription.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/Policy.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyAlternative.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyAssertion.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyFactory.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxrpc/JBossXBContentAdapter.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/ToolsUtils.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WebservicesXMLCreatorImpl.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ReformatXML.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderFactoryImpl.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerFactoryImpl.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLWriter.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayMarshallerTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayMarshallerTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayUnmarshallerTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayMarshallerTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayUnmarshallerTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPEnvelopeTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/JavaUtilsTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLWithAnonTypesTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/InteropClientConfig.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/InteropConfigFactory.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/JavaBean.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/ValueType.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/ServerHandler.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/MessageJavaBean.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws955/JBWS955TestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestServiceBean.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/EmployeeRecordsImpl.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointBean.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventSinkServlet.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardArraysTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardDoubleArraysTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidationHelper.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpointImpl.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.java Log: Move tools and annotation back to SPI package Modified: branches/hbraun/trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java =================================================================== --- branches/hbraun/trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -34,7 +34,7 @@ import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.invocation.BasicInvocationHandler; import org.jboss.wsf.spi.invocation.Invocation; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; /** * Handles invocations on EJB3 endpoints. Modified: branches/hbraun/trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployerMBean.java =================================================================== --- branches/hbraun/trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployerMBean.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployerMBean.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -25,7 +25,7 @@ import org.jboss.system.ServiceMBean; import org.jboss.webservice.WebServiceClientDeployment; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; /** * MBean interface. Modified: branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java =================================================================== --- branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -35,7 +35,7 @@ import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; Modified: branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21MBean.java =================================================================== --- branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21MBean.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21MBean.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -23,7 +23,7 @@ import javax.management.ObjectName; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; /** * MBean interface. Modified: branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3MBean.java =================================================================== --- branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3MBean.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3MBean.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -23,7 +23,7 @@ import javax.management.ObjectName; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; /** * MBean interface. Modified: branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSEMBean.java =================================================================== --- branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSEMBean.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSEMBean.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -23,7 +23,7 @@ import javax.management.ObjectName; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; /** * MBean interface. Modified: branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java =================================================================== --- branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -49,7 +49,7 @@ import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; /** * Handles invocations on EJB21 endpoints. Modified: branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java =================================================================== --- branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -42,7 +42,7 @@ import org.jboss.wsf.framework.invocation.BasicInvocationHandler; import org.jboss.wsf.spi.invocation.Invocation; import org.jboss.wsf.framework.invocation.WebServiceContextEJB; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; /** * Handles invocations on EJB3 endpoints. Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -35,7 +35,7 @@ import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -51,7 +51,7 @@ import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; /** * Handles invocations on EJB3 endpoints. Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -42,7 +42,7 @@ import org.jboss.wsf.framework.invocation.BasicInvocationHandler; import org.jboss.wsf.spi.invocation.Invocation; import org.jboss.wsf.framework.invocation.WebServiceContextEJB; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; /** * Handles invocations on EJB3 endpoints. Modified: branches/hbraun/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- branches/hbraun/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -88,7 +88,7 @@ import org.jboss.wsf.spi.management.EndpointMetrics; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Document; /** Modified: branches/hbraun/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java =================================================================== --- branches/hbraun/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -50,8 +50,8 @@ import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.IOUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: branches/hbraun/trunk/integration/spi/src/main/etc/wsconsume.bat =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/etc/wsconsume.bat 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/etc/wsconsume.bat 2007-07-18 11:21:21 UTC (rev 3923) @@ -52,4 +52,4 @@ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/mail.jar rem Execute the JVM -"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSCONSUME_CLASSPATH%" org.jboss.wsf.tools.cmd.WSConsume %* +"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSCONSUME_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSConsume %* Modified: branches/hbraun/trunk/integration/spi/src/main/etc/wsconsume.sh =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/etc/wsconsume.sh 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/etc/wsconsume.sh 2007-07-18 11:21:21 UTC (rev 3923) @@ -126,4 +126,4 @@ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ -Dlog4j.configuration=wstools-log4j.xml \ -classpath "$WSCONSUME_CLASSPATH" \ - org.jboss.wsf.tools.cmd.WSConsume "$@" + org.jboss.wsf.spi.tools.cmd.WSConsume "$@" Modified: branches/hbraun/trunk/integration/spi/src/main/etc/wsprovide.bat =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/etc/wsprovide.bat 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/etc/wsprovide.bat 2007-07-18 11:21:21 UTC (rev 3923) @@ -46,4 +46,4 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar rem Execute the JVM -"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSPROVIDE_CLASSPATH%" org.jboss.wsf.tools.cmd.WSProvide %* +"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSPROVIDE_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSProvide %* Modified: branches/hbraun/trunk/integration/spi/src/main/etc/wsprovide.sh =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/etc/wsprovide.sh 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/etc/wsprovide.sh 2007-07-18 11:21:21 UTC (rev 3923) @@ -133,4 +133,4 @@ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ -Dlog4j.configuration=wstools-log4j.xml \ -classpath "$WSPROVIDE_CLASSPATH" \ - org.jboss.wsf.tools.cmd.WSProvide "$@" + org.jboss.wsf.spi.tools.cmd.WSProvide "$@" Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -24,7 +24,7 @@ import org.jboss.kernel.Kernel; import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; -import org.jboss.wsf.spi.utils.ServiceLoader; +import org.jboss.wsf.framework.utils.ServiceLoader; // $Id$ Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.wsf.framework.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; import org.jboss.wsf.spi.deployment.DeploymentAspect; Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -26,7 +26,7 @@ import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.wsf.framework.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -34,7 +34,7 @@ import org.dom4j.Element; import org.dom4j.io.OutputFormat; import org.dom4j.io.XMLWriter; -import org.jboss.wsf.framework.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -37,7 +37,7 @@ import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.IOUtils; /** * The rewriter for web.xml Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/BasicInvocationHandler.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/BasicInvocationHandler.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/BasicInvocationHandler.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -31,7 +31,7 @@ import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; import org.jboss.wsf.spi.invocation.InvocationHandler; import org.jboss.wsf.spi.invocation.Invocation; import org.jboss.wsf.framework.invocation.BasicEndpointInvocation; Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -38,7 +38,7 @@ import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.management.EndpointRegistry; import org.jboss.wsf.spi.management.EndpointRegistryFactory; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; import org.jboss.wsf.spi.invocation.RequestHandler; import org.jboss.wsf.framework.invocation.EndpointAssociation; Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/BasicServerConfig.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/BasicServerConfig.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/BasicServerConfig.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -36,7 +36,7 @@ import javax.management.ObjectName; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; /** * Basic implementation of a ServerConfig Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/BasicServerConfigMBean.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/BasicServerConfigMBean.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/BasicServerConfigMBean.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -24,7 +24,7 @@ import javax.management.ObjectName; import org.jboss.wsf.spi.management.ServerConfig; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; public interface BasicServerConfigMBean extends ServerConfig { Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/DOMUtils.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/DOMUtils.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/DOMUtils.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -0,0 +1,619 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.framework.utils; + +// $Id$ + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.OutputKeys; +import javax.xml.transform.Source; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.sax.SAXSource; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; + +import org.jboss.logging.Logger; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.w3c.dom.Text; +import org.xml.sax.EntityResolver; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + +/** + * DOM2 utilites + * + * @author Thomas.Diesler(a)jboss.org + */ +public final class DOMUtils +{ + private static Logger log = Logger.getLogger(DOMUtils.class); + + // All elements created by the same thread are created by the same builder and belong to the same doc + private static ThreadLocal documentThreadLocal = new ThreadLocal(); + private static ThreadLocal builderThreadLocal = new ThreadLocal() + { + protected Object initialValue() + { + try + { + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + factory.setValidating(false); + factory.setNamespaceAware(true); + DocumentBuilder builder = factory.newDocumentBuilder(); + setEntityResolver(builder); + return builder; + } + catch (ParserConfigurationException e) + { + throw new RuntimeException("Failed to create DocumentBuilder", e); + } + } + + private void setEntityResolver(DocumentBuilder builder) + { + String[] resolvers = new String[] { "org.jboss.ws.core.utils.JBossWSEntityResolver", "org.jboss.util.xml.JBossEntityResolver" }; + + EntityResolver entityResolver = null; + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + for (String resolver : resolvers) + { + try + { + Class<?> resolverClass = loader.loadClass(resolver); + entityResolver = (EntityResolver)resolverClass.newInstance(); + } + catch (Exception ex) + { + log.debug("Cannot load: " + resolver); + } + } + + if (entityResolver != null) + builder.setEntityResolver(entityResolver); + } + }; + + // Hide the constructor + private DOMUtils() + { + } + + /** Initialise the the DocumentBuilder + */ + public static DocumentBuilder getDocumentBuilder() + { + DocumentBuilder builder = (DocumentBuilder)builderThreadLocal.get(); + return builder; + } + + /** Parse the given XML string and return the root Element + */ + public static Element parse(String xmlString) throws IOException + { + try + { + return parse(new ByteArrayInputStream(xmlString.getBytes("UTF-8"))); + } + catch (IOException e) + { + log.error("Cannot parse: " + xmlString); + throw e; + } + } + + /** Parse the given XML stream and return the root Element + */ + public static Element parse(InputStream xmlStream) throws IOException + { + try + { + Document doc = getDocumentBuilder().parse(xmlStream); + Element root = doc.getDocumentElement(); + return root; + } + catch (SAXException e) + { + throw new IOException(e.toString()); + } + } + + /** Parse the given input source and return the root Element + */ + public static Element parse(InputSource source) throws IOException + { + try + { + Document doc = getDocumentBuilder().parse(source); + Element root = doc.getDocumentElement(); + return root; + } + catch (SAXException e) + { + throw new IOException(e.toString()); + } + } + + /** Create an Element for a given name + */ + public static Element createElement(String localPart) + { + Document doc = getOwnerDocument(); + log.trace("createElement {}" + localPart); + return doc.createElement(localPart); + } + + /** Create an Element for a given name and prefix + */ + public static Element createElement(String localPart, String prefix) + { + Document doc = getOwnerDocument(); + log.trace("createElement {}" + prefix + ":" + localPart); + return doc.createElement(prefix + ":" + localPart); + } + + /** Create an Element for a given name, prefix and uri + */ + public static Element createElement(String localPart, String prefix, String uri) + { + Document doc = getOwnerDocument(); + if (prefix == null || prefix.length() == 0) + { + log.trace("createElement {" + uri + "}" + localPart); + return doc.createElementNS(uri, localPart); + } + else + { + log.trace("createElement {" + uri + "}" + prefix + ":" + localPart); + return doc.createElementNS(uri, prefix + ":" + localPart); + } + } + + /** Create an Element for a given QName + */ + public static Element createElement(QName qname) + { + return createElement(qname.getLocalPart(), qname.getPrefix(), qname.getNamespaceURI()); + } + + /** Create a org.w3c.dom.Text node + */ + public static Text createTextNode(String value) + { + Document doc = getOwnerDocument(); + return doc.createTextNode(value); + } + + /** Get the qname of the given node. + */ + public static QName getElementQName(Element el) + { + String qualifiedName = el.getNodeName(); + return resolveQName(el, qualifiedName); + } + + /** Transform the given qualified name into a QName + */ + public static QName resolveQName(Element el, String qualifiedName) + { + QName qname; + String prefix = ""; + String namespaceURI = ""; + String localPart = qualifiedName; + + int colIndex = qualifiedName.indexOf(":"); + if (colIndex > 0) + { + prefix = qualifiedName.substring(0, colIndex); + localPart = qualifiedName.substring(colIndex + 1); + + if ("xmlns".equals(prefix)) + { + namespaceURI = "URI:XML_PREDEFINED_NAMESPACE"; + } + else + { + Element nsElement = el; + while (namespaceURI.equals("") && nsElement != null) + { + namespaceURI = nsElement.getAttribute("xmlns:" + prefix); + if (namespaceURI.equals("")) + nsElement = getParentElement(nsElement); + } + } + + if (namespaceURI.equals("")) + throw new IllegalArgumentException("Cannot find namespace uri for: " + qualifiedName); + } + else + { + Element nsElement = el; + while (namespaceURI.equals("") && nsElement != null) + { + namespaceURI = nsElement.getAttribute("xmlns"); + if (namespaceURI.equals("")) + nsElement = getParentElement(nsElement); + } + } + + qname = new QName(namespaceURI, localPart, prefix); + return qname; + } + + /** Get the value from the given attribute + * + * @return null if the attribute value is empty or the attribute is not present + */ + public static String getAttributeValue(Element el, String attrName) + { + return getAttributeValue(el, new QName(attrName)); + } + + /** Get the value from the given attribute + * + * @return null if the attribute value is empty or the attribute is not present + */ + public static String getAttributeValue(Element el, QName attrName) + { + String attr = null; + if ("".equals(attrName.getNamespaceURI())) + attr = el.getAttribute(attrName.getLocalPart()); + else attr = el.getAttributeNS(attrName.getNamespaceURI(), attrName.getLocalPart()); + + if ("".equals(attr)) + attr = null; + + return attr; + } + + /** Get the qname value from the given attribute + */ + public static QName getAttributeValueAsQName(Element el, String attrName) + { + return getAttributeValueAsQName(el, new QName(attrName)); + + } + + /** Get the qname value from the given attribute + */ + public static QName getAttributeValueAsQName(Element el, QName attrName) + { + QName qname = null; + + String qualifiedName = getAttributeValue(el, attrName); + if (qualifiedName != null) + { + qname = resolveQName(el, qualifiedName); + } + + return qname; + } + + /** Get the boolean value from the given attribute + */ + public static boolean getAttributeValueAsBoolean(Element el, String attrName) + { + return getAttributeValueAsBoolean(el, new QName(attrName)); + } + + /** Get the boolean value from the given attribute + */ + public static boolean getAttributeValueAsBoolean(Element el, QName attrName) + { + String attrVal = getAttributeValue(el, attrName); + boolean ret = "true".equalsIgnoreCase(attrVal) || "1".equalsIgnoreCase(attrVal); + return ret; + } + + /** Get the integer value from the given attribute + */ + public static Integer getAttributeValueAsInteger(Element el, String attrName) + { + return getAttributeValueAsInteger(el, new QName(attrName)); + } + + /** Get the integer value from the given attribute + */ + public static Integer getAttributeValueAsInteger(Element el, QName attrName) + { + String attrVal = getAttributeValue(el, attrName); + return (attrVal != null ? new Integer(attrVal) : null); + } + + /** Get the attributes as Map<QName, String> + */ + public static Map getAttributes(Element el) + { + Map attmap = new HashMap(); + NamedNodeMap attribs = el.getAttributes(); + for (int i = 0; i < attribs.getLength(); i++) + { + Attr attr = (Attr)attribs.item(i); + String name = attr.getName(); + QName qname = resolveQName(el, name); + String value = attr.getNodeValue(); + attmap.put(qname, value); + } + return attmap; + } + + /** Copy attributes between elements + */ + public static void copyAttributes(Element destElement, Element srcElement) + { + NamedNodeMap attribs = srcElement.getAttributes(); + for (int i = 0; i < attribs.getLength(); i++) + { + Attr attr = (Attr)attribs.item(i); + String uri = attr.getNamespaceURI(); + String qname = attr.getName(); + String value = attr.getNodeValue(); + + // Prevent DOMException: NAMESPACE_ERR: An attempt is made to create or + // change an object in a way which is incorrect with regard to namespaces. + if (uri == null && qname.startsWith("xmlns")) + { + log.trace("Ignore attribute: [uri=" + uri + ",qname=" + qname + ",value=" + value + "]"); + } + else + { + destElement.setAttributeNS(uri, qname, value); + } + } + } + + /** True if the node has child elements + */ + public static boolean hasChildElements(Node node) + { + NodeList nlist = node.getChildNodes(); + for (int i = 0; i < nlist.getLength(); i++) + { + Node child = nlist.item(i); + if (child.getNodeType() == Node.ELEMENT_NODE) + return true; + } + return false; + } + + /** Gets child elements + */ + public static Iterator getChildElements(Node node) + { + ArrayList list = new ArrayList(); + NodeList nlist = node.getChildNodes(); + for (int i = 0; i < nlist.getLength(); i++) + { + Node child = nlist.item(i); + if (child.getNodeType() == Node.ELEMENT_NODE) + list.add(child); + } + return list.iterator(); + } + + /** Get the concatenated text content, or null. + */ + public static String getTextContent(Node node) + { + boolean hasTextContent = false; + StringBuffer buffer = new StringBuffer(); + NodeList nlist = node.getChildNodes(); + for (int i = 0; i < nlist.getLength(); i++) + { + Node child = nlist.item(i); + if (child.getNodeType() == Node.TEXT_NODE) + { + buffer.append(child.getNodeValue()); + hasTextContent = true; + } + } + return (hasTextContent ? buffer.toString() : null); + } + + /** Gets the first child element + */ + public static Element getFirstChildElement(Node node) + { + return getFirstChildElementIntern(node, null); + } + + /** Gets the first child element for a given local name without namespace + */ + public static Element getFirstChildElement(Node node, String nodeName) + { + return getFirstChildElementIntern(node, new QName(nodeName)); + } + + /** Gets the first child element for a given qname + */ + public static Element getFirstChildElement(Node node, QName nodeName) + { + return getFirstChildElementIntern(node, nodeName); + } + + private static Element getFirstChildElementIntern(Node node, QName nodeName) + { + Element childElement = null; + Iterator it = getChildElementsIntern(node, nodeName); + if (it.hasNext()) + { + childElement = (Element)it.next(); + } + return childElement; + } + + /** Gets the child elements for a given local name without namespace + */ + public static Iterator getChildElements(Node node, String nodeName) + { + return getChildElementsIntern(node, new QName(nodeName)); + } + + /** Gets the child element for a given qname + */ + public static Iterator getChildElements(Node node, QName nodeName) + { + return getChildElementsIntern(node, nodeName); + } + + private static Iterator getChildElementsIntern(Node node, QName nodeName) + { + ArrayList list = new ArrayList(); + NodeList nlist = node.getChildNodes(); + for (int i = 0; i < nlist.getLength(); i++) + { + Node child = nlist.item(i); + if (child.getNodeType() == Node.ELEMENT_NODE) + { + if (nodeName == null) + { + list.add(child); + } + else + { + QName qname; + if (nodeName.getNamespaceURI().length() > 0) + { + qname = new QName(child.getNamespaceURI(), child.getLocalName()); + } + else + { + qname = new QName(child.getLocalName()); + } + if (qname.equals(nodeName)) + { + list.add(child); + } + } + } + } + return list.iterator(); + } + + /** Gets parent element or null if there is none + */ + public static Element getParentElement(Node node) + { + Node parent = node.getParentNode(); + return (parent instanceof Element ? (Element)parent : null); + } + + /** Get the owner document that is associated with the current thread */ + public static Document getOwnerDocument() + { + Document doc = (Document)documentThreadLocal.get(); + if (doc == null) + { + doc = getDocumentBuilder().newDocument(); + documentThreadLocal.set(doc); + } + return doc; + } + + public static Element sourceToElement(Source source) throws IOException + { + Element retElement = null; + + try + { + if (source instanceof StreamSource) + { + StreamSource streamSource = (StreamSource)source; + + InputStream ins = streamSource.getInputStream(); + if (ins != null) + { + retElement = DOMUtils.parse(ins); + } + else + { + Reader reader = streamSource.getReader(); + retElement = DOMUtils.parse(new InputSource(reader)); + } + } + else if (source instanceof DOMSource) + { + DOMSource domSource = (DOMSource)source; + Node node = domSource.getNode(); + if (node instanceof Element) + { + retElement = (Element)node; + } + else if (node instanceof Document) + { + retElement = ((Document)node).getDocumentElement(); + } + else + { + throw new RuntimeException("Unsupported Node type: " + node.getClass().getName()); + } + } + else if (source instanceof SAXSource) + { + // The fact that JAXBSource derives from SAXSource is an implementation detail. + // Thus in general applications are strongly discouraged from accessing methods defined on SAXSource. + // The XMLReader object obtained by the getXMLReader method shall be used only for parsing the InputSource object returned by the getInputSource method. + + TransformerFactory tf = TransformerFactory.newInstance(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(1024); + Transformer transformer = tf.newTransformer(); + transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); + transformer.setOutputProperty(OutputKeys.METHOD, "xml"); + transformer.transform(source, new StreamResult(baos)); + retElement = DOMUtils.parse(new ByteArrayInputStream(baos.toByteArray())); + } + else + { + throw new RuntimeException("Source type not implemented: " + source.getClass().getName()); + } + + } + catch (TransformerException ex) + { + IOException ioex = new IOException(); + ioex.initCause(ex); + throw ioex; + } + + return retElement; + } +} Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/DOMUtils.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/DOMWriter.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/DOMWriter.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/DOMWriter.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -0,0 +1,609 @@ +/* + * ==================================================================== + * + * The Apache Software License, Version 1.1 + * + * Copyright (c) 1999 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, if + * any, must include the following acknowlegement: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowlegement may appear in the software itself, + * if and wherever such third-party acknowlegements normally appear. + * + * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software + * Foundation" must not be used to endorse or promote products derived + * from this software without prior written permission. For written + * permission, please contact apache(a)apache.org. + * + * 5. Products derived from this software may not be called "Apache" + * nor may "Apache" appear in their names without prior written + * permission of the Apache Group. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * <http://www.apache.org/>;. + */ +package org.jboss.wsf.framework.utils; + +// $Id$ + +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.io.UnsupportedEncodingException; +import java.io.Writer; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import org.w3c.dom.Attr; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +/** + * Traverse a DOM tree in order to print a document that is parsed. + * + * @author Andy Clark, IBM + * @author Thomas.Diesler(a)jboss.org + * @version $Revision$ + */ +public class DOMWriter +{ + // Print writer + private PrintWriter out; + // True, if canonical output + private boolean canonical; + // True, if pretty printing should be used + private boolean prettyprint; + // True, if the XML declaration should be written + private boolean writeXMLDeclaration; + // Explicit character set encoding + private String charsetName; + // indent for the pretty printer + private int prettyIndent; + // True, if the XML declaration has been written + private boolean wroteXMLDeclaration; + // The node that started the write + private Node rootNode; + // True if we want namespace completion + private boolean completeNamespaces = true; + // The current default namespace + private String currentDefaultNamespace; + + public DOMWriter(Writer w) + { + this.out = new PrintWriter(w); + } + + public DOMWriter(Writer w, String charsetName) + { + this.out = new PrintWriter(w); + this.charsetName = charsetName; + this.writeXMLDeclaration = true; + } + + public DOMWriter(OutputStream stream) + { + try + { + this.out = new PrintWriter(new OutputStreamWriter(stream, "UTF-8")); + } + catch (UnsupportedEncodingException e) + { + // ignore, UTF-8 should be available + } + } + + public DOMWriter(OutputStream stream, String charsetName) + { + try + { + this.out = new PrintWriter(new OutputStreamWriter(stream, charsetName)); + this.charsetName = charsetName; + this.writeXMLDeclaration = true; + } + catch (UnsupportedEncodingException e) + { + throw new IllegalArgumentException("Unsupported encoding: " + charsetName); + } + } + + /** + * Print a node with explicit prettyprinting. + * The defaults for all other DOMWriter properties apply. + * + */ + public static String printNode(Node node, boolean prettyprint) + { + StringWriter strw = new StringWriter(); + new DOMWriter(strw).setPrettyprint(prettyprint).print(node); + return strw.toString(); + } + + public boolean isCanonical() + { + return canonical; + } + + /** + * Set wheter entities should appear in their canonical form. + * The default is false. + */ + public DOMWriter setCanonical(boolean canonical) + { + this.canonical = canonical; + return this; + } + + /** + * Set wheter subelements should have their namespaces completed. + * Setting this to false may lead to invalid XML fragments. + * The default is true. + */ + public DOMWriter setCompleteNamespaces(boolean complete) + { + this.completeNamespaces = complete; + return this; + } + + public boolean isPrettyprint() + { + return prettyprint; + } + + /** + * Set wheter element should be indented. + * The default is false. + */ + public DOMWriter setPrettyprint(boolean prettyprint) + { + this.prettyprint = prettyprint; + return this; + } + + public boolean isWriteXMLDeclaration() + { + return writeXMLDeclaration; + } + + /** + * Set wheter the XML declaration should be written. + * The default is false. + */ + public DOMWriter setWriteXMLDeclaration(boolean flag) + { + this.writeXMLDeclaration = flag; + return this; + } + + public void print(Node node) + { + rootNode = node; + printInternal(node, false); + } + + private void printInternal(Node node, boolean indentEndMarker) + { + // is there anything to do? + if (node == null) + { + return; + } + + // JBAS-2117 - Don't skip the DOCUMENT_NODE + // if (node instanceof Document) node = ((Document)node).getDocumentElement(); + + if (wroteXMLDeclaration == false && writeXMLDeclaration == true && canonical == false) + { + out.print("<?xml version='1.0'"); + if (charsetName != null) + out.print(" encoding='" + charsetName + "'"); + + out.print("?>"); + if (prettyprint) + out.println(); + + wroteXMLDeclaration = true; + } + + int type = node.getNodeType(); + boolean hasChildNodes = node.getChildNodes().getLength() > 0; + + String nodeName = node.getNodeName(); + switch (type) + { + // print document + case Node.DOCUMENT_NODE: + { + NodeList children = node.getChildNodes(); + for (int iChild = 0; iChild < children.getLength(); iChild++) + { + printInternal(children.item(iChild), false); + } + out.flush(); + break; + } + + // print element with attributes + case Node.ELEMENT_NODE: + { + Element element = (Element)node; + if (prettyprint) + { + for (int i = 0; i < prettyIndent; i++) + { + out.print(' '); + } + prettyIndent++; + } + + out.print('<'); + out.print(nodeName); + + Map nsMap = new HashMap(); + String elPrefix = node.getPrefix(); + String elNamespaceURI = node.getNamespaceURI(); + if (elPrefix != null) + { + String nsURI = getNamespaceURI(elPrefix, element, rootNode); + nsMap.put(elPrefix, nsURI); + } + + Attr attrs[] = sortAttributes(node.getAttributes()); + for (int i = 0; i < attrs.length; i++) + { + Attr attr = attrs[i]; + String atPrefix = attr.getPrefix(); + String atName = attr.getNodeName(); + String atValue = normalize(attr.getNodeValue(), canonical); + + if (atName.equals("xmlns")) + currentDefaultNamespace = atValue; + + if (atPrefix != null && !atPrefix.equals("xmlns") && !atPrefix.equals("xml")) + { + String nsURI = getNamespaceURI(atPrefix, element, rootNode); + nsMap.put(atPrefix, nsURI); + // xsi:type='ns1:SubType', xsi:type='xsd:string' + if (atName.equals(atPrefix + ":type") && atValue.indexOf(":") > 0) + { + // xsi defined on the envelope + if (nsURI == null) + nsURI = getNamespaceURI(atPrefix, element, null); + + if ("http://www.w3.org/2001/XMLSchema-instance".equals(nsURI)) + { + String typePrefix = atValue.substring(0, atValue.indexOf(":")); + String typeURI = getNamespaceURI(typePrefix, element, rootNode); + nsMap.put(typePrefix, typeURI); + } + } + } + + out.print(" " + atName + "='" + atValue + "'"); + } + + // Add namespace declaration for prefixes + // that are defined further up the tree + if (completeNamespaces) + { + Iterator itPrefix = nsMap.keySet().iterator(); + while (itPrefix.hasNext()) + { + String prefix = (String)itPrefix.next(); + String nsURI = (String)nsMap.get(prefix); + if (nsURI == null) + { + nsURI = getNamespaceURI(prefix, element, null); + out.print(" xmlns:" + prefix + "='" + nsURI + "'"); + } + } + } + + // The SAX ContentHandler will by default not add the namespace declaration + // <Hello xmlns='http://somens'>World</Hello> + if (elPrefix == null && elNamespaceURI != null) + { + String defaultNamespace = element.getAttribute("xmlns"); + if (defaultNamespace.length() == 0 && !elNamespaceURI.equals(currentDefaultNamespace)) + { + out.print(" xmlns='" + elNamespaceURI + "'"); + currentDefaultNamespace = elNamespaceURI; + } + } + + if (hasChildNodes) + { + out.print('>'); + } + + // Find out if the end marker is indented + indentEndMarker = isEndMarkerIndented(node); + + if (indentEndMarker) + { + out.print('\n'); + } + + NodeList childNodes = node.getChildNodes(); + int len = childNodes.getLength(); + for (int i = 0; i < len; i++) + { + Node childNode = childNodes.item(i); + printInternal(childNode, false); + } + break; + } + + // handle entity reference nodes + case Node.ENTITY_REFERENCE_NODE: + { + if (canonical) + { + NodeList children = node.getChildNodes(); + if (children != null) + { + int len = children.getLength(); + for (int i = 0; i < len; i++) + { + printInternal(children.item(i), false); + } + } + } + else + { + out.print('&'); + out.print(nodeName); + out.print(';'); + } + break; + } + + // print cdata sections + case Node.CDATA_SECTION_NODE: + { + if (canonical) + { + out.print(normalize(node.getNodeValue(), canonical)); + } + else + { + out.print("<![CDATA["); + out.print(node.getNodeValue()); + out.print("]]>"); + } + break; + } + + // print text + case Node.TEXT_NODE: + { + String text = normalize(node.getNodeValue(), canonical); + if (prettyprint == false || text.trim().length() > 0) + out.print(text); + break; + } + + // print processing instruction + case Node.PROCESSING_INSTRUCTION_NODE: + { + out.print("<?"); + out.print(nodeName); + String data = node.getNodeValue(); + if (data != null && data.length() > 0) + { + out.print(' '); + out.print(data); + } + out.print("?>"); + break; + } + + // print comment + case Node.COMMENT_NODE: + { + for (int i = 0; i < prettyIndent; i++) + { + out.print(' '); + } + + out.print("<!--"); + String data = node.getNodeValue(); + if (data != null) + { + out.print(data); + } + out.print("-->"); + + if (prettyprint) + { + out.print('\n'); + } + + break; + } + } + + if (type == Node.ELEMENT_NODE) + { + if (prettyprint) + prettyIndent--; + + if (hasChildNodes == false) + { + out.print("/>"); + } + else + { + if (indentEndMarker) + { + for (int i = 0; i < prettyIndent; i++) + { + out.print(' '); + } + } + + out.print("</"); + out.print(nodeName); + out.print('>'); + } + + if (prettyIndent > 0) + { + out.print('\n'); + } + } + out.flush(); + } + + private String getNamespaceURI(String prefix, Element element, Node stopNode) + { + Node parent = element.getParentNode(); + String nsURI = element.getAttribute("xmlns:" + prefix); + if (nsURI.length() == 0 && element != stopNode && parent instanceof Element) + return getNamespaceURI(prefix, (Element)parent, stopNode); + + return (nsURI.length() > 0 ? nsURI : null); + } + + private boolean isEndMarkerIndented(Node node) + { + if (prettyprint) + { + NodeList childNodes = node.getChildNodes(); + int len = childNodes.getLength(); + for (int i = 0; i < len; i++) + { + Node children = childNodes.item(i); + if (children.getNodeType() == Node.ELEMENT_NODE) + { + return true; + } + } + } + return false; + } + + /** Returns a sorted list of attributes. */ + private Attr[] sortAttributes(NamedNodeMap attrs) + { + + int len = (attrs != null) ? attrs.getLength() : 0; + Attr array[] = new Attr[len]; + for (int i = 0; i < len; i++) + { + array[i] = (Attr)attrs.item(i); + } + for (int i = 0; i < len - 1; i++) + { + String name = array[i].getNodeName(); + int index = i; + for (int j = i + 1; j < len; j++) + { + String curName = array[j].getNodeName(); + if (curName.compareTo(name) < 0) + { + name = curName; + index = j; + } + } + if (index != i) + { + Attr temp = array[i]; + array[i] = array[index]; + array[index] = temp; + } + } + return (array); + } + + /** Normalizes the given string. */ + public static String normalize(String s, boolean canonical) + { + StringBuffer str = new StringBuffer(); + + int len = (s != null) ? s.length() : 0; + for (int i = 0; i < len; i++) + { + char ch = s.charAt(i); + switch (ch) + { + case '<': + { + str.append("&lt;"); + break; + } + case '>': + { + str.append("&gt;"); + break; + } + case '&': + { + str.append("&amp;"); + break; + } + case '"': + { + str.append("&quot;"); + break; + } + case '\'': + { + str.append("&apos;"); + break; + } + case '\r': + case '\n': + { + if (canonical) + { + str.append("&#"); + str.append(Integer.toString(ch)); + str.append(';'); + break; + } + // else, default append char + } + default: + { + str.append(ch); + } + } + } + return (str.toString()); + } +} Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/DOMWriter.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/IOUtils.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/IOUtils.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/IOUtils.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -0,0 +1,139 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.framework.utils; + +// $Id$ + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.Reader; +import java.io.Writer; + +import javax.activation.DataHandler; +import javax.xml.ws.WebServiceException; + +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; + +/** + * IO utilites + * + * @author Thomas.Diesler(a)jboss.org + */ +public final class IOUtils +{ + // Hide the constructor + private IOUtils() + { + } + + public static Writer getCharsetFileWriter(File file, String charset) throws IOException + { + return new OutputStreamWriter(new FileOutputStream(file), charset); + } + + /** Copy the input stream to the output stream + */ + public static void copyStream(OutputStream outs, InputStream ins) throws IOException + { + byte[] bytes = new byte[1024]; + int r = ins.read(bytes); + while (r > 0) + { + outs.write(bytes, 0, r); + r = ins.read(bytes); + } + } + + /** Copy the reader to the output stream + */ + public static void copyReader(OutputStream outs, Reader reader) throws IOException + { + OutputStreamWriter writer = new OutputStreamWriter(outs); + char[] bytes = new char[1024]; + int r = reader.read(bytes); + while (r > 0) + { + writer.write(bytes, 0, r); + r = reader.read(bytes); + } + } + + public static byte[] convertToBytes(DataHandler dh) + { + try + { + ByteArrayOutputStream buffOS = new ByteArrayOutputStream(); + dh.writeTo(buffOS); + return buffOS.toByteArray(); + } + catch (IOException e) + { + throw new WebServiceException("Unable to convert DataHandler to byte[]: " + e.getMessage()); + } + } + + /** + * Transform a Reader to an InputStream + * Background is that DocumentBuilder.parse() cannot take the Reader directly + */ + public static InputStream transformReader(Reader reader) throws IOException + { + int capacity = 1024; + char[] charBuffer = new char[capacity]; + StringBuffer strBuffer = new StringBuffer(capacity); + + int len = reader.read(charBuffer, 0, capacity); + while (len > 0) + { + strBuffer.append(charBuffer, 0, len); + len = reader.read(charBuffer, 0, capacity); + } + return new ByteArrayInputStream(strBuffer.toString().getBytes()); + } + + public static File createTempDirectory() throws IOException + { + File tmpdir = null; + + try + { + ServerConfigFactory factory = ServerConfigFactory.getInstance(); + ServerConfig config = factory.getServerConfig(); + + tmpdir = new File(config.getServerTempDir().getCanonicalPath() + "/jbossws"); + tmpdir.mkdirs(); + } + catch (Throwable t) + { + // Use the Java temp directory if there is no server config (the client) + } + + return tmpdir; + } +} Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/IOUtils.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/JavaUtils.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/JavaUtils.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/JavaUtils.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -0,0 +1,649 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.framework.utils; + +// $Id$ + +import java.lang.reflect.*; +import java.util.HashMap; +import java.util.HashSet; + +import org.jboss.logging.Logger; + +/** Java utilities + * + * @author Thomas.Diesler(a)jboss.org + * @since 22-Dec-2004 + */ +public class JavaUtils +{ + // provide logging + private static final Logger log = Logger.getLogger(JavaUtils.class); + + private static HashMap<String, Class> primitiveNames = new HashMap<String, Class>(8); + private static HashMap<String, String> primitiveNameDescriptors = new HashMap<String, String>(8); + private static HashSet<String> reservedKeywords = new HashSet<String>(50); + + static + { + primitiveNames.put("int", int.class); + primitiveNames.put("short", short.class); + primitiveNames.put("boolean", boolean.class); + primitiveNames.put("byte", byte.class); + primitiveNames.put("long", long.class); + primitiveNames.put("double", double.class); + primitiveNames.put("float", float.class); + primitiveNames.put("char", char.class); + + primitiveNameDescriptors.put("int", "I"); + primitiveNameDescriptors.put("short", "S"); + primitiveNameDescriptors.put("boolean", "Z"); + primitiveNameDescriptors.put("byte", "B"); + primitiveNameDescriptors.put("long", "J"); + primitiveNameDescriptors.put("double", "D"); + primitiveNameDescriptors.put("float", "F"); + primitiveNameDescriptors.put("char", "C"); + + reservedKeywords.add("abstract"); + reservedKeywords.add("continue"); + reservedKeywords.add("for"); + reservedKeywords.add("new"); + reservedKeywords.add("switch"); + reservedKeywords.add("assert"); + reservedKeywords.add("default"); + reservedKeywords.add("if"); + reservedKeywords.add("package"); + reservedKeywords.add("synchronized"); + reservedKeywords.add("boolean"); + reservedKeywords.add("do"); + reservedKeywords.add("goto"); + reservedKeywords.add("private"); + reservedKeywords.add("this"); + reservedKeywords.add("break"); + reservedKeywords.add("double"); + reservedKeywords.add("implements"); + reservedKeywords.add("protected"); + reservedKeywords.add("throw"); + reservedKeywords.add("byte"); + reservedKeywords.add("else"); + reservedKeywords.add("import"); + reservedKeywords.add("public"); + reservedKeywords.add("throws"); + reservedKeywords.add("case"); + reservedKeywords.add("enum"); + reservedKeywords.add("instanceof"); + reservedKeywords.add("return"); + reservedKeywords.add("transient"); + reservedKeywords.add("catch"); + reservedKeywords.add("extends"); + reservedKeywords.add("int"); + reservedKeywords.add("short"); + reservedKeywords.add("try"); + reservedKeywords.add("char"); + reservedKeywords.add("final"); + reservedKeywords.add("interface"); + reservedKeywords.add("static"); + reservedKeywords.add("void"); + reservedKeywords.add("class"); + reservedKeywords.add("finally"); + reservedKeywords.add("long"); + reservedKeywords.add("strictfp"); + reservedKeywords.add("volatile"); + reservedKeywords.add("const"); + reservedKeywords.add("float"); + reservedKeywords.add("native"); + reservedKeywords.add("super"); + reservedKeywords.add("while"); + } + + /** + * Load a Java type from a given class loader. + * + * @param typeName maybe the source notation of a primitve, class name, array of both + */ + public static Class loadJavaType(String typeName) throws ClassNotFoundException + { + return loadJavaType(typeName, null); + } + + /** + * Load a Java type from a given class loader. + * + * @param typeName maybe the source notation of a primitve, class name, array of both + */ + public static Class loadJavaType(String typeName, ClassLoader classLoader) throws ClassNotFoundException + { + if (classLoader == null) + classLoader = Thread.currentThread().getContextClassLoader(); + + Class javaType = primitiveNames.get(typeName); + if (javaType == null) + javaType = getArray(typeName, classLoader); + + if (javaType == null) + javaType = classLoader.loadClass(typeName); + + return javaType; + } + + /** + * True if the given type name is the source notation of a primitive or array of which. + */ + public static boolean isPrimitive(String javaType) + { + return getPrimitiveType(javaType) != null; + } + + /** + * True if the given class is a primitive or array of which. + */ + public static boolean isPrimitive(Class javaType) + { + return javaType.isPrimitive() || (javaType.isArray() && isPrimitive(javaType.getComponentType())); + } + + public static Class getPrimitiveType(String javaType) + { + Class type = primitiveNames.get(javaType); + if (type != null) + return type; + + try + { + // null loader = primitive only + type = getArray(javaType, null); + } + catch (ClassNotFoundException e) + { + // This will actually never be thrown since is null + } + + return type; + } + + private static Class getArray(String javaType, ClassLoader loader) throws ClassNotFoundException + { + if (javaType.charAt(0) == '[') + return getArrayFromJVMName(javaType, loader); + + if (javaType.endsWith("[]")) + return getArrayFromSourceName(javaType, loader); + + return null; + } + + private static Class getArrayFromJVMName(String javaType, ClassLoader loader) throws ClassNotFoundException + { + Class componentType; + int componentStart = javaType.lastIndexOf('[') + 1; + switch (javaType.charAt(componentStart)) + { + case 'I': componentType = int.class; break; + case 'S': componentType = short.class; break; + case 'Z': componentType = boolean.class; break; + case 'B': componentType = byte.class; break; + case 'J': componentType = long.class; break; + case 'D': componentType = double.class; break; + case 'F': componentType = float.class; break; + case 'C': componentType = char.class; break; + case 'L': + if (loader == null) + return null; + String name = javaType.substring(componentStart + 1, javaType.length() - 1); + componentType = loader.loadClass(name); + break; + default: + throw new IllegalArgumentException("Invalid binary component for array: " + javaType.charAt(componentStart)); + } + + // componentStart doubles as the number of '['s which is the number of dimensions + return Array.newInstance(componentType, new int[componentStart]).getClass(); + } + + private static Class getArrayFromSourceName(String javaType, ClassLoader loader) throws ClassNotFoundException + { + int arrayStart = javaType.indexOf('['); + String componentName = javaType.substring(0, arrayStart); + + Class componentType = primitiveNames.get(componentName); + if (componentType == null) + { + if (loader == null) + return null; + + componentType = loader.loadClass(componentName); + } + + // [][][][] divided by 2 + int dimensions = (javaType.length() - arrayStart) >> 1; + + return Array.newInstance(componentType, new int[dimensions]).getClass(); + } + + /** + * Get the corresponding primitive for a give wrapper type. + * Also handles arrays of which. + */ + public static Class getPrimitiveType(Class javaType) + { + if (javaType == Integer.class) + return int.class; + if (javaType == Short.class) + return short.class; + if (javaType == Boolean.class) + return boolean.class; + if (javaType == Byte.class) + return byte.class; + if (javaType == Long.class) + return long.class; + if (javaType == Double.class) + return double.class; + if (javaType == Float.class) + return float.class; + if (javaType == Character.class) + return char.class; + + if (javaType == Integer[].class) + return int[].class; + if (javaType == Short[].class) + return short[].class; + if (javaType == Boolean[].class) + return boolean[].class; + if (javaType == Byte[].class) + return byte[].class; + if (javaType == Long[].class) + return long[].class; + if (javaType == Double[].class) + return double[].class; + if (javaType == Float[].class) + return float[].class; + if (javaType == Character[].class) + return char[].class; + + if (javaType.isArray() && javaType.getComponentType().isArray()) + { + Class compType = getPrimitiveType(javaType.getComponentType()); + return Array.newInstance(compType, 0).getClass(); + } + + return javaType; + } + + /** + * Converts an n-dimensional array of wrapper types to primitive types + */ + public static Object getPrimitiveValueArray(Object value) + { + if (value == null) + return null; + + Class javaType = value.getClass(); + if (javaType.isArray()) + { + int length = Array.getLength(value); + Object destArr = Array.newInstance(getPrimitiveType(javaType.getComponentType()), length); + for (int i = 0; i < length; i++) + { + Object srcObj = Array.get(value, i); + Array.set(destArr, i, getPrimitiveValueArray(srcObj)); + } + return destArr; + } + + return value; + } + + /** + * Get the corresponding wrapper type for a give primitive. + * Also handles arrays of which. + */ + public static Class getWrapperType(Class javaType) + { + if (javaType == int.class) + return Integer.class; + if (javaType == short.class) + return Short.class; + if (javaType == boolean.class) + return Boolean.class; + if (javaType == byte.class) + return Byte.class; + if (javaType == long.class) + return Long.class; + if (javaType == double.class) + return Double.class; + if (javaType == float.class) + return Float.class; + if (javaType == char.class) + return Character.class; + + if (javaType == int[].class) + return Integer[].class; + if (javaType == short[].class) + return Short[].class; + if (javaType == boolean[].class) + return Boolean[].class; + if (javaType == byte[].class) + return Byte[].class; + if (javaType == long[].class) + return Long[].class; + if (javaType == double[].class) + return Double[].class; + if (javaType == float[].class) + return Float[].class; + if (javaType == char[].class) + return Character[].class; + + if (javaType.isArray() && javaType.getComponentType().isArray()) + { + Class compType = getWrapperType(javaType.getComponentType()); + return Array.newInstance(compType, 0).getClass(); + } + + return javaType; + } + + /** + * Converts an n-dimensional array of primitive types to wrapper types + */ + public static Object getWrapperValueArray(Object value) + { + if (value == null) + return null; + + Class javaType = value.getClass(); + if (javaType.isArray()) + { + int length = Array.getLength(value); + Object destArr = Array.newInstance(getWrapperType(javaType.getComponentType()), length); + for (int i = 0; i < length; i++) + { + Object srcObj = Array.get(value, i); + Array.set(destArr, i, getWrapperValueArray(srcObj)); + } + return destArr; + } + + return value; + } + + public static Object syncArray(Object array, Class target) + { + return (JavaUtils.isPrimitive(target)) ? JavaUtils.getPrimitiveValueArray(array) : JavaUtils.getWrapperValueArray(array); + } + + /** + * Return true if the dest class is assignable from the src. + * Also handles arrays and primitives. + */ + public static boolean isAssignableFrom(Class dest, Class src) + { + if (dest == null) + throw new IllegalArgumentException("Destination class cannot be null"); + if (src == null) + throw new IllegalArgumentException("Source class cannot be null"); + + boolean isAssignable = dest.isAssignableFrom(src); + if (isAssignable == false && dest.getName().equals(src.getName())) + { + ClassLoader destLoader = dest.getClassLoader(); + ClassLoader srcLoader = src.getClassLoader(); + if(log.isDebugEnabled()) log.debug("Not assignable because of conflicting class loaders:\ndstLoader=" + destLoader + "\nsrcLoader=" + srcLoader); + } + + if (isAssignable == false && isPrimitive(dest)) + { + dest = getWrapperType(dest); + isAssignable = dest.isAssignableFrom(src); + } + if (isAssignable == false && isPrimitive(src)) + { + src = getWrapperType(src); + isAssignable = dest.isAssignableFrom(src); + } + return isAssignable; + } + + public static String convertJVMNameToSourceName(String typeName, ClassLoader loader) + { + // TODO Don't use a ClassLoader for this, we need to just convert it + try + { + Class javaType = loadJavaType(typeName, loader); + typeName = getSourceName(javaType); + } + catch (Exception e) + { + } + + return typeName; + } + + /** + * Converts a JVM external name to a JVM signature name. An external name is + * that which is returned from {@link Class#getName()} A signature name is + * the name in class file format. + * <p> + * For example: + * <p> + * [java.lang.Object + * <p> + * becomes: + * <p> + * [Ljava/lang/Object; + * + * @param externalName + * @return + */ + public static String toSignature(String externalName) + { + if (externalName == null) + return null; + + String ret = primitiveNameDescriptors.get(externalName); + if (ret != null) + return ret; + + ret = externalName.replace('.', '/'); + return (ret.charAt(0) == '[') ? ret : "L" + ret + ";"; + } + + public static String printArray(Object[] val) + { + if (val == null) + return "null"; + + StringBuilder out = new StringBuilder("["); + for (int i = 0; i < val.length; i++) + { + if (i > 0) + { + out.append(","); + } + out.append(val[i].getClass().isArray() ? printArray((Object[])val[i]) : val[i]); + } + return out.append("]").toString(); + } + + public static String getSourceName(Class type) + { + if (! type.isArray()) + return type.getName(); + + String arrayNotation = ""; + Class component = type; + while(component.isArray()) + { + component = component.getComponentType(); + arrayNotation += "[]"; + } + + return component.getName() + arrayNotation; + } + + public static String capitalize(String source) + { + if (source == null) + return null; + + if (source.length() == 0) + return source; + + if (Character.isUpperCase(source.charAt(0))) + return source; + + char c = Character.toUpperCase(source.charAt(0)); + + return c + source.substring(1); + } + + public static boolean isLoaded(String className, ClassLoader loader) + { + try + { + loadJavaType(className, loader); + } + catch (ClassNotFoundException e) + { + return false; + } + + return true; + } + + public static String getPackageName(Class<?> clazz) + { + String fullName = clazz.getName(); + return fullName.substring(0, fullName.lastIndexOf(".")); + } + + public static boolean isReservedKeyword(String keyword) + { + return reservedKeywords.contains(keyword); + } + + /** + * Erases a type according to the JLS type erasure rules + * + * @param t type to erase + * @return erased type + */ + public static Class erasure(Type type) + { + if (type instanceof ParameterizedType) + { + return erasure(((ParameterizedType)type).getRawType()); + } + if (type instanceof TypeVariable) + { + return erasure(((TypeVariable)type).getBounds()[0]); + } + if (type instanceof WildcardType) + { + return erasure(((WildcardType)type).getUpperBounds()[0]); + } + if (type instanceof GenericArrayType) + { + return Array.newInstance(erasure(((GenericArrayType)type).getGenericComponentType()), 0).getClass(); + } + + // Only type left is class + return (Class)type; + } + + public static String[] getRawParameterTypeArguments(ParameterizedType type) + { + Type[] arguments = type.getActualTypeArguments(); + String[] ret = new String[arguments.length]; + for (int i = 0; i < arguments.length; i++) + { + Class raw = erasure(arguments[i]); + ret[i] = raw.getName(); + } + + return ret; + } + + /** + * This method tests for retro translation by searching for a known problem where Class + * does not implement Type. If this is true, then code must never cast a Class to a Type. + * + * @return true if we are in retro + */ + public static boolean isRetro14() + { + return !(String.class instanceof java.lang.reflect.Type); + } + + /** + * Tests if this class loader is a JBoss RepositoryClassLoader + * + * @param loader + * @return + */ + public static boolean isJBossRepositoryClassLoader(ClassLoader loader) + { + Class clazz = loader.getClass(); + while (!clazz.getName().startsWith("java")) + { + if ("org.jboss.mx.loading.RepositoryClassLoader".equals(clazz.getName())) + return true; + clazz = clazz.getSuperclass(); + } + + return false; + } + + /** + * Clears black lists on a JBoss RepositoryClassLoader. This is somewhat of a hack, and + * could be replaced with an integration module. This is needed when the following order of + * events occur. + * + * <ol> + * <li>loadClass() returns not found</li> + * <li>Some call to defineClass()</li> + * <ol> + * + * The CNFE triggers a black list addition, which cause the class never again to be found. + * + * @param loader the loader to clear black lists for + */ + public static void clearBlacklists(ClassLoader loader) + { + if (isJBossRepositoryClassLoader(loader)) + { + for(Method m : loader.getClass().getMethods()) + { + if("clearBlackLists".equalsIgnoreCase(m.getName())) + { + try + { + m.invoke(loader); + } + catch (Exception e) + { + if(log.isDebugEnabled()) log.debug("Could not clear blacklists on " + loader); + } + } + } + } + } +} \ No newline at end of file Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/JavaUtils.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/ObjectNameFactory.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/ObjectNameFactory.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/ObjectNameFactory.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.framework.utils; + +import java.util.Hashtable; + +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; + +/** + * A simple factory for creating safe object names. + * + * @author Thomas.Diesler(a)jboss.org + * @since 08-May-2006 + */ +public class ObjectNameFactory +{ + public static ObjectName create(String name) + { + try + { + return new ObjectName(name); + } + catch (MalformedObjectNameException e) + { + throw new Error("Invalid ObjectName: " + name + "; " + e); + } + } + + public static ObjectName create(String domain, String key, String value) + { + try + { + return new ObjectName(domain, key, value); + } + catch (MalformedObjectNameException e) + { + throw new Error("Invalid ObjectName: " + domain + "," + key + "," + value + "; " + e); + } + } + + public static ObjectName create(String domain, Hashtable table) + { + try + { + return new ObjectName(domain, table); + } + catch (MalformedObjectNameException e) + { + throw new Error("Invalid ObjectName: " + domain + "," + table + "; " + e); + } + } +} Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/ObjectNameFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/ServiceLoader.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/ServiceLoader.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/ServiceLoader.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -0,0 +1,251 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.framework.utils; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.Properties; + +// $Id$ + +/** + * Load a service class using this ordered lookup procedure + * + * @author Thomas.Diesler(a)jboss.com + * @since 14-Dec-2006 + */ +public abstract class ServiceLoader +{ + /** + * This method uses the algorithm below using the JAXWS Provider as an example. + * + * 1. If a resource with the name of META-INF/services/javax.xml.ws.spi.Provider exists, then + * its first line, if present, is used as the UTF-8 encoded name of the implementation class. + * + * 2. If the ${java.home}/lib/jaxws.properties file exists and it is readable by the + * java.util.Properties.load(InputStream) method and it contains an entry whose key is + * javax.xml.ws.spi.Provider, then the value of that entry is used as the name of the implementation class. + * + * 3. If a system property with the name javax.xml.ws.spi.Provider is defined, then its value is used + * as the name of the implementation class. + * + * 4. Finally, a default implementation class name is used. + */ + public static Object loadService(String propertyName, String defaultFactory) + { + Object factory = loadFromServices(propertyName, null); + if (factory == null) + { + factory = loadFromPropertiesFile(propertyName, null); + } + if (factory == null) + { + factory = loadFromSystemProperty(propertyName, defaultFactory); + } + return factory; + } + + /** Use the Services API (as detailed in the JAR specification), if available, to determine the classname. + */ + public static Object loadFromServices(String propertyName, String defaultFactory) + { + Object factory = null; + String factoryName = null; + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + + // Use the Services API (as detailed in the JAR specification), if available, to determine the classname. + String filename = "META-INF/services/" + propertyName; + InputStream inStream = loader.getResourceAsStream(filename); + if (inStream != null) + { + try + { + BufferedReader br = new BufferedReader(new InputStreamReader(inStream, "UTF-8")); + factoryName = br.readLine(); + br.close(); + if (factoryName != null) + { + Class factoryClass = loader.loadClass(factoryName); + factory = factoryClass.newInstance(); + } + } + catch (Throwable t) + { + throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t); + } + } + + // Use the default factory implementation class. + if (factory == null && defaultFactory != null) + { + factory = loadDefault(defaultFactory); + } + + return factory; + } + + /** Use the system property + */ + public static Object loadFromSystemProperty(String propertyName, String defaultFactory) + { + Object factory = null; + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + + PrivilegedAction action = new PropertyAccessAction(propertyName); + String factoryName = (String)AccessController.doPrivileged(action); + if (factoryName != null) + { + try + { + //if(log.isDebugEnabled()) log.debug("Load from system property: " + factoryName); + Class factoryClass = loader.loadClass(factoryName); + factory = factoryClass.newInstance(); + } + catch (Throwable t) + { + throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t); + } + } + + // Use the default factory implementation class. + if (factory == null && defaultFactory != null) + { + factory = loadDefault(defaultFactory); + } + + return factory; + } + + /** + * Use the properties file "${java.home}/lib/jaxws.properties" in the JRE directory. + * This configuration file is in standard java.util.Properties format and contains the + * fully qualified name of the implementation class with the key being the system property defined above. + */ + public static Object loadFromPropertiesFile(String propertyName, String defaultFactory) + { + Object factory = null; + String factoryName = null; + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + + // Use the properties file "lib/jaxm.properties" in the JRE directory. + // This configuration file is in standard java.util.Properties format and contains the fully qualified name of the implementation class with the key being the system property defined above. + PrivilegedAction action = new PropertyAccessAction("java.home"); + String javaHome = (String)AccessController.doPrivileged(action); + File jaxmFile = new File(javaHome + "/lib/jaxws.properties"); + if (jaxmFile.exists()) + { + try + { + action = new PropertyFileAccessAction(jaxmFile.getCanonicalPath()); + Properties jaxmProperties = (Properties)AccessController.doPrivileged(action); + factoryName = jaxmProperties.getProperty(propertyName); + if (factoryName != null) + { + //if(log.isDebugEnabled()) log.debug("Load from " + jaxmFile + ": " + factoryName); + Class factoryClass = loader.loadClass(factoryName); + factory = factoryClass.newInstance(); + } + } + catch (Throwable t) + { + throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t); + } + } + + // Use the default factory implementation class. + if (factory == null && defaultFactory != null) + { + factory = loadDefault(defaultFactory); + } + + return factory; + } + + private static Object loadDefault(String defaultFactory) + { + Object factory = null; + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + + // Use the default factory implementation class. + if (defaultFactory != null) + { + try + { + //if(log.isDebugEnabled()) log.debug("Load from default: " + factoryName); + Class factoryClass = loader.loadClass(defaultFactory); + factory = factoryClass.newInstance(); + } + catch (Throwable t) + { + throw new IllegalStateException("Failed to load: " + defaultFactory, t); + } + } + + return factory; + } + + private static class PropertyAccessAction implements PrivilegedAction + { + private String name; + + PropertyAccessAction(String name) + { + this.name = name; + } + + public Object run() + { + return System.getProperty(name); + } + } + + private static class PropertyFileAccessAction implements PrivilegedAction + { + private String filename; + + PropertyFileAccessAction(String filename) + { + this.filename = filename; + } + + public Object run() + { + try + { + InputStream inStream = new FileInputStream(filename); + Properties props = new Properties(); + props.load(inStream); + return props; + } + catch (IOException ex) + { + throw new SecurityException("Cannot load properties: " + filename, ex); + } + } + } +} Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/ServiceLoader.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/log/JBossLogHandler.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/log/JBossLogHandler.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/log/JBossLogHandler.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -0,0 +1,116 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.framework.utils.log; + +import java.util.logging.ErrorManager; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.SimpleFormatter; + +import org.jboss.logging.Logger; + +/** + * A Handler (java.util.logging.Handler) class redirecting messages + * to the jboss logging system. + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it&gt; + * @author Stefano Maestri, <stefano.maestri(a)javalinux.it&gt; + * @since 14-Jun-2007 + * + */ +public class JBossLogHandler extends Handler +{ + + public JBossLogHandler() + { + super.setFormatter(new SimpleFormatter()); + } + + @Override + public void publish(LogRecord record) + { + if (!isLoggable(record)) + { + return; + } + String msg; + try + { + msg = getFormatter().formatMessage(record); + } + catch (Exception ex) + { + // We don't want to throw an exception here, but we + // report the exception to any registered ErrorManager. + reportError(null, ex, ErrorManager.FORMAT_FAILURE); + return; + } + if (record.getLevel() == Level.INFO) + { + Logger.getLogger(record.getSourceClassName()).info(msg); + } + else if (record.getLevel() == Level.SEVERE) + { + Logger.getLogger(record.getSourceClassName()).error(msg); + } + else if (record.getLevel() == Level.WARNING) + { + Logger.getLogger(record.getSourceClassName()).warn(msg); + } + else if (record.getLevel() == Level.FINE) + { + Logger.getLogger(record.getSourceClassName()).debug(msg); + } + else if (record.getLevel() == Level.FINER || record.getLevel() == Level.FINEST) + { + Logger.getLogger(record.getSourceClassName()).trace(msg); + } + else + { + Logger.getLogger(record.getSourceClassName()).debug(msg); + } + } + + @Override + public boolean isLoggable(LogRecord record) + { + if (record == null) + { + return false; + } + return super.isLoggable(record); + } + + @Override + public void flush() + { + //nothing to do + } + + @Override + public void close() throws SecurityException + { + //nothing to do + } + +} \ No newline at end of file Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/log/JBossLogHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/log/JDKLogRedirector.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/log/JDKLogRedirector.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/log/JDKLogRedirector.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -0,0 +1,112 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.framework.utils.log; + +import java.util.LinkedList; +import java.util.List; +import java.util.logging.Filter; +import java.util.logging.Handler; +import java.util.logging.Level; + +import org.jboss.logging.Logger; + +/** + * Redirects JDK Logger output to the JBoss Logger. + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it&gt; + * @author Stefano Maestri, <stefano.maestri(a)javalinux.it&gt; + * @since 14-Jun-2007 + * + */ +public class JDKLogRedirector +{ + private List<String> namespaces = new LinkedList<String>(); + + public JDKLogRedirector() + { + } + + public void changeHandlers() + { + for (String ns : namespaces) + { + changeHandler(ns); + } + } + + /** + * Modifies the jdk root logger in order not to log records coming from + * loggers with the provided namespace; these records are then logged + * through the JBoss Logger. + * + * @param ns + */ + public void changeHandler(String ns) + { + if (ns == null) + ns = ""; + Logger.getLogger(this.getClass()).info("Changing current root logger's log handlers to hide logs with namespace " + ns); + java.util.logging.Logger jdkRootLogger = java.util.logging.Logger.getLogger(""); + Handler[] handlers = jdkRootLogger.getHandlers(); + for (int i = 0; i < handlers.length; i++) + { + Handler handler = handlers[i]; + if (!(handler instanceof JBossLogHandler)) + { + StringBuffer sb = new StringBuffer("Disableing handler "); + sb.append(handler).append(" with level ").append(handler.getLevel()); + Logger.getLogger(this.getClass()).debug(sb); + Filter f = handler.getFilter(); + if (f != null && f instanceof NamespaceFilter) + { + ((NamespaceFilter)f).addNamespace(ns); + } + else + { + NamespaceFilter nsFilter = new NamespaceFilter(false); + nsFilter.addNamespace(ns); + handler.setFilter(nsFilter); + } + } + } + Handler jbossLogHandler = new JBossLogHandler(); + jbossLogHandler.setLevel(Level.ALL); + java.util.logging.Logger.getLogger(ns).addHandler(jbossLogHandler); + } + + public void addNamespace(String ns) + { + namespaces.add(ns); + changeHandler(ns); + } + + public List<String> getNamespaces() + { + return namespaces; + } + + public void setNamespaces(List<String> namespaces) + { + this.namespaces = namespaces; + changeHandlers(); + } +} Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/log/JDKLogRedirector.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/log/NamespaceFilter.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/log/NamespaceFilter.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/log/NamespaceFilter.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -0,0 +1,96 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.framework.utils.log; + +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.logging.Filter; +import java.util.logging.LogRecord; + +/** + * A log filter allowing logging of LogRecord depending on the + * namespace of the Logger they have been collected by. + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it&gt; + * @author Stefano Maestri, <stefano.maestri(a)javalinux.it&gt; + * @since 14-Jun-2007 + * + */ +public class NamespaceFilter implements Filter +{ + + private Set<String> namespaces; + private boolean show; + + public NamespaceFilter(boolean show) + { + this.show = show; + } + + public boolean isLoggable(LogRecord record) + { + String loggerName = record.getLoggerName(); + if (loggerName == null) + { + return true; + } + else + { + for (String ns : namespaces) + { + if (loggerName.startsWith(ns)) + { + return show; + } + } + return !show; + } + } + + public void addNamespace(String ns) + { + if (namespaces == null) + namespaces = new LinkedHashSet<String>(); + namespaces.add(ns); + } + + public Set<String> getNamespaces() + { + return namespaces; + } + + public void setNamespaces(Set<String> namespaces) + { + this.namespaces = namespaces; + } + + public boolean isShow() + { + return show; + } + + public void setShow(boolean show) + { + this.show = show; + } + +} Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/log/NamespaceFilter.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/annotation/WebContext.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/annotation/WebContext.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/annotation/WebContext.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -0,0 +1,95 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.wsf.spi.annotation; + +// $Id$ + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Provides web context specific meta data to EJB based web service endpoints. + * + * @author thomas.diesler(a)jboss.org + * @since 26-Apr-2005 + */ +@Retention(value = RetentionPolicy.RUNTIME) +@Target(value = { ElementType.TYPE }) +public @interface WebContext { + + /** + * The contextRoot element specifies the context root that the web service endpoint is deployed to. + * If it is not specified it will be derived from the deployment short name. + * + * Applies to server side port components only. + */ + String contextRoot() default ""; + + /** + * The virtual hosts that the web service endpoint is deployed to. + * + * Applies to server side port components only. + */ + String[] virtualHosts() default {}; + + /** + * Relative path that is appended to the contextRoot to form fully qualified + * endpoint address for the web service endpoint. + * + * Applies to server side port components only. + */ + String urlPattern() default ""; + + /** + * The authMethod is used to configure the authentication mechanism for the web service. + * As a prerequisite to gaining access to any web service which are protected by an authorization + * constraint, a user must have authenticated using the configured mechanism. + * + * Legal values for this element are "BASIC", or "CLIENT-CERT". + */ + String authMethod() default ""; + + /** + * The transportGuarantee specifies that the communication + * between client and server should be NONE, INTEGRAL, or + * CONFIDENTIAL. NONE means that the application does not require any + * transport guarantees. A value of INTEGRAL means that the application + * requires that the data sent between the client and server be sent in + * such a way that it can't be changed in transit. CONFIDENTIAL means + * that the application requires that the data be transmitted in a + * fashion that prevents other entities from observing the contents of + * the transmission. In most cases, the presence of the INTEGRAL or + * CONFIDENTIAL flag will indicate that the use of SSL is required. + */ + String transportGuarantee() default ""; + + /** + * A secure endpoint does not secure wsdl access by default. + * Explicitly setting secureWSDLAccess overrides this behaviour. + * + * Protect access to WSDL. See http://jira.jboss.org/jira/browse/JBWS-723 + */ + boolean secureWSDLAccess() default false; + +} Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/annotation/WebContext.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -23,7 +23,7 @@ // $Id$ -import org.jboss.wsf.spi.utils.ServiceLoader; +import org.jboss.wsf.framework.utils.ServiceLoader; /** * A container idependent SecurityAdaptorFactory Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -28,7 +28,7 @@ import javax.management.ObjectName; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; /** * A general endpoint registry. Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -28,7 +28,7 @@ import javax.xml.namespace.QName; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.jboss.xb.QNameBuilder; import org.w3c.dom.Element; Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -0,0 +1,191 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.tools; + +import java.io.File; +import java.io.PrintStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.List; + +import org.jboss.wsf.framework.utils.ServiceLoader; + +/** + * WSContractConsumer is responsible for generating JAX-WS client and server + * artifacts from the specified WSDL file. To implement a client, one would use + * the generated ___Service.java file. For a server, one only needs to provide + * an implementation class that implements the generated service endpoint + * interface. + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @version $Revision$ + */ +public abstract class WSContractConsumer +{ + private static String DEFAULT_PROVIDER = "org.jboss.ws.tools.jaxws.impl.SunRIConsumerFactoryImpl"; + public static final String PROVIDER_PROPERTY = "org.jboss.wsf.spi.tools.ConsumerFactoryImpl"; + + /** + * Obtain a new instance of a WSContractProvider. This will use the current + * thread's context class loader to locate the WSContractProviderFactory + * implementation. + * + * @return a new WSContractProvider + */ + public static WSContractConsumer newInstance() + { + return newInstance(Thread.currentThread().getContextClassLoader()); + } + + /** + * Obtain a new instance of a WSContractConsumer. The specified ClassLoader will be used to + * locate the WebServiceImporterProvide implementation + * + * @param loader the ClassLoader to use + * @return a new WSContractConsumer + */ + public static WSContractConsumer newInstance(ClassLoader loader) + { + ClassLoader oldLoader = Thread.currentThread().getContextClassLoader(); + try + { + Thread.currentThread().setContextClassLoader(loader); + WSContractConsumerFactory factory = (WSContractConsumerFactory)ServiceLoader.loadService(PROVIDER_PROPERTY, DEFAULT_PROVIDER); + return factory.createConsumer(); + } + finally + { + Thread.currentThread().setContextClassLoader(oldLoader); + } + } + + /** + * Specifies the JAX-WS and JAXB binding files to use on import operations. + * + * @param bindingFiles list of JAX-WS or JAXB binding files + */ + public abstract void setBindingFiles(List<File> bindingFiles); + + /** + * Sets the OASIS XML Catalog file to use for entity resolution. + * + * @param catalog the OASIS XML Catalog file + */ + public abstract void setCatalog(File catalog); + + /** + * Sets the main output directory. If the directory does not exist, it will be created. + * + * @param directory the root directory for generated files + */ + public abstract void setOutputDirectory(File directory); + + /** + * Sets the source directory. This directory will contain any generated Java source. + * If the directory does not exist, it will be created. If not specified, + * the output directory will be used instead. + * + * @param directory the root directory for generated source code + */ + public abstract void setSourceDirectory(File directory); + + /** + * Enables/Disables Java source generation. + * + * @param generateSource whether or not to generate Java source. + */ + public abstract void setGenerateSource(boolean generateSource); + + /** + * Sets the target package for generated source. If not specified the default + * is based off of the XML namespace. + * + * @param targetPackage the target package for generated source + */ + public abstract void setTargetPackage(String targetPackage); + + /** + * Sets the @(a)WebService.wsdlLocation and @(a)WebServiceClient.wsdlLocation attributes to a custom value. + * + * @param wsdlLocation the custom WSDL location to use in generated source + */ + public abstract void setWsdlLocation(String wsdlLocation); + + /** + * Sets the PrintStream to use for status feedback. The simplest example + * would be to use System.out. + * + * @param messageStream the stream to use for status messages: + */ + public abstract void setMessageStream(PrintStream messageStream); + + /** + * Sets the additional classpath to use if/when invoking the Java compiler. + * Typically an implementation will use the system <code>java.class.path</code> + * property. So for most normal applications this method is not needed. However, + * if this API is being used from an isolated classloader, then it needs to + * be called in order to reference all jars that are required by the + * implementation. + * + * @param classPath a list of strings where each entry references a + * single jar or directory + */ + public abstract void setAdditionalCompilerClassPath(List<String> classPath); + + /** + * Set the target JAX-WS specification target. Defaults to <code>2.0</code> + * @param target the JAX-WS specification version. Allowed values are 2.0, 2.1 + */ + public abstract void setTarget(String target); + + /** + * Generate the required artifacts using the specified WSDL URL. This method + * may be called more than once, although this is probably not desireable + * + * @param wsdl the URL of the WSDL + */ + public abstract void consume(URL wsdl); + + /** + * Generate the required artifacts using the specified WSDL. This method + * may be called more than once, although this is probably not desireable. + * The passed string is expect to either be a valid URL, or a local file path. + * + * @param wsdl a URL or local file path + * @throws MalformedURLException if wsdl is not a legal URL or local file + */ + public void consume(String wsdl) throws MalformedURLException + { + URL url = null; + try + { + url = new URL(wsdl); + } + catch (MalformedURLException e) + { + File file = new File(wsdl); + url = file.toURL(); + } + + consume(url); + } +} Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumerFactory.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumerFactory.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumerFactory.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.tools; + +import org.jboss.wsf.spi.tools.WSContractConsumer; + +/** + * Creates WSContractConsumer implementations. + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + */ +public interface WSContractConsumerFactory +{ + /** + * Create a new WSContractConsumer. There are no restrictions on how this + * should be performed. + * + * @return a new WSContractConsumer + */ + public WSContractConsumer createConsumer(); +} Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumerFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -0,0 +1,157 @@ +package org.jboss.wsf.spi.tools; + +import java.io.File; +import java.io.PrintStream; + +import org.jboss.wsf.framework.utils.ServiceLoader; + +/** + * WSContractProvider is responsible for generating the required portable + * JAX-WS artifacts for a service endpoint implementation. This includes class + * files for wrapper types and fault beans. WSDL may be optionally generated as + * well using this API. + * + * <p>The following example generates class files, source files and WSDL for an + * endpoint:</p> + * <pre> + * WSContractProvider provider = WSContractProvider.newInstance(); + * provider.setGenerateSource(true); + * provider.setGenerateWsdl(true); + * provider.setOutputDirectory(new File("output")); + * provider.setMessageStream(System.out); + * provider.provide(TestMe.class); + * </pre> + * + * <p>Thread-Safety:</p> + * This class expects to be thread-confined, so it can not be shared between threads. + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + */ +public abstract class WSContractProvider +{ + private static String DEFAULT_PROVIDER = "org.jboss.ws.tools.jaxws.impl.JBossWSProviderFactoryImpl"; + public static final String PROVIDER_PROPERTY = "org.jboss.wsf.spi.tools.ProviderFactoryImpl"; + + protected WSContractProvider() + { + + } + + /** + * Obtain a new instance of a WSContractProvider. This will use the current + * thread's context class loader to locate the WSContractProviderFactory + * implementation. + * + * @return a new WSContractProvider + */ + public static WSContractProvider newInstance() + { + return newInstance(Thread.currentThread().getContextClassLoader()); + } + + /** + * Obtain a new instance of a WSContractProvider. The specified ClassLoader will be used to + * locate the WSContractProviderFactory implementation + * + * @param loader the ClassLoader to use + * @return a new WSContractProvider + */ + public static WSContractProvider newInstance(ClassLoader loader) + { + ClassLoader oldLoader = Thread.currentThread().getContextClassLoader(); + try + { + Thread.currentThread().setContextClassLoader(loader); + WSContractProviderFactory factory = (WSContractProviderFactory)ServiceLoader.loadService(PROVIDER_PROPERTY, DEFAULT_PROVIDER); + return factory.createProvider(loader); + } + finally + { + Thread.currentThread().setContextClassLoader(oldLoader); + } + } + + /** + * Enables/Disables WSDL generation. + * + * @param generateWsdl whether or not to generate WSDL + */ + public abstract void setGenerateWsdl(boolean generateWsdl); + + /** + * Enables/Disables Java source generation. + * + * @param generateSource whether or not to generate Java source. + */ + public abstract void setGenerateSource(boolean generateSource); + + /** + * Sets the main output directory. If the directory does not exist, it will be created. + * + * @param directory the root directory for generated files + */ + public abstract void setOutputDirectory(File directory); + + /** + * Sets the resource directory. This directory will contain any generated + * WSDL and XSD files. If the directory does not exist, it will be created. + * If not specified, the output directory will be used instead. + * + * @param directory the root directory for generated resource files + */ + public abstract void setResourceDirectory(File directory); + + /** + * Sets the source directory. This directory will contain any generated Java source. + * If the directory does not exist, it will be created. If not specified, + * the output directory will be used instead. + * + * @param directory the root directory for generated source code + */ + public abstract void setSourceDirectory(File directory); + + /** + * Sets the ClassLoader used to discover types. This defaults to the one used + * in instantiation. + * + * @param loader the ClassLoader to use + */ + public abstract void setClassLoader(ClassLoader loader); + + /** + * Generates artifacts using the current settings. This method may be invoked + * more than once (e.g. multiple endpoints). + * + * @param endpointClass the name of the endpoint implementation bean + * @throws RuntimeException if any error occurs during processing, or the class is not found + */ + public abstract void provide(String endpointClass); + + /** + * Generates artifacts using the current settings. This method may be invoked + * more than once (e.g. multiple endpoints). + * + * @param endpointClass the endpoint implementation bean + * @throws RuntimeException if any error occurs during processing + */ + public abstract void provide(Class<?> endpointClass); + + /** + * Sets the PrintStream to use for status feedback. The simplest example + * would be to use System.out. + * + * <p>Example output:</p> + * <pre> + * Generating WSDL: + * TestMeService.wsdl + * Writing Source: + * org/jboss/ws/tools/jaxws/TestMe.java + * org/jboss/ws/tools/jaxws/TestMeResponse.java + * Writing Classes: + * org/jboss/ws/tools/jaxws/TestMe.class + * org/jboss/ws/tools/jaxws/TestMeResponse.class + * </pre> + * @param messageStream the stream to use for status messages: + */ + public abstract void setMessageStream(PrintStream messageStream); +} Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProviderFactory.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProviderFactory.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProviderFactory.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -0,0 +1,43 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.tools; + +import org.jboss.wsf.spi.tools.WSContractProvider; + +/** + * Creates WSContractProvider implementations. + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + */ +public interface WSContractProviderFactory +{ + /** + * Create a new WSContractProvider. There are no restrictions on how this + * should be performed. The passed ClassLoader is the one used in + * {@link WSContractProvider#newInstance(ClassLoader)}. This loader + * should be made available to the generated WSContractProvider. + * + * @param loader the ClassLoader for type discovery + * @return a new WSContractProvider + */ + public WSContractProvider createProvider(ClassLoader loader); +} Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProviderFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -0,0 +1,323 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.tools.ant; + +import java.io.File; +import java.io.PrintStream; +import java.net.MalformedURLException; +import java.util.ArrayList; +import java.util.List; + +import org.apache.tools.ant.AntClassLoader; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.taskdefs.ExecuteJava; +import org.apache.tools.ant.taskdefs.LogOutputStream; +import org.apache.tools.ant.types.Commandline; +import org.apache.tools.ant.types.CommandlineJava; +import org.apache.tools.ant.types.FileSet; +import org.apache.tools.ant.types.Path; +import org.jboss.wsf.spi.tools.WSContractConsumer; + +/** + * Ant task which consumes a Web Service contract. + * + * <table border="1"> + * <tr align="left" BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"><th>Attribute</th><th>Description</th><th>Default</th></tr> + * <tr><td>fork</td><td>Whether or not to run the generation task in a separate VM.</td><td>true</td></tr> + * <tr><td>keep</td><td>Keep/Enable Java source code generation.</td><td>false</td></tr> + * <tr><td>catalog</td><td> Oasis XML Catalog file for entity resolution</td><td>none</td></tr> + * <tr><td>package</td><td> The target Java package for generated code.</td><td>generated</td></tr> + * <tr><td>binding</td><td>A JAX-WS or JAXB binding file</td><td>none</td></tr> + * <tr><td>wsdlLocation</td><td>Value to use for @(a)WebService.wsdlLocation&lt;/td&gt;&lt;td&gt;generated&lt;/td&gt;&lt;/tr&gt; + * <tr><td>destdir</td><td>The output directory for generated artifacts.</td><td>"output"</td></tr> + * <tr><td>sourcedestdir</td><td>The output directory for Java source.</td><td>value of destdir</td></tr> + * <tr><td>target</td><td>The JAX-WS specification target</td><td>2.0 | 2.1</td></tr> + * <tr><td>verbose</td><td>Enables more informational output about cmd progress.</td><td>false</td><tr> + * <tr><td>wsdl*</td><td>The WSDL file or URL</td><td>n/a</td><tr> + * </table> + * <b>* = required.</b> + * + * <p>Example: + * + * <pre> + * &lt;WSConsumeTask + * fork=&quot;true&quot; + * verbose=&quot;true&quot; + * destdir=&quot;output&quot; + * sourcedestdir=&quot;gen-src&quot; + * keep=&quot;true&quot; + * wsdllocation=&quot;handEdited.wsdl&quot; + * wsdl=&quot;foo.wsdl&quot;&gt; + * &lt;binding dir=&quot;binding-files&quot; includes=&quot;*.xml&quot; excludes=&quot;bad.xml&quot;/&gt; + * &lt;/wsimport&gt; + * </pre> + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @version $Revision$ + */ +public class WSConsumeTask extends Task +{ + private CommandlineJava command = new CommandlineJava(); + private String wsdl; + private File destdir; + private File sourcedestdir; + private List<File> bindingFiles = new ArrayList<File>(); + private File catalog; + private String wsdlLocation; + private String targetPackage; + private boolean keep; + private boolean verbose; + private boolean fork; + private boolean debug; + private String target; + + // Not actually used right now + public void setDebug(boolean debug) + { + this.debug = debug; + } + + public Commandline.Argument createJvmarg() + { + return command.createVmArgument(); + } + + public void setBinding(File bindingFile) + { + bindingFiles.add(bindingFile); + } + + public void setCatalog(File catalog) + { + this.catalog = catalog; + } + + public void setDestdir(File destdir) + { + this.destdir = destdir; + } + + public void setFork(boolean fork) + { + this.fork = fork; + } + + public void setKeep(boolean keep) + { + this.keep = keep; + } + + public void setSourcedestdir(File sourcedestdir) + { + this.sourcedestdir = sourcedestdir; + } + + public void setTarget(String target) + { + this.target = target; + } + + public void setPackage(String targetPackage) + { + this.targetPackage = targetPackage; + } + + public void setVerbose(boolean verbose) + { + this.verbose = verbose; + } + + public void setWsdl(String wsdl) + { + this.wsdl = wsdl; + } + + public void setWsdlLocation(String wsdlLocation) + { + this.wsdlLocation = wsdlLocation; + } + + public void addConfiguredBinding(FileSet fs) + { + DirectoryScanner ds = fs.getDirectoryScanner(getProject()); + File baseDir = ds.getBasedir(); + for (String file : ds.getIncludedFiles()) + { + bindingFiles.add(new File(baseDir, file)); + } + } + + public void executeNonForked() + { + ClassLoader prevCL = Thread.currentThread().getContextClassLoader(); + ClassLoader antLoader = this.getClass().getClassLoader(); + Thread.currentThread().setContextClassLoader(antLoader); + try + { + WSContractConsumer importer = WSContractConsumer.newInstance(); + importer.setGenerateSource(keep); + if (destdir != null) + importer.setOutputDirectory(destdir); + if (sourcedestdir != null) + importer.setSourceDirectory(sourcedestdir); + if (targetPackage != null) + importer.setTargetPackage(targetPackage); + if (wsdlLocation != null) + importer.setWsdlLocation(wsdlLocation); + if (catalog != null) + importer.setCatalog(catalog); + if (bindingFiles != null && bindingFiles.size() > 0) + importer.setBindingFiles(bindingFiles); + if (target != null) + importer.setTarget(target); + + log("Consuming wsdl: " + wsdl, Project.MSG_INFO); + + if (verbose) + { + importer.setMessageStream(new PrintStream(new LogOutputStream(this, Project.MSG_INFO))); + } + + try + { + importer.setAdditionalCompilerClassPath(getTaskClassPathStrings()); + importer.consume(wsdl); + } + catch (MalformedURLException e) + { + throw new BuildException(e, getLocation()); + } + } + finally + { + Thread.currentThread().setContextClassLoader(prevCL); + } + } + + public void execute() throws BuildException + { + if (wsdl == null) + throw new BuildException("The wsdl attribute must be specified!", getLocation()); + + if (fork) + executeForked(); + else executeNonForked(); + } + + private Path getTaskClassPath() + { + // Why is everything in the Ant API a big hack??? + ClassLoader cl = this.getClass().getClassLoader(); + if (cl instanceof AntClassLoader) + { + return new Path(getProject(), ((AntClassLoader)cl).getClasspath()); + } + + return new Path(getProject()); + } + + private List<String> getTaskClassPathStrings() + { + // Why is everything in the Ant API a big hack??? + List<String> strings = new ArrayList<String>(); + ClassLoader cl = this.getClass().getClassLoader(); + if (cl instanceof AntClassLoader) + { + for (String string : ((AntClassLoader)cl).getClasspath().split(File.pathSeparator)) + strings.add(string); + } + + return strings; + } + + private void executeForked() throws BuildException + { + command.setClassname(org.jboss.wsf.spi.tools.cmd.WSConsume.class.getName()); + + Path path = command.createClasspath(getProject()); + path.append(getTaskClassPath()); + + if (keep) + command.createArgument().setValue("-k"); + + for (File file : bindingFiles) + { + command.createArgument().setValue("-b"); + command.createArgument().setFile(file); + } + + if (catalog != null) + { + command.createArgument().setValue("-c"); + command.createArgument().setFile(catalog); + } + + if (targetPackage != null) + { + command.createArgument().setValue("-p"); + command.createArgument().setValue(targetPackage); + } + + if (wsdlLocation != null) + { + command.createArgument().setValue("-w"); + command.createArgument().setValue(wsdlLocation); + } + + if (destdir != null) + { + command.createArgument().setValue("-o"); + command.createArgument().setFile(destdir); + } + + if (sourcedestdir != null) + { + command.createArgument().setValue("-s"); + command.createArgument().setFile(sourcedestdir); + } + + if (target != null) + { + command.createArgument().setValue("-t"); + command.createArgument().setValue(target); + } + + if (verbose) + command.createArgument().setValue("-v"); + + command.createArgument().setValue(wsdl); + + log("Consuming wsdl: " + wsdl, Project.MSG_INFO); + + if (verbose) + log("Command invoked: " + command.getJavaCommand().toString()); + + ExecuteJava execute = new ExecuteJava(); + execute.setClasspath(path); + execute.setJavaCommand(command.getJavaCommand()); + if (execute.fork(this) != 0) + throw new BuildException("Could not invoke WSConsumeTask", getLocation()); + } +} \ No newline at end of file Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -0,0 +1,294 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.wsf.spi.tools.ant; + +import org.apache.tools.ant.AntClassLoader; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.taskdefs.ExecuteJava; +import org.apache.tools.ant.taskdefs.LogOutputStream; +import org.apache.tools.ant.types.Commandline; +import org.apache.tools.ant.types.CommandlineJava; +import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.types.Reference; +import org.jboss.wsf.spi.tools.WSContractProvider; + +import java.io.File; +import java.io.PrintStream; +import java.net.URLClassLoader; +import java.net.URL; +import java.net.MalformedURLException; +import java.util.StringTokenizer; +import java.util.List; +import java.util.ArrayList; + +/** + * Ant task which invokes provides a Web Service contract and portable JAX-WS wrapper classes. + * + * <table border="1"> + * <tr align="left" BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"><th>Attribute</th><th>Description</th><th>Default</th></tr> + * <tr><td>fork</td><td>Whether or not to run the generation task in a separate VM.</td><td>true</td></tr> + * <tr><td>keep</td><td>Keep/Enable Java source code generation.</td><td>false</td></tr> + * <tr><td>destdir</td><td>The output directory for generated artifacts.</td><td>"output"</td></tr> + * <tr><td>resourcedestdir</td><td>The output directory for resource artifacts (WSDL/XSD).</td><td>value of destdir</td></tr> + * <tr><td>sourcedestdir</td><td>The output directory for Java source.</td><td>value of destdir</td></tr> + * <tr><td>genwsdl</td><td>Whether or not to generate WSDL.</td><td>false</td><tr> + * <tr><td>verbose</td><td>Enables more informational output about cmd progress.</td><td>false</td><tr> + * <tr><td>sei*</td><td>Service Endpoint Implementation.</td><td></td><tr> + * <tr><td>classpath</td><td>The classpath that contains the service endpoint implementation.</td><td>""</tr> + * </table> + * <b>* = required.</b> + * + * <p>Example: + * + * <pre> + * &lt;target name=&quot;test-wsproivde&quot; depends=&quot;init&quot;&gt; + * &lt;taskdef name=&quot;WSProvideTask&quot; classname=&quot;org.jboss.wsf.spi.tools.ant.WSProvideTask&quot;&gt; + * &lt;classpath refid=&quot;core.classpath&quot;/&gt; + * &lt;/taskdef&gt; + * &lt;WSProvideTask + * fork=&quot;false&quot; + * keep=&quot;true&quot; + * destdir=&quot;out&quot; + * resourcedestdir=&quot;out-resource&quot; + * sourcedestdir=&quot;out-source&quot; + * genwsdl=&quot;true&quot; + * verbose=&quot;true&quot; + * sei=&quot;org.jboss.test.ws.jaxws.jsr181.soapbinding.DocWrappedServiceImpl&quot;&gt; + * &lt;classpath&gt; + * &lt;pathelement path=&quot;${tests.output.dir}/classes&quot;/&gt; + * &lt;/classpath&gt; + * &lt;/WSProvideTask&gt; + * &lt;/target&gt; + * </pre> + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @version $Revision$ + */ +public class WSProvideTask extends Task +{ + private Path classpath = new Path(getProject()); + private CommandlineJava command = new CommandlineJava(); + private String sei = null; + private File destdir = null; + private File resourcedestdir = null; + private File sourcedestdir = null; + private boolean keep = false; + private boolean genwsdl = false; + private boolean verbose = false; + private boolean fork = false; + private boolean debug = false; + + // Not actually used right now + public void setDebug(boolean debug) + { + this.debug = debug; + } + + public Commandline.Argument createJvmarg() + { + return command.createVmArgument(); + } + + public void setClasspath(Path classpath) + { + this.classpath = classpath; + } + + public void setClasspathRef(Reference ref) + { + createClasspath().setRefid(ref); + } + + public Path createClasspath() + { + return classpath; + } + + public void setDestdir(File destdir) + { + this.destdir = destdir; + } + + public void setKeep(boolean keep) + { + this.keep = keep; + } + + public void setSei(String sei) + { + this.sei = sei; + } + + public void setFork(boolean fork) + { + this.fork = fork; + } + + public void setResourcedestdir(File resourcedestdir) + { + this.resourcedestdir = resourcedestdir; + } + + public void setSourcedestdir(File sourcedestdir) + { + this.sourcedestdir = sourcedestdir; + } + + public void setVerbose(boolean verbose) + { + this.verbose = verbose; + } + + public void setGenwsdl(boolean genwsdl) + { + this.genwsdl = genwsdl; + } + + private ClassLoader getClasspathLoader(ClassLoader parent) + { + AntClassLoader antLoader = new AntClassLoader(parent, getProject(), classpath, false); + + // It's necessary to wrap it into an URLLoader in order to extract that information + // within the actual provider impl. + // See SunRIProviderImpl for instance + List<URL> urls = new ArrayList<URL>(); + StringTokenizer tok = new StringTokenizer(antLoader.getClasspath(), File.separator); + while(tok.hasMoreTokens()) + { + try + { + urls.add(new URL(tok.nextToken())); + } + catch (MalformedURLException e) + { + throw new IllegalArgumentException("Failed to wrap classloader", e); + } + + } + + ClassLoader wrapper = new URLClassLoader(urls.toArray(new URL[0]), antLoader); + return wrapper; + } + + public void executeNonForked() + { + ClassLoader prevCL = Thread.currentThread().getContextClassLoader(); + ClassLoader antLoader = this.getClass().getClassLoader(); + Thread.currentThread().setContextClassLoader(antLoader); + try + { + WSContractProvider gen = WSContractProvider.newInstance( + getClasspathLoader(antLoader) + ); + if (verbose) + gen.setMessageStream(new PrintStream(new LogOutputStream(this, Project.MSG_INFO))); + gen.setGenerateSource(keep); + gen.setGenerateWsdl(genwsdl); + if (destdir != null) + gen.setOutputDirectory(destdir); + if (resourcedestdir != null) + gen.setResourceDirectory(resourcedestdir); + if (sourcedestdir != null) + gen.setSourceDirectory(sourcedestdir); + + log("Generating from endpoint: " + sei, Project.MSG_INFO); + + gen.provide(sei); + } + finally + { + Thread.currentThread().setContextClassLoader(prevCL); + } + } + + public void execute() throws BuildException + { + if (sei == null) + throw new BuildException("The sei attribute must be specified!", getLocation()); + + if (fork) + executeForked(); + else + executeNonForked(); + } + + private Path getTaskClassPath() + { + // Why is everything in the Ant API a big hack??? + ClassLoader cl = this.getClass().getClassLoader(); + if (cl instanceof AntClassLoader) + { + return new Path(getProject(), ((AntClassLoader)cl).getClasspath()); + } + + return new Path(getProject()); + } + + private void executeForked() throws BuildException + { + command.setClassname(org.jboss.wsf.spi.tools.cmd.WSProvide.class.getName()); + + Path path = command.createClasspath(getProject()); + path.append(getTaskClassPath()); + path.append(classpath); + + if (keep) + command.createArgument().setValue("-k"); + + if (genwsdl) + command.createArgument().setValue("-w"); + + if (destdir != null) + { + command.createArgument().setValue("-o"); + command.createArgument().setFile(destdir); + } + if (resourcedestdir != null) + { + command.createArgument().setValue("-r"); + command.createArgument().setFile(resourcedestdir); + } + if (sourcedestdir != null) + { + command.createArgument().setValue("-s"); + command.createArgument().setFile(sourcedestdir); + } + + if (!verbose) + command.createArgument().setValue("-q"); + + // Always dump traces + command.createArgument().setValue("-t"); + command.createArgument().setValue(sei); + + if (verbose) + log("Command invoked: " + command.getJavaCommand().toString()); + + ExecuteJava execute = new ExecuteJava(); + execute.setClasspath(path); + execute.setJavaCommand(command.getJavaCommand()); + if (execute.fork(this) != 0) + throw new BuildException("Could not invoke WSProvideTask", getLocation()); + } +} \ No newline at end of file Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -0,0 +1,259 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.tools.cmd; + +import gnu.getopt.Getopt; +import gnu.getopt.LongOpt; +import org.jboss.wsf.spi.tools.WSContractConsumer; + +import java.io.File; +import java.io.PrintStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +/** + * WSConsumeTask is a cmd line tool that generates portable JAX-WS artifacts + * from a WSDL file. + * + * <pre> + * usage: WSConsumeTask [options] &lt;wsdl-url&gt; + * options: + * -h, --help Show this help message + * -b, --binding=&lt;file&gt; One or more JAX-WS or JAXB binding files + * -k, --keep Keep/Generate Java source + * -c --catalog=&lt;file&gt; Oasis XML Catalog file for entity resolution + * -p --package=&lt;name&gt; The target package for generated source + * -w --wsdlLocation=&lt;loc&gt; Value to use for @(a)WebService.wsdlLocation + * -o, --output=&lt;directory&gt; The directory to put generated artifacts + * -s, --source=&lt;directory&gt; The directory to put Java source + * -t, --target=&lt;2.0|2.1&gt; The target specification target + * -q, --quiet Be somewhat more quiet + * -v, --verbose Show full exception stack traces + * -l, --load-consumer Load the consumer and exit (debug utility) + * </pre> + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @version $Revision$ + */ +public class WSConsume +{ + private List<File> bindingFiles = new ArrayList<File>(); + private boolean generateSource = false; + private File catalog = null; + private String targetPackage = null; + private String wsdlLocation = null; + private boolean quiet = false; + private boolean verbose = false; + private boolean loadConsumer = false; + private File outputDir = new File("output"); + private File sourceDir = null; + private String target = null; + + public static String PROGRAM_NAME = System.getProperty("program.name", WSConsume.class.getName()); + + public static void main(String[] args) + { + WSConsume importer = new WSConsume(); + URL wsdl = importer.parseArguments(args); + System.exit(importer.importServices(wsdl)); + } + + private URL parseArguments(String[] args) + { + String shortOpts = "b:c:p:w:o:s:t:khqvl"; + LongOpt[] longOpts = + { + new LongOpt("binding", LongOpt.REQUIRED_ARGUMENT, null, 'b'), + new LongOpt("catalog", LongOpt.REQUIRED_ARGUMENT, null, 'c'), + new LongOpt("package", LongOpt.REQUIRED_ARGUMENT, null, 'p'), + new LongOpt("wsdlLocation", LongOpt.REQUIRED_ARGUMENT, null, 'w'), + new LongOpt("output", LongOpt.REQUIRED_ARGUMENT, null, 'o'), + new LongOpt("source", LongOpt.REQUIRED_ARGUMENT, null, 's'), + new LongOpt("target", LongOpt.REQUIRED_ARGUMENT, null, 't'), + new LongOpt("keep", LongOpt.NO_ARGUMENT, null, 'k'), + new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'), + new LongOpt("quiet", LongOpt.NO_ARGUMENT, null, 'q'), + new LongOpt("verbose", LongOpt.NO_ARGUMENT, null, 'v'), + new LongOpt("load-consumer", LongOpt.NO_ARGUMENT, null, 'l'), + }; + + Getopt getopt = new Getopt(PROGRAM_NAME, args, shortOpts, longOpts); + int c; + while ((c = getopt.getopt()) != -1) + { + switch (c) + { + case 'b': + bindingFiles.add(new File(getopt.getOptarg())); + break; + case 'k': + generateSource = true; + break; + case 'c': + catalog = new File(getopt.getOptarg()); + break; + case 'p': + targetPackage = getopt.getOptarg(); + break; + case 'w': + wsdlLocation = getopt.getOptarg(); + break; + case 'o': + outputDir = new File(getopt.getOptarg()); + break; + case 's': + sourceDir = new File(getopt.getOptarg()); + break; + case 't': + target = getopt.getOptarg(); + break; + case 'q': + quiet = true; + break; + case 'v': + verbose = true; + break; + case 'l': + loadConsumer = true; + break; + case 'h': + printHelp(); + System.exit(0); + case '?': + System.exit(1); + } + } + + // debug output + if(loadConsumer) + { + WSContractConsumer importer = WSContractConsumer.newInstance(); + System.out.println("WSContractConsumer instance: " + importer.getClass().getCanonicalName()); + System.exit(0); + } + + int wsdlPos = getopt.getOptind(); + if (wsdlPos >= args.length) + { + System.err.println("Error: WSDL URL was not specified!"); + printHelp(); + System.exit(1); + } + + URL url = null; + try + { + try + { + url = new URL(args[wsdlPos]); + } + catch (MalformedURLException e) + { + File file = new File(args[wsdlPos]); + url = file.toURL(); + } + } + catch (MalformedURLException e) + { + System.err.println("Error: Invalid URI: " + args[wsdlPos]); + System.exit(1); + } + + return url; + } + + + private int importServices(URL wsdl) + { + WSContractConsumer importer = WSContractConsumer.newInstance(); + + importer.setGenerateSource(generateSource); + importer.setOutputDirectory(outputDir); + if (sourceDir != null) + importer.setSourceDirectory(sourceDir); + + if (! quiet) + importer.setMessageStream(System.out); + + if (catalog != null) + importer.setCatalog(catalog); + + if (targetPackage != null) + importer.setTargetPackage(targetPackage); + + if (wsdlLocation != null) + importer.setWsdlLocation(wsdlLocation); + + if (bindingFiles != null && bindingFiles.size() > 0) + importer.setBindingFiles(bindingFiles); + + if(target!=null) + importer.setTarget(target); + + try + { + importer.consume(wsdl); + return 0; + } + catch (Throwable t) + { + System.err.println("Error: Could not import. (use --verbose to see full traces)"); + if (!verbose) + { + String message = t.getMessage(); + if (message == null) + message = t.getClass().getSimpleName(); + System.err.println("Error: " + message); + } + else + { + t.printStackTrace(System.err); + } + + } + + return 1; + } + + private static void printHelp() + { + PrintStream out = System.out; + out.println("WSConsumeTask is a cmd line tool that generates portable JAX-WS artifacts from a WSDL file.\n"); + out.println("usage: " + PROGRAM_NAME + " [options] <wsdl-url>\n"); + out.println("options: "); + out.println(" -h, --help Show this help message"); + out.println(" -b, --binding=<file> One or more JAX-WS or JAXB binding files "); + out.println(" -k, --keep Keep/Generate Java source"); + out.println(" -c --catalog=<file> Oasis XML Catalog file for entity resolution"); + out.println(" -p --package=<name> The target package for generated source"); + out.println(" -w --wsdlLocation=<loc> Value to use for @WebService.wsdlLocation"); + out.println(" -o, --output=<directory> The directory to put generated artifacts"); + out.println(" -s, --source=<directory> The directory to put Java source"); + out.println(" -t, --target=<2.0|2.1> The JAX-WS specification target"); + out.println(" -q, --quiet Be somewhat more quiet"); + out.println(" -v, --verbose Show full exception stack traces"); + out.println(" -l, --load-consumer Load the consumer and exit (debug utility)"); + out.flush(); + } +} Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -0,0 +1,239 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.tools.cmd; + +import gnu.getopt.Getopt; +import gnu.getopt.LongOpt; +import org.jboss.wsf.spi.tools.WSContractProvider; +import org.jboss.wsf.framework.utils.JavaUtils; + +import java.io.File; +import java.io.PrintStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.List; + +/** + * WSProvideTask is a cmd line tool that generates portable JAX-WS artifacts + * for a service endpoint implementation. + * + * <pre> + * usage: WSProvideTask [options] &lt;endpoint class name&gt; + * options: + * -h, --help Show this help message + * -k, --keep Keep/Generate Java source + * -w, --wsdl Enable WSDL file generation + * -c, --classpath=&lt;path&lt; The classpath that contains the endpoint + * -o, --output=&lt;directory&gt; The directory to put generated artifacts + * -r, --resource=&lt;directory&gt; The directory to put resource artifacts + * -s, --source=&lt;directory&gt; The directory to put Java source + * -q, --quiet Be somewhat more quiet + * -t, --show-traces Show full exception stack traces + * -l, --load-provider Load the provider and exit (debug utility) + * </pre> + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @version $Revision$ + */ +public class WSProvide +{ + private boolean generateSource = false; + private boolean generateWsdl = false; + private boolean quiet = false; + private boolean showTraces = false; + private boolean loadProvider = false; + private ClassLoader loader = Thread.currentThread().getContextClassLoader(); + private File outputDir = new File("output"); + private File resourceDir = null; + private File sourceDir = null; + + public static String PROGRAM_NAME = System.getProperty("program.name", WSProvide.class.getSimpleName()); + + public static void main(String[] args) + { + WSProvide generate = new WSProvide(); + String endpoint = generate.parseArguments(args); + System.exit(generate.generate(endpoint)); + } + + private String parseArguments(String[] args) + { + String shortOpts = "hwko:r:s:c:qtl"; + LongOpt[] longOpts = + { + new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'), + new LongOpt("wsdl", LongOpt.NO_ARGUMENT, null, 'w'), + new LongOpt("keep", LongOpt.NO_ARGUMENT, null, 'k'), + new LongOpt("output", LongOpt.REQUIRED_ARGUMENT, null, 'o'), + new LongOpt("resource", LongOpt.REQUIRED_ARGUMENT, null, 'r'), + new LongOpt("source", LongOpt.REQUIRED_ARGUMENT, null, 's'), + new LongOpt("classpath", LongOpt.REQUIRED_ARGUMENT, null, 'c'), + new LongOpt("quiet", LongOpt.NO_ARGUMENT, null, 'q'), + new LongOpt("show-traces", LongOpt.NO_ARGUMENT, null, 't'), + new LongOpt("load-provider", LongOpt.NO_ARGUMENT, null, 'l'), + }; + + Getopt getopt = new Getopt(PROGRAM_NAME, args, shortOpts, longOpts); + int c; + while ((c = getopt.getopt()) != -1) + { + switch (c) + { + case 'k': + generateSource = true; + break; + case 's': + sourceDir = new File(getopt.getOptarg()); + break; + case 'r': + resourceDir = new File(getopt.getOptarg()); + break; + case 'w': + generateWsdl = true; + break; + case 't': + showTraces = true; + break; + case 'o': + outputDir = new File(getopt.getOptarg()); + break; + case 'q': + quiet = true; + break; + case 'c': + processClassPath(getopt.getOptarg()); + break; + case 'l': + loadProvider = true; + break; + case 'h': + printHelp(); + System.exit(0); + case '?': + System.exit(1); + } + } + + // debug output + if(loadProvider) + { + WSContractProvider gen = WSContractProvider.newInstance(loader); + System.out.println("WSContractProvider instance: " + gen.getClass().getCanonicalName()); + System.exit(0); + } + + int endpointPos = getopt.getOptind(); + if (endpointPos >= args.length) + { + System.err.println("Error: endpoint implementation was not specified!"); + printHelp(); + System.exit(1); + } + + return args[endpointPos]; + } + + + private int generate(String endpoint) + { + if (!JavaUtils.isLoaded(endpoint, loader)) + { + System.err.println("Error: Could not load class [" + endpoint + "]. Did you specify a valid --classpath?"); + return 1; + } + + WSContractProvider gen = WSContractProvider.newInstance(loader); + gen.setGenerateWsdl(generateWsdl); + gen.setGenerateSource(generateSource); + gen.setOutputDirectory(outputDir); + if (resourceDir != null) + gen.setResourceDirectory(resourceDir); + if (sourceDir != null) + gen.setSourceDirectory(sourceDir); + + if (! quiet) + gen.setMessageStream(System.out); + + try + { + gen.provide(endpoint); + return 0; + } + catch (Throwable t) + { + System.err.println("Error: Could not generate. (use --show-traces to see full traces)"); + if (!showTraces) + { + String message = t.getMessage(); + if (message == null) + message = t.getClass().getSimpleName(); + System.err.println("Error: " + message); + } + else + { + t.printStackTrace(System.err); + } + + } + + return 1; + } + + private void processClassPath(String classPath) + { + String[] entries = classPath.split(File.pathSeparator); + List<URL> urls= new ArrayList<URL>(entries.length); + for (String entry : entries) + { + try + { + urls.add(new File(entry).toURL()); + } + catch (MalformedURLException e) + { + System.err.println("Error: a classpath entry was malformed: " + entry); + } + } + loader = new URLClassLoader(urls.toArray(new URL[0]), loader); + } + + private static void printHelp() + { + PrintStream out = System.out; + out.println("WSProvideTask generates portable JAX-WS artifacts for an endpoint implementation.\n"); + out.println("usage: " + PROGRAM_NAME + " [options] <endpoint class name>\n"); + out.println("options: "); + out.println(" -h, --help Show this help message"); + out.println(" -k, --keep Keep/Generate Java source"); + out.println(" -w, --wsdl Enable WSDL file generation"); + out.println(" -c, --classpath=<path> The classpath that contains the endpoint"); + out.println(" -o, --output=<directory> The directory to put generated artifacts"); + out.println(" -r, --resource=<directory> The directory to put resource artifacts"); + out.println(" -s, --source=<directory> The directory to put Java source"); + out.println(" -q, --quiet Be somewhat more quiet"); + out.println(" -t, --show-traces Show full exception stack traces"); + out.println(" -l, --load-provider Load the provider and exit (debug utility)"); + out.flush(); + } +} Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/package.html =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/package.html (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/package.html 2007-07-18 11:21:21 UTC (rev 3923) @@ -0,0 +1,55 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +</head> +<body bgcolor="white"> + +A stack indepedent SPI that's provides entry points to command line tools and ANT +tasks that generate JAX-WS artefacts from WSDL or wrapper beans and WSDL from existing sources. + +<h3>Service provider responsibilities</h3> + +A service provider needs to implement both the factory and the actual <code>WSContractConsumer</code> +or <code>WSContractProvider</code>. +The ANT tasks and the command line tools offer static client interfaces and rely on a standard WSF service factory +mechanism that allows pluggability of different implementations: + +<ul> + <li>See org.jboss.ws.integration.FactoryLoader</li> +</ul> + +<h3>ANT tasks</h3> +<ul> + <li>{@link org.jboss.wsf.spi.tools.ant.WSConsumeTask}</li> + <li>{@link org.jboss.wsf.spi.tools.ant.WSProvideTask}</li> +</ul> + +<h3>Command line interfaces and shell scripts</h3> + +The shell scripts are installed with the JBossAS installation +and can be found in the JBOSS_HOME/bin directory. +<p/> + +They delegate to the following command line implementations: +<ul> + <li>{@link org.jboss.wsf.spi.tools.cmd.WSConsume}</li> + <li>{@link org.jboss.wsf.spi.tools.cmd.WSProvide}</li> +</ul> + + +<h2>Related Documentation</h2> + +<ul> + <li>{@link org.jboss.ws.integration.FactoryLoader} +</ul> + +For overviews, tutorials, examples, guides, and tool documentation, please see: +<ul> + <li><a href="http://labs.jboss.com/jbossws/">JBossWS Userguide</a> +</ul> +<br> + +@since JBossWS 2.1 + +</body> +</html> Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTest.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.wsf.spi.test; +package org.jboss.wsf.test; import java.util.ArrayList; import java.util.Arrays; @@ -34,7 +34,7 @@ import junit.framework.TestCase; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.wsf.spi.test; +package org.jboss.wsf.test; import java.io.File; import java.net.MalformedURLException; @@ -34,7 +34,7 @@ import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; /** * A JBossWS test helper that deals with test deployment/undeployment, etc. Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.wsf.spi.test; +package org.jboss.wsf.test; import java.net.URL; import java.net.URLClassLoader; Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployer.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployer.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployer.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.wsf.spi.test; +package org.jboss.wsf.test; import java.net.URL; Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.wsf.spi.test; +package org.jboss.wsf.test; import java.io.IOException; import java.io.Serializable; Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/XOPTestSupport.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/XOPTestSupport.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/XOPTestSupport.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.wsf.spi.test; +package org.jboss.wsf.test; // $Id$ Modified: branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/DDEndpoints.java =================================================================== --- branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/DDEndpoints.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/DDEndpoints.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -31,7 +31,7 @@ import java.util.List; import org.jboss.wsf.spi.deployment.WSFDeploymentException; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.IOUtils; //$Id$ Modified: branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerFactoryImpl.java =================================================================== --- branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerFactoryImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerFactoryImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -21,8 +21,8 @@ */ package org.jboss.wsf.stack.sunri.tools; -import org.jboss.wsf.tools.WSContractConsumerFactory; -import org.jboss.wsf.tools.WSContractConsumer; +import org.jboss.wsf.spi.tools.WSContractConsumerFactory; +import org.jboss.wsf.spi.tools.WSContractConsumer; /** * Creates a WSContractConsumer that delegates to the Sun RI. Modified: branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerImpl.java =================================================================== --- branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -21,7 +21,7 @@ */ package org.jboss.wsf.stack.sunri.tools; -import org.jboss.wsf.tools.WSContractConsumer; +import org.jboss.wsf.spi.tools.WSContractConsumer; import java.io.File; import java.io.PrintStream; Modified: branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderFactoryImpl.java =================================================================== --- branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderFactoryImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderFactoryImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -21,8 +21,8 @@ */ package org.jboss.wsf.stack.sunri.tools; -import org.jboss.wsf.tools.WSContractProviderFactory; -import org.jboss.wsf.tools.WSContractProvider; +import org.jboss.wsf.spi.tools.WSContractProviderFactory; +import org.jboss.wsf.spi.tools.WSContractProvider; /** * @author Heiko.Braun(a)jboss.com Modified: branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderImpl.java =================================================================== --- branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -21,7 +21,7 @@ */ package org.jboss.wsf.stack.sunri.tools; -import org.jboss.wsf.tools.WSContractProvider; +import org.jboss.wsf.spi.tools.WSContractProvider; import java.io.File; import java.io.PrintStream; Modified: branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java =================================================================== --- branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -45,7 +45,7 @@ import org.jboss.wsf.spi.invocation.RequestHandler; import org.jboss.wsf.spi.management.EndpointRegistry; import org.jboss.wsf.spi.management.EndpointRegistryFactory; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; import org.springframework.context.ApplicationContext; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.GenericWebApplicationContext; Modified: branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java =================================================================== --- branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -33,7 +33,7 @@ import java.util.List; import org.jboss.wsf.spi.deployment.WSFDeploymentException; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.IOUtils; //$Id$ Modified: branches/hbraun/trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- branches/hbraun/trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-07-18 11:21:21 UTC (rev 3923) @@ -72,7 +72,7 @@ <target name="wsconsume" depends="tests-init" description="Consume JAX-WS contracts"> <!-- Define the JAX-WS wsconsume task --> - <taskdef name="wsconsume" classname="org.jboss.wsf.tools.ant.WSConsumeTask"> + <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> <classpath refid="ws.stack.classpath"/> <classpath location="${spi.dir}/output/lib/jbossws-spi.jar"/> @@ -177,7 +177,7 @@ <target name="wsprovide" depends="tests-compile" description="Provide the JAX-WS contracts."> <!-- Define the JAX-WS wsprovide task --> - <taskdef name="wsprovide" classname="org.jboss.wsf.tools.ant.WSProvideTask"> + <taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask"> <classpath refid="ws.stack.classpath"/> <classpath refid="thirdparty.classpath"/> <classpath location="${core.dir}/thirdparty/concurrent.jar"/> Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -76,8 +76,8 @@ import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.metadata.umdm.TypesMetaData; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.JavaUtils; import org.jboss.xb.binding.NamespaceRegistry; import org.w3c.dom.Element; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/EndpointInvocation.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/EndpointInvocation.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/EndpointInvocation.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -46,7 +46,7 @@ import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.metadata.umdm.WrappedParameter; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; import org.w3c.dom.Element; /** A web service invocation. Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/MessageTrace.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/MessageTrace.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/MessageTrace.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -30,7 +30,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.soap.SOAPElementImpl; import org.jboss.ws.core.soap.SOAPElementWriter; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -32,7 +32,7 @@ import javax.xml.transform.stream.StreamResult; import org.jboss.ws.WSException; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.IOUtils; /** * @author Heiko.Braun(a)jboss.org Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -38,7 +38,7 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.soap.SOAPContentElement; import org.jboss.ws.core.utils.XMLPredefinedEntityReferenceResolver; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Node; /** The base class for all Deserializers. Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -54,7 +54,7 @@ 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.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; /** * This is the representation of a type mapping. Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -53,7 +53,7 @@ import org.jboss.ws.metadata.umdm.TypeMappingMetaData; import org.jboss.ws.metadata.umdm.TypesMetaData; import org.jboss.ws.metadata.umdm.WrappedParameter; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; /** A helper class to wrap/unwrap ducument style request/response structures. * Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SerializationContextJAXRPC.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SerializationContextJAXRPC.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SerializationContextJAXRPC.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -38,7 +38,7 @@ import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.TypesMetaData; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; /** * The serialization context for JAXRPC endpoints/clients Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -35,7 +35,7 @@ import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.extensions.xop.jaxrpc.XOPUnmarshallerImpl; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.jboss.xb.binding.SimpleTypeBindings; import org.jboss.xb.binding.sunday.xop.XOPUnmarshaller; import org.w3c.dom.Element; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -33,7 +33,7 @@ import org.jboss.ws.core.binding.SerializerSupport; import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.extensions.xop.jaxrpc.XOPMarshallerImpl; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; import org.jboss.xb.binding.NamespaceRegistry; import org.jboss.xb.binding.SimpleTypeBindings; import org.jboss.xb.binding.sunday.xop.XOPMarshaller; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -34,7 +34,7 @@ import javax.xml.transform.stream.StreamSource; import org.jboss.ws.WSException; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.IOUtils; /** * A StreamSource that can be read repeatedly. Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializer.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializer.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializer.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -30,7 +30,7 @@ import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.DeserializerSupport; import org.jboss.ws.core.binding.SerializationContext; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -31,7 +31,7 @@ import org.jboss.ws.core.binding.BufferedStreamResult; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.binding.SerializerSupport; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -31,7 +31,7 @@ import org.jboss.ws.core.binding.BufferedStreamResult; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.binding.SerializerSupport; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; import org.jboss.xb.binding.NamespaceRegistry; import org.jboss.xb.binding.SimpleTypeBindings; import org.w3c.dom.NamedNodeMap; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializer.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializer.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializer.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -32,7 +32,7 @@ import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.DeserializerSupport; import org.jboss.ws.core.binding.SerializationContext; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.jboss.xb.binding.NamespaceRegistry; import org.jboss.xb.binding.SimpleTypeBindings; import org.w3c.dom.Element; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -41,8 +41,8 @@ import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.binding.TypeMappingImpl; import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.JavaUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -39,7 +39,7 @@ import org.jboss.ws.core.soap.SOAPContentElement; import org.jboss.ws.core.soap.XMLFragment; import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; import org.w3c.dom.NamedNodeMap; /** Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializer.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializer.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializer.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -32,7 +32,7 @@ import org.jboss.ws.core.binding.DeserializerSupport; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.soap.SOAPFactoryImpl; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializer.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializer.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializer.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -32,7 +32,7 @@ import org.jboss.ws.core.binding.BufferedStreamResult; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.binding.SerializerSupport; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.NamedNodeMap; /** Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBMarshallerImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBMarshallerImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBMarshallerImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -37,7 +37,7 @@ import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping; import org.jboss.ws.metadata.jaxrpcmapping.VariableMapping; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; import org.jboss.xb.binding.Constants; import org.jboss.xb.binding.sunday.marshalling.MarshallerImpl; import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -69,7 +69,7 @@ import org.jboss.ws.metadata.umdm.TypesMetaData; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; /** Provides support for the dynamic invocation of a service endpoint. * The javax.xml.rpc.Service interface acts as a factory for the creation of Call instances. Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/PortProxy.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/PortProxy.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/PortProxy.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -43,7 +43,7 @@ import org.jboss.ws.core.StubExt; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; /** * The dynamic proxy that delegates to the underlying Call implementation Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -47,7 +47,7 @@ import org.jboss.ws.metadata.umdm.TypeMappingMetaData; import org.jboss.ws.metadata.umdm.TypesMetaData; import org.jboss.ws.metadata.umdm.WrappedParameter; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; public class DynamicWrapperGenerator extends AbstractWrapperGenerator { Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -22,7 +22,7 @@ package org.jboss.ws.core.jaxws; import org.jboss.ws.WSException; -import org.jboss.wsf.spi.utils.ServiceLoader; +import org.jboss.wsf.framework.utils.ServiceLoader; import javax.xml.bind.JAXBContext; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPMessageMarshaller.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPMessageMarshaller.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPMessageMarshaller.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -29,7 +29,7 @@ import org.jboss.remoting.invocation.OnewayInvocation; import org.jboss.remoting.marshal.Marshaller; import org.jboss.ws.core.HTTPMessageImpl; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -50,7 +50,7 @@ import org.jboss.ws.core.StubExt; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; /** * The dynamic proxy that delegates to the underlying client implementation Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -51,7 +51,7 @@ import org.jboss.ws.core.soap.SOAPContentElement; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.core.soap.XMLFragment; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; /** * A helper that Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -41,7 +41,7 @@ import org.jboss.ws.core.jaxws.SOAPFaultHelperJAXWS; import org.jboss.ws.core.soap.SOAPEnvelopeImpl; import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; /** * Executes a list of JAXWS handlers. Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -46,8 +46,8 @@ import org.jboss.ws.core.soap.SOAPContentElement; import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.XMLFragment; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.ServiceLoader; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.ServiceLoader; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/HttpServer.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/HttpServer.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/HttpServer.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -28,7 +28,7 @@ import javax.xml.ws.Endpoint; -import org.jboss.wsf.spi.utils.ServiceLoader; +import org.jboss.wsf.framework.utils.ServiceLoader; /** * An abstract HTTP Server Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -72,7 +72,7 @@ import org.jboss.wsf.framework.invocation.WebServiceContextDummy; import org.jboss.wsf.framework.invocation.WebServiceContextJSE; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; /** An implementation handles invocations on the endpoint * Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -31,7 +31,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.wsf.spi.management.ServerConfig; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/DetailImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/DetailImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/DetailImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -34,7 +34,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Node; import org.w3c.dom.NodeList; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -42,7 +42,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.core.CommonSOAPFaultException; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Comment; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/HRefInlineHandler.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/HRefInlineHandler.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/HRefInlineHandler.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -32,8 +32,8 @@ import javax.xml.soap.Text; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -45,8 +45,8 @@ import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.soap.attachment.MimeConstants; import org.jboss.ws.core.soap.attachment.MultipartRelatedDecoder; -import org.jboss.wsf.spi.utils.ServiceLoader; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.ServiceLoader; +import org.jboss.wsf.framework.utils.IOUtils; /** * MessageFactory implementation Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -31,8 +31,8 @@ import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; import org.jboss.ws.WSException; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.DocumentFragment; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -36,7 +36,7 @@ import org.jboss.ws.core.binding.SerializerSupport; import org.jboss.ws.core.binding.TypeMappingImpl; import org.jboss.ws.core.jaxrpc.binding.NullValueSerializer; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; /** * Represents the OBJECT_VALID state of an {@link SOAPContentElement}.<br> Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementMessage.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementMessage.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementMessage.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -27,7 +27,7 @@ import javax.xml.rpc.JAXRPCException; import javax.xml.soap.SOAPBodyElement; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; /** * An abstract implemenation of the SOAPBodyElement Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -37,7 +37,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Comment; import org.w3c.dom.DOMException; import org.w3c.dom.Document; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -40,7 +40,7 @@ import org.jboss.ws.core.soap.SOAPContent.State; import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Attr; import org.w3c.dom.DOMException; import org.w3c.dom.NamedNodeMap; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPDocument.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPDocument.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPDocument.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -21,7 +21,7 @@ */ package org.jboss.ws.core.soap; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Attr; import org.w3c.dom.CDATASection; import org.w3c.dom.Comment; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -41,7 +41,7 @@ import org.jboss.util.NotImplementedException; import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Attr; import org.w3c.dom.DOMException; import org.w3c.dom.Document; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementWriter.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementWriter.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementWriter.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -34,8 +34,8 @@ import javax.xml.soap.SOAPEnvelope; import org.jboss.ws.WSException; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; /** * Writes a SAAJ elements to an output stream. Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -33,7 +33,7 @@ import javax.xml.soap.SOAPFault; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -41,7 +41,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.core.utils.SAAJUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; import org.jboss.xb.QNameBuilder; import org.w3c.dom.Attr; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPHeaderElementImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPHeaderElementImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPHeaderElementImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -37,7 +37,7 @@ import javax.xml.soap.SOAPHeaderElement; import org.jboss.ws.Constants; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Attr; /** Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -42,7 +42,7 @@ import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; -import org.jboss.wsf.spi.utils.ServiceLoader; +import org.jboss.wsf.framework.utils.ServiceLoader; import org.w3c.dom.Attr; import org.w3c.dom.CDATASection; import org.w3c.dom.Comment; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLContent.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -52,8 +52,8 @@ import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.JavaUtils; import org.w3c.dom.Comment; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -43,8 +43,8 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.binding.BufferedStreamResult; import org.jboss.ws.core.jaxrpc.binding.BufferedStreamSource; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/AttachmentPartImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/AttachmentPartImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/AttachmentPartImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -22,7 +22,7 @@ package org.jboss.ws.core.soap.attachment; import org.jboss.util.Base64; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.IOUtils; import org.jboss.ws.WSException; import javax.activation.DataHandler; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/ByteArrayContentHandler.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/ByteArrayContentHandler.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/ByteArrayContentHandler.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -33,7 +33,7 @@ import javax.activation.DataSource; import org.jboss.ws.core.utils.MimeUtils; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.IOUtils; /** * @author Heiko Braun <heiko.braun(a)jboss.com&gt; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/SwapableMemoryDataSource.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/SwapableMemoryDataSource.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/SwapableMemoryDataSource.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -33,7 +33,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.IOUtils; /** * A datasource which offloads large attachments to disk. Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/XmlDataContentHandler.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/XmlDataContentHandler.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/XmlDataContentHandler.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -33,7 +33,7 @@ import javax.activation.DataSource; import javax.xml.transform.stream.StreamSource; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.IOUtils; /** * <code>XmlDataContentHandler</code> is a JAF content handler that provides Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -86,7 +86,7 @@ import javax.xml.rpc.holders.StringHolder; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; /** * HolderUtils provides static utility functions for both JAX-RPC Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/MimeUtils.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/MimeUtils.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/MimeUtils.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -43,8 +43,8 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.wsf.spi.utils.IOUtils; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.framework.utils.JavaUtils; import com.sun.image.codec.jpeg.JPEGCodec; import com.sun.image.codec.jpeg.JPEGImageDecoder; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/EndpointReferenceImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/EndpointReferenceImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/EndpointReferenceImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -41,8 +41,8 @@ import org.jboss.ws.WSException; import org.jboss.ws.extensions.addressing.soap.SOAPAddressingBuilderImpl; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -28,7 +28,7 @@ import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl; import org.jboss.ws.extensions.addressing.EndpointReferenceImpl; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.jboss.xb.binding.NamespaceRegistry; import org.w3c.dom.Attr; import org.w3c.dom.Element; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractSubscriptionManagerEndpoint.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractSubscriptionManagerEndpoint.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractSubscriptionManagerEndpoint.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -44,7 +44,7 @@ import org.jboss.ws.extensions.eventing.EventingConstants; import org.jboss.ws.extensions.eventing.common.EventingEndpointBase; import org.jboss.ws.extensions.eventing.mgmt.SubscriptionError; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/NotificationFailure.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/NotificationFailure.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/NotificationFailure.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -25,7 +25,7 @@ import java.net.URISyntaxException; import org.jboss.ws.WSException; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/Subscription.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/Subscription.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/Subscription.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -41,7 +41,7 @@ import org.jboss.ws.extensions.eventing.EventingConstants; import org.jboss.ws.extensions.eventing.jaxws.AttributedURIType; import org.jboss.ws.extensions.eventing.jaxws.EndpointReferenceType; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -60,8 +60,8 @@ import org.jboss.ws.extensions.eventing.jaxws.AttributedURIType; import org.jboss.ws.extensions.eventing.jaxws.EndpointReferenceType; import org.jboss.ws.extensions.eventing.jaxws.ReferenceParametersType; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; import org.xml.sax.InputSource; import org.xml.sax.SAXException; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -31,7 +31,7 @@ import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDeployment; import org.jboss.ws.extensions.eventing.jaxws.EndpointReferenceType; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/Policy.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/Policy.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/Policy.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -29,8 +29,8 @@ import java.util.Iterator; import org.jboss.ws.WSException; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.jboss.xb.binding.NamespaceRegistry; import org.w3c.dom.Element; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyAlternative.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyAlternative.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyAlternative.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -29,8 +29,8 @@ import java.util.Iterator; import org.jboss.ws.WSException; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyAssertion.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyAssertion.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyAssertion.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -23,8 +23,8 @@ //$Id$ -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyFactory.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyFactory.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyFactory.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -29,7 +29,7 @@ import javax.xml.namespace.QName; import org.jboss.ws.WSException; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -51,7 +51,7 @@ import org.jboss.ws.metadata.wsse.Sign; import org.jboss.ws.metadata.wsse.Timestamp; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; public class WSSecurityDispatcher Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -46,8 +46,8 @@ import org.jboss.ws.core.soap.attachment.MimeConstants; import org.jboss.ws.core.utils.MimeUtils; import org.jboss.ws.extensions.xop.jaxrpc.XOPMarshallerImpl; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.JavaUtils; import org.jboss.xb.binding.SimpleTypeBindings; import org.jboss.xb.binding.sunday.xop.XOPMarshaller; import org.jboss.xb.binding.sunday.xop.XOPObject; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxrpc/JBossXBContentAdapter.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxrpc/JBossXBContentAdapter.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxrpc/JBossXBContentAdapter.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -37,7 +37,7 @@ import org.jboss.ws.core.soap.attachment.SwapableMemoryDataSource; import org.jboss.ws.core.utils.MimeUtils; import org.jboss.ws.extensions.xop.XOPContext; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.IOUtils; import org.jboss.xb.binding.sunday.marshalling.MarshallingContext; import org.jboss.xb.binding.sunday.marshalling.TermBeforeMarshallingCallback; import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -21,7 +21,7 @@ */ package org.jboss.ws.extensions.xop.jaxws; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; import javax.activation.DataHandler; import javax.xml.bind.annotation.XmlAttachmentRef; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -76,7 +76,7 @@ import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; /** An abstract meta data builder. * Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -83,7 +83,7 @@ import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.WSDLRPCSignatureItem.Direction; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; /** * A meta data builder that is based on webservices.xml. Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -88,7 +88,7 @@ import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -49,7 +49,7 @@ import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; /** * A server side meta data builder that is based on JSR-181 annotations Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -29,7 +29,7 @@ import org.jboss.ws.annotation.EndpointConfig; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.wsf.framework.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -67,7 +67,7 @@ import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.IOUtils; /** * An abstract annotation meta data builder. Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -34,7 +34,7 @@ import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS; import org.jboss.ws.integration.ResourceLoaderAdapter; import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -44,7 +44,7 @@ import org.jboss.ws.metadata.config.*; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; import org.jboss.wsf.spi.binding.BindingCustomization; import javax.jws.soap.SOAPBinding.ParameterStyle; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -42,7 +42,7 @@ import org.jboss.ws.metadata.acessor.ReflectiveFieldAccessor; import org.jboss.ws.metadata.acessor.ReflectiveMethodAccessor; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; /** * A Fault component describes a fault that a given operation supports. Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -39,7 +39,7 @@ import org.jboss.ws.core.soap.Use; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.ws.integration.ResourceLoaderAdapter; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -44,7 +44,7 @@ import org.jboss.ws.metadata.acessor.ReflectiveMethodAccessor; import org.jboss.ws.metadata.config.EndpointFeature; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; /** * A request/response parameter that a given operation supports. Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -23,7 +23,7 @@ import javax.xml.namespace.QName; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; /** * WrappedParameter represents a document/literal wrapped parameter. Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -72,7 +72,7 @@ import org.jboss.ws.core.jaxrpc.ParameterWrapping; import org.jboss.ws.core.utils.HolderUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; import org.jboss.xb.binding.Util; /** Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -57,8 +57,8 @@ import org.jboss.util.NotImplementedException; import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.jboss.xb.binding.NamespaceRegistry; import org.w3c.dom.Element; import org.w3c.dom.Node; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -48,7 +48,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; import org.jboss.xb.binding.NamespaceRegistry; /** Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -41,8 +41,8 @@ import org.jboss.ws.tools.Configuration.OperationConfig; import org.jboss.ws.tools.metadata.ToolsUnifiedMetaDataBuilder; import org.jboss.ws.tools.wsdl.WSDLWriter; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/ToolsUtils.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/ToolsUtils.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/ToolsUtils.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -46,7 +46,7 @@ import org.jboss.ws.core.jaxrpc.binding.SimpleSerializerFactory; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; /** * Util class for the JBossWS Tools project Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -61,7 +61,7 @@ import org.jboss.ws.tools.helpers.ReturnTypeUnwrapper; import org.jboss.ws.tools.interfaces.WSDLToJavaIntf; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WebservicesXMLCreatorImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WebservicesXMLCreatorImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WebservicesXMLCreatorImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -36,8 +36,8 @@ import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -52,7 +52,7 @@ import org.jboss.ws.core.jaxrpc.LiteralTypeMapping; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; /** Class that converts a XSD Type into Java class * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -34,7 +34,7 @@ import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.interfaces.ServiceCreatorIntf; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; /** * Creates the Service Interface<br> Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -69,7 +69,7 @@ import org.jboss.ws.tools.interfaces.JavaToXSDIntf; import org.jboss.ws.tools.interfaces.SchemaCreatorIntf; import org.jboss.ws.tools.wsdl.WSDLGenerator; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; /** * Java To WSDL Helper which uses UnifiedMetaData Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -80,7 +80,7 @@ import org.jboss.ws.tools.ToolsUtils; import org.jboss.ws.tools.WSToolsConstants; import org.jboss.ws.tools.mapping.MappingFileGenerator; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ReformatXML.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ReformatXML.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ReformatXML.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -25,8 +25,8 @@ import java.io.FileNotFoundException; import java.io.InputStream; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -64,10 +64,10 @@ import org.jboss.ws.tools.interfaces.WebservicesXMLCreator; import org.jboss.ws.tools.mapping.MappingFileGenerator; import org.jboss.ws.tools.wsdl.WSDLWriter; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; -import org.jboss.wsf.spi.utils.IOUtils; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.framework.utils.JavaUtils; /** * Helper class used by the cmd line tool "jbossws" Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderFactoryImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderFactoryImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderFactoryImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -21,8 +21,8 @@ */ package org.jboss.ws.tools.jaxws.impl; -import org.jboss.wsf.tools.WSContractProvider; -import org.jboss.wsf.tools.WSContractProviderFactory; +import org.jboss.wsf.spi.tools.WSContractProvider; +import org.jboss.wsf.spi.tools.WSContractProviderFactory; /** * Creates a JBossWS WSContractProvider implementation. Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -28,7 +28,7 @@ import org.jboss.wsf.framework.deployment.BasicDeployment; import static org.jboss.wsf.spi.deployment.Deployment.DeploymentType.JAXWS_JSE; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.tools.WSContractProvider; +import org.jboss.wsf.spi.tools.WSContractProvider; import java.io.File; import java.io.IOException; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -29,7 +29,7 @@ import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.metadata.umdm.WrappedParameter; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; import javax.xml.bind.annotation.*; import javax.xml.namespace.QName; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerFactoryImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerFactoryImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerFactoryImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -21,8 +21,8 @@ */ package org.jboss.ws.tools.jaxws.impl; -import org.jboss.wsf.tools.WSContractConsumer; -import org.jboss.wsf.tools.WSContractConsumerFactory; +import org.jboss.wsf.spi.tools.WSContractConsumer; +import org.jboss.wsf.spi.tools.WSContractConsumerFactory; /** * Creates a WSContractConsumer that delegates to the Sun RI. Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -22,7 +22,7 @@ package org.jboss.ws.tools.jaxws.impl; import com.sun.tools.ws.wscompile.WsimportTool; -import org.jboss.wsf.tools.WSContractConsumer; +import org.jboss.wsf.spi.tools.WSContractConsumer; import java.io.File; import java.io.PrintStream; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -44,7 +44,7 @@ import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.ToolsUtils; import org.jboss.ws.tools.Configuration.OperationConfig; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; /** * Builds the Tools Endpoint Meta Data using Java Reflection Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -104,8 +104,8 @@ import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; import org.jboss.ws.tools.JavaToXSD; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -56,8 +56,8 @@ import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsdl.WSDLRPCSignatureItem.Direction; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -29,7 +29,7 @@ import org.jboss.ws.core.utils.ResourceURL; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLException; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.xml.sax.EntityResolver; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -64,7 +64,7 @@ import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsdl.WSDLRPCSignatureItem.Direction; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLWriter.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLWriter.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLWriter.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -39,8 +39,8 @@ import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.XSModelTypes; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -50,7 +50,7 @@ import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; /** * Test the SOAPBindingProvider Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayMarshallerTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayMarshallerTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayMarshallerTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -31,7 +31,7 @@ import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants; import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; /** * Test the JAXB marshalling of array types Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -31,7 +31,7 @@ import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants; import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBUnmarshallerImpl; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; /** * Test the JAXB marshalling of array types Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayMarshallerTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayMarshallerTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayMarshallerTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -33,7 +33,7 @@ import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants; import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; /** * Test the JAXB marshalling of array types Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayUnmarshallerTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayUnmarshallerTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayUnmarshallerTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -33,7 +33,7 @@ import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants; import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBUnmarshallerImpl; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; /** * Test the JAXB marshalling of array types Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayMarshallerTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayMarshallerTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayMarshallerTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -30,7 +30,7 @@ import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants; import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; /** * Test the JAXB marshalling of array types Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayUnmarshallerTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayUnmarshallerTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayUnmarshallerTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -30,7 +30,7 @@ import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants; import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBUnmarshallerImpl; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; /** * Test the JAXB marshalling of array types Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -34,7 +34,7 @@ import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; /** * Test the JAXB marshalling of complex types Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -34,7 +34,7 @@ import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; /** * Test the JAXB marshalling of complex types Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -35,7 +35,7 @@ import org.jboss.ws.core.jaxrpc.binding.jbossxb.MarshalException; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.PackageMapping; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; /** * Test the JAXB marshalling of a SimpleUserType Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -31,7 +31,7 @@ import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBUnmarshallerImpl; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.PackageMapping; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; /** * Test the JAXB unmarshalling of a SimpleUserType Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -42,8 +42,8 @@ import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.core.soap.Style; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPEnvelopeTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPEnvelopeTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPEnvelopeTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -33,7 +33,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -39,7 +39,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.core.jaxrpc.SOAPFaultHelperJAXRPC; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; /** * Test the SOAPFault Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -34,7 +34,7 @@ import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.core.soap.NameImpl; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; /** * Test the SOAPHeaderElement Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -36,7 +36,7 @@ import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.core.soap.NameImpl; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; /** * Test the SOAPHeader Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -23,8 +23,8 @@ import junit.framework.TestCase; import org.jboss.ws.core.soap.XMLFragment; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; import javax.xml.transform.dom.DOMSource; Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -35,8 +35,8 @@ import javax.xml.transform.stream.StreamSource; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/JavaUtilsTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/JavaUtilsTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/JavaUtilsTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -23,7 +23,7 @@ import org.jboss.test.ws.tools.jbws_161.custom.HelloObj; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; /** * Test the JavaUtils Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -46,7 +46,7 @@ import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.ws.tools.wsdl.WSDLWriter; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.IOUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLWithAnonTypesTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLWithAnonTypesTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLWithAnonTypesTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -35,7 +35,7 @@ import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/InteropClientConfig.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/InteropClientConfig.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/InteropClientConfig.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -21,7 +21,7 @@ */ package org.jboss.test.ws.interop; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.jboss.test.ws.interop.ClientScenario; import org.w3c.dom.Element; Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/InteropConfigFactory.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/InteropConfigFactory.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/InteropConfigFactory.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -22,7 +22,7 @@ package org.jboss.test.ws.interop; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.jboss.test.ws.interop.ClientScenario; import org.jboss.test.ws.interop.InteropClientConfig; import org.w3c.dom.Element; Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -26,7 +26,7 @@ import org.jboss.ws.extensions.addressing.AddressingClientUtil; import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; import javax.xml.namespace.QName; Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/JavaBean.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/JavaBean.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/JavaBean.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.Calendar; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; public class JavaBean { Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/ValueType.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/ValueType.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/ValueType.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.Calendar; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; public class ValueType { Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -37,7 +37,7 @@ import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; /** * Deploying a war that also contains normal servlets the web.xml is modified as if they are all endpoints Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -26,7 +26,7 @@ import javax.management.ObjectName; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; /** * Auto discover HTTP(S) port configuration from Tomcat Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -30,7 +30,7 @@ import javax.xml.soap.SOAPMessage; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; /** * Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -34,7 +34,7 @@ import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Attr; import org.w3c.dom.NamedNodeMap; Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -35,7 +35,7 @@ import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; /** * ComplexType cannot be constructed from attributes Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -41,8 +41,8 @@ import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/ServerHandler.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/ServerHandler.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/ServerHandler.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -30,7 +30,7 @@ import javax.xml.soap.SOAPMessage; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; public class ServerHandler extends GenericHandler { Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/MessageJavaBean.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/MessageJavaBean.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/MessageJavaBean.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -35,7 +35,7 @@ import javax.xml.soap.SOAPMessage; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Document; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws955/JBWS955TestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws955/JBWS955TestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws955/JBWS955TestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -32,8 +32,8 @@ import javax.xml.soap.SOAPMessage; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -32,7 +32,7 @@ import org.jboss.test.ws.jaxrpc.marshall.types.JavaBean; import org.jboss.test.ws.jaxrpc.marshall.types.JavaBean2; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.JavaUtils; /** * Test standard JAX-RPC types. Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -37,7 +37,7 @@ import org.jboss.ws.metadata.umdm.HandlerMetaData; import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; /** * Test dynamic handlers Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -22,7 +22,7 @@ import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import junit.framework.Test; Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -48,7 +48,7 @@ import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestServiceBean.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestServiceBean.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestServiceBean.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -35,8 +35,8 @@ import javax.xml.transform.dom.DOMSource; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/EmployeeRecordsImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/EmployeeRecordsImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/EmployeeRecordsImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -28,7 +28,7 @@ import javax.activation.DataHandler; import javax.xml.transform.stream.StreamSource; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.IOUtils; /** * EmployeeRecords service endpoint Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -28,7 +28,7 @@ import org.jboss.logging.Logger; import org.jboss.wsf.spi.test.JBossWSTestHelper; import org.jboss.wsf.spi.test.JBossWSTestSetup; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; /** * A test setup that deploys process archives. Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -37,7 +37,7 @@ import org.jboss.ws.extensions.security.SecurityStore; import org.jboss.ws.extensions.security.Util; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -49,7 +49,7 @@ import org.jboss.ws.extensions.security.Util; import org.jboss.ws.extensions.security.WsuIdTarget; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -36,7 +36,7 @@ import org.jboss.ws.extensions.security.SecurityStore; import org.jboss.ws.extensions.security.Util; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -39,7 +39,7 @@ import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; import org.jboss.ws.core.StubExt; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.IOUtils; /** * @author Heiko Braun <heiko.braun(a)jboss.com&gt; Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -40,7 +40,7 @@ import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; import org.jboss.ws.core.StubExt; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.IOUtils; /** * @author Heiko Braun <heiko.braun(a)jboss.com&gt; Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -36,7 +36,7 @@ import org.jboss.ws.core.jaxrpc.client.CallImpl; import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; /** * [JBWS-1178] Multiple virtual host and soap:address problem Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -21,7 +21,7 @@ */ package org.jboss.test.ws.jaxws.jbws1283; -import org.jboss.wsf.framework.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; import javax.jws.WebService; import javax.jws.HandlerChain; Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -26,7 +26,7 @@ import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -import org.jboss.wsf.framework.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; @Stateless Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -6,7 +6,7 @@ import org.jboss.test.ws.jaxws.jbws1566.b.BException; import org.jboss.test.ws.jaxws.jbws1566.a.TestEnumeration; -import org.jboss.wsf.framework.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; import javax.ejb.Stateless; import javax.jws.WebService; Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -36,8 +36,8 @@ import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -30,7 +30,7 @@ import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.IOUtils; /** * [JBWS-1666] Simplify jbosws jar dependencies Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -29,7 +29,7 @@ import javax.jws.soap.SOAPBinding; import org.jboss.annotation.ejb.RemoteBinding; -import org.jboss.wsf.framework.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; @WebService(name = "EJB3Bean", serviceName = "EJB3BeanService", targetNamespace = "http://org.jboss.ws/jbws944") @WebContext(contextRoot = "/jaxws-jbws944", urlPattern = "/FooBean01") Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -12,7 +12,7 @@ import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -import org.jboss.wsf.framework.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; @WebService(targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws981") @SOAPBinding(style = SOAPBinding.Style.RPC) Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointBean.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointBean.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointBean.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -30,7 +30,7 @@ import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMWriter; /** * Test namespace differences at service and portType levels Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -38,7 +38,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.utils.UUIDGenerator; import org.jboss.wsf.framework.jaxws.handler.GenericSOAPHandler; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; /** * A client side handler for the ws-addressing Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -34,8 +34,8 @@ import javax.xml.ws.handler.MessageContext.Scope; import org.jboss.logging.Logger; -import org.jboss.wsf.framework.jaxws.handler.GenericSOAPHandler; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; +import org.jboss.wsf.framework.utils.DOMUtils; /** * A server side handler for the ws-addressing Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -30,7 +30,7 @@ import org.jboss.annotation.security.SecurityDomain; import org.jboss.logging.Logger; -import org.jboss.wsf.framework.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; @WebService(name = "SecureEndpoint", serviceName = "SecureEndpointService", targetNamespace = "http://org.jboss.ws/wsref") @Stateless(name = "SecureEndpoint") Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -25,7 +25,7 @@ import org.jboss.ws.extensions.addressing.EndpointReferenceImpl; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventSinkServlet.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventSinkServlet.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventSinkServlet.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -29,8 +29,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -31,7 +31,7 @@ import org.jboss.ws.extensions.eventing.jaxws.SubscribeResponse; import org.jboss.ws.extensions.eventing.mgmt.EventDispatcher; import org.jboss.wsf.spi.test.JBossWSTestSetup; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -36,7 +36,7 @@ import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager; import org.jboss.ws.extensions.eventing.mgmt.SubscriptionTicket; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -40,8 +40,8 @@ import org.jboss.ws.tools.WSToolsConstants; import org.jboss.ws.tools.wsdl.WSDLWriter; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.IOUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -28,7 +28,7 @@ import org.jboss.test.ws.common.jbossxb.complex.Base; import org.jboss.test.ws.common.jbossxb.complex.Composite; import org.jboss.test.ws.common.jbossxb.complex.Derived; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Test the XSD schema generator Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -47,8 +47,8 @@ import org.jboss.ws.tools.exceptions.JBossWSToolsException; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.JavaUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -34,8 +34,8 @@ import org.jboss.ws.tools.WSDLToJava; import org.jboss.ws.tools.client.ServiceCreator; import org.jboss.ws.tools.mapping.MappingFileGenerator; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -31,8 +31,8 @@ import org.jboss.ws.tools.JavaToWSDL; import org.jboss.ws.tools.WSToolsConstants; import org.jboss.ws.tools.wsdl.WSDLWriter; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.IOUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -25,7 +25,7 @@ import org.jboss.ws.tools.WSTools; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -40,8 +40,8 @@ import org.jboss.ws.tools.interfaces.WSDLToJavaIntf; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.ws.tools.wsdl.WSDLWriter; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.IOUtils; import org.w3c.dom.Element; Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -33,7 +33,7 @@ import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.tools.JavaToXSD; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -32,7 +32,7 @@ import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSTypeDefinition; import org.jboss.ws.tools.schema.SchemaTypeCreator; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -30,8 +30,8 @@ import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.tools.WSContractProvider; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.spi.tools.WSContractProvider; +import org.jboss.wsf.framework.utils.JavaUtils; /** * Tests the WSContractProvider API. Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -28,7 +28,7 @@ import org.jboss.util.xml.DOMUtils; import org.jboss.ws.tools.WSTools; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.IOUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -34,7 +34,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.core.soap.Style; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.IOUtils; +import org.jboss.wsf.framework.utils.IOUtils; import org.jboss.ws.extensions.policy.PolicyScopeLevel; import org.jboss.ws.extensions.policy.metadata.PolicyMetaExtension; import org.jboss.ws.metadata.umdm.EndpointMetaData; Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -25,7 +25,7 @@ import org.jboss.ws.tools.WSTools; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -30,7 +30,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.tools.JavaToXSD; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -34,7 +34,7 @@ import org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils; import org.jboss.ws.tools.JavaToXSD; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardArraysTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardArraysTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardArraysTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -30,7 +30,7 @@ import org.jboss.test.ws.tools.WSToolsTest; import org.jboss.ws.Constants; import org.jboss.ws.tools.JavaToXSD; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardDoubleArraysTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardDoubleArraysTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardDoubleArraysTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -29,7 +29,7 @@ import org.jboss.test.ws.tools.WSToolsTest; import org.jboss.ws.Constants; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -37,7 +37,7 @@ import org.jboss.ws.metadata.jaxrpcmapping.WsdlMessageMapping; import org.jboss.ws.metadata.jaxrpcmapping.WsdlReturnValueMapping; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -32,7 +32,7 @@ import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; Modified: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidationHelper.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidationHelper.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidationHelper.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -47,7 +47,7 @@ import org.jboss.ws.metadata.wsdl.WSDLProperty; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.tools.exceptions.JBossWSToolsException; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -42,7 +42,7 @@ import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; /** * Test JAXWS asynchrous dispatch Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -35,7 +35,7 @@ import javax.xml.ws.WebServiceContext; import javax.xml.ws.handler.MessageContext; -import org.jboss.wsf.framework.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; @WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/context") @SOAPBinding(style = Style.RPC) Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -29,7 +29,7 @@ import javax.jws.soap.SOAPBinding; import org.jboss.logging.Logger; -import org.jboss.wsf.framework.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; // Test that the wsdl can be read from the nested deployment @WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace="http://eardeployment.jaxws/", wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -38,7 +38,7 @@ import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -39,7 +39,7 @@ import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -36,7 +36,7 @@ import org.jboss.logging.Logger; import org.jboss.wsf.framework.jaxws.handler.GenericLogicalHandler; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -57,7 +57,7 @@ import javax.xml.registry.infomodel.User; import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.framework.utils.ObjectNameFactory; /** * Acts as the base class for Jaxr Test Cases Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -35,8 +35,8 @@ import javax.xml.ws.handler.MessageContext; import org.jboss.logging.Logger; -import org.jboss.wsf.framework.jaxws.handler.GenericLogicalHandler; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.ws.core.jaxws.handler.GenericLogicalHandler; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -35,8 +35,8 @@ import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -36,7 +36,7 @@ import org.jboss.logging.Logger; import org.jboss.wsf.framework.jaxws.handler.GenericLogicalHandler; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -45,7 +45,7 @@ import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -46,7 +46,7 @@ import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; -import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMUtils; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -46,8 +46,8 @@ import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; +import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.framework.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -25,7 +25,6 @@ import javax.ejb.Stateless; import javax.jws.HandlerChain; import javax.jws.WebService; -import javax.xml.ws.Response; import javax.xml.ws.WebServiceRef; import org.jboss.logging.Logger; @@ -35,7 +34,7 @@ import org.jboss.test.ws.jaxws.samples.retail.profile.DiscountResponse; import org.jboss.test.ws.jaxws.samples.retail.profile.ProfileMgmt; import org.jboss.test.ws.jaxws.samples.retail.profile.ProfileMgmtService; -import org.jboss.wsf.framework.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; /** * An example order management component Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -22,12 +22,11 @@ package org.jboss.test.ws.jaxws.samples.retail.cc; import javax.ejb.Stateless; -import javax.jws.HandlerChain; import javax.jws.WebService; import javax.xml.ws.Response; import org.jboss.logging.Logger; -import org.jboss.wsf.framework.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; @Stateless @WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.retail.cc.CCVerification", name = "CCVerification") Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -22,10 +22,9 @@ package org.jboss.test.ws.jaxws.samples.retail.profile; import javax.ejb.Stateless; -import javax.jws.HandlerChain; import javax.jws.WebService; -import org.jboss.wsf.framework.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; @Stateless @WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.retail.profile.ProfileMgmt", name = "ProfileMgmt", serviceName = "ProfileMgmtService") Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -21,7 +21,7 @@ */ package org.jboss.test.ws.jaxws.samples.swaref; -import org.jboss.wsf.framework.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; import javax.jws.WebService; import javax.jws.WebMethod; Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpointImpl.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpointImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpointImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -21,7 +21,7 @@ */ package org.jboss.test.ws.jaxws.samples.swaref; -import org.jboss.wsf.framework.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; import javax.ejb.Stateless; import javax.jws.WebService; Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -21,7 +21,7 @@ */ package org.jboss.test.ws.jaxws.samples.swaref; -import org.jboss.wsf.framework.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; import javax.activation.DataHandler; import javax.jws.WebMethod; Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -27,7 +27,7 @@ import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -import org.jboss.wsf.framework.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; /** * Test the JSR-181 annotation: javax.jws.WebService Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -29,7 +29,7 @@ import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -import org.jboss.wsf.framework.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; /** * Test the JSR-181 javax.jws.WebService annotation on an EJB3 endpoint. Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.java 2007-07-18 08:30:30 UTC (rev 3922) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.java 2007-07-18 11:21:21 UTC (rev 3923) @@ -25,7 +25,7 @@ import javax.ejb.Stateless; import javax.jws.WebService; -import org.jboss.wsf.framework.annotation.WebContext; +import org.jboss.wsf.spi.annotation.WebContext; /** * Test the JSR-181 annotation: javax.jws.WebService