Author: heiko.braun(a)jboss.com Date: 2007-07-18 14:03:28 -0400 (Wed, 18 Jul 2007) New Revision: 3940 Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/DOMUtils.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/DOMWriter.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/IOUtils.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/JavaUtils.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/ObjectNameFactory.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/log/ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/log/JBossLogHandler.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/log/JDKLogRedirector.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/log/NamespaceFilter.java Removed: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/utils/ Modified: branches/hbraun/trunk/hbraun-trunk.iws 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/java/org/jboss/ws/integration/ServiceRefHandlerFactory.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/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/SPIProviderResolver.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/spi/tools/WSContractConsumer.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/cmd/WSProvide.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/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/DDEndpoints.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/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/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/SourceWrapperGenerator.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/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/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/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/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 Log: Move utils to 'common' package Modified: branches/hbraun/trunk/hbraun-trunk.iws =================================================================== --- branches/hbraun/trunk/hbraun-trunk.iws 2007-07-18 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/hbraun-trunk.iws 2007-07-18 18:03:28 UTC (rev 3940) @@ -574,52 +574,6 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="hbraun-trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -657,18 +611,6 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -691,41 +633,7 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="hbraun-trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> </component> <component name="ProjectReloadState"> <option name="STATE" value="2" /> @@ -764,11 +672,11 @@ <recent name="org.jboss.test.ws.jaxws.webserviceref" /> </key> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> + <recent name="org.jboss.wsf.common.log" /> + <recent name="org.jboss.wsf.common" /> <recent name="org.jboss.wsf.spi.deployment" /> <recent name="org.jboss.ws.integration" /> <recent name="org.jboss.wsf.framework.deployment" /> - <recent name="org.jboss.ws.core.jaxws.handler" /> - <recent name="org.jboss.wsf.spi" /> </key> </component> <component name="RestoreUpdateTree" /> @@ -981,22 +889,6 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicEndpoint.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="57" column="3" selection-start="2290" selection-end="2290" vertical-scroll-proportion="0.15"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="58" column="85" selection-start="2101" selection-end="2256" vertical-scroll-proportion="0.2678788"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java"> <provider selected="true" editor-type-id="text-editor"> <state line="74" column="66" selection-start="2850" selection-end="2850" vertical-scroll-proportion="1.2848485"> @@ -1100,6 +992,20 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="46" column="15" selection-start="1708" selection-end="1708" vertical-scroll-proportion="0.8208955"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="51" column="13" selection-start="1843" selection-end="1843" vertical-scroll-proportion="0.61904764"> + <folding /> + </state> + </provider> + </entry> </component> </project> 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21MBean.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -23,7 +23,7 @@ import javax.management.ObjectName; -import org.jboss.wsf.framework.utils.ObjectNameFactory; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3MBean.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -23,7 +23,7 @@ import javax.management.ObjectName; -import org.jboss.wsf.framework.utils.ObjectNameFactory; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSEMBean.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -23,7 +23,7 @@ import javax.management.ObjectName; -import org.jboss.wsf.framework.utils.ObjectNameFactory; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.ObjectNameFactory; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.ObjectNameFactory; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.ObjectNameFactory; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.ObjectNameFactory; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMWriter; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.IOUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.ServiceLoader; +import org.jboss.wsf.common.ServiceLoader; // $Id$ @@ -70,7 +70,7 @@ { String propName = ServiceRefHandler.class.getName(); String defaultImpl = "org.jboss.ws.integration.ServiceRefHandlerImpl"; - ServiceRefHandler handler = (ServiceRefHandler)ServiceLoader.loadService(propName, defaultImpl); + ServiceRefHandler handler = (ServiceRefHandler) ServiceLoader.loadService(propName, defaultImpl); return handler; } } Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/DOMUtils.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/DOMUtils.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/DOMUtils.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.common; + +// $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/common/DOMUtils.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/DOMWriter.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/DOMWriter.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/DOMWriter.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.common; + +// $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/common/DOMWriter.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/IOUtils.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/IOUtils.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/IOUtils.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.common; + +// $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/common/IOUtils.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/JavaUtils.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/JavaUtils.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/JavaUtils.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.common; + +// $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/common/JavaUtils.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/ObjectNameFactory.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/ObjectNameFactory.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/ObjectNameFactory.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.common; + +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/common/ObjectNameFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.common; + +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/common/ServiceLoader.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/log/JBossLogHandler.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/log/JBossLogHandler.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/log/JBossLogHandler.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.common.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/common/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/common/log/JDKLogRedirector.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/log/JDKLogRedirector.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/log/JDKLogRedirector.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -0,0 +1,113 @@ +/* + * 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.common.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; +import org.jboss.wsf.common.log.JBossLogHandler; + +/** + * 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/common/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/common/log/NamespaceFilter.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/log/NamespaceFilter.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/common/log/NamespaceFilter.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.common.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/common/log/NamespaceFilter.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.ObjectNameFactory; +import org.jboss.wsf.common.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/WebXMLRewriter.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java 2007-07-18 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -36,7 +36,7 @@ import org.jboss.wsf.framework.deployment.WebAppDesciptorModifier.RewriteResults; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.common.IOUtils; /** * The rewriter for web.xml @@ -63,7 +63,7 @@ UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); if (udi == null) throw new IllegalStateException("Cannot obtain unified deployment info"); - + URL warURL = udi.webappURL; File warFile = new File(warURL.getFile()); if (warFile.isDirectory() == false) 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/BasicInvocationHandler.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -31,7 +31,7 @@ import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.ObjectNameFactory; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/BasicServerConfig.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -36,7 +36,7 @@ import javax.management.ObjectName; import org.jboss.logging.Logger; -import org.jboss.wsf.framework.utils.ObjectNameFactory; +import org.jboss.wsf.common.ObjectNameFactory; /** * Basic implementation of a ServerConfig @@ -151,7 +151,7 @@ { if (webServiceSecurePort <= 0) webServiceSecurePort = getConnectorPort("HTTP/1.1", true); - + int localPort = webServiceSecurePort; if (localPort <= 0) { 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/BasicServerConfigMBean.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -24,7 +24,7 @@ import javax.management.ObjectName; import org.jboss.wsf.spi.management.ServerConfig; -import org.jboss.wsf.framework.utils.ObjectNameFactory; +import org.jboss.wsf.common.ObjectNameFactory; public interface BasicServerConfigMBean extends ServerConfig { Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/SPIProviderResolver.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/SPIProviderResolver.java 2007-07-18 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/SPIProviderResolver.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -21,7 +21,7 @@ */ package org.jboss.wsf.spi; -import org.jboss.wsf.framework.utils.ServiceLoader; +import org.jboss.wsf.common.ServiceLoader; /** * Locates an SPIProvider. 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -23,7 +23,7 @@ // $Id$ -import org.jboss.wsf.framework.utils.ServiceLoader; +import org.jboss.wsf.common.ServiceLoader; /** * A container idependent SecurityAdaptorFactory @@ -35,7 +35,7 @@ { public static SecurityAdaptor getSecurityAdaptor() { - SecurityAdaptor securityAdaptor = (SecurityAdaptor)ServiceLoader.loadService(SecurityAdaptor.class.getName(), null); + SecurityAdaptor securityAdaptor = (SecurityAdaptor) ServiceLoader.loadService(SecurityAdaptor.class.getName(), null); if (securityAdaptor == null) throw new IllegalStateException("Cannot load SecurityAdaptor"); 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -28,7 +28,7 @@ import javax.management.ObjectName; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.framework.utils.ObjectNameFactory; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -28,7 +28,7 @@ import javax.xml.namespace.QName; import org.jboss.logging.Logger; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.DOMUtils; import org.jboss.xb.QNameBuilder; import org.w3c.dom.Element; Modified: 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 2007-07-18 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -27,7 +27,7 @@ import java.net.URL; import java.util.List; -import org.jboss.wsf.framework.utils.ServiceLoader; +import org.jboss.wsf.common.ServiceLoader; /** * WSContractConsumer is responsible for generating JAX-WS client and server @@ -69,7 +69,7 @@ try { Thread.currentThread().setContextClassLoader(loader); - WSContractConsumerFactory factory = (WSContractConsumerFactory)ServiceLoader.loadService(PROVIDER_PROPERTY, DEFAULT_PROVIDER); + WSContractConsumerFactory factory = (WSContractConsumerFactory) ServiceLoader.loadService(PROVIDER_PROPERTY, DEFAULT_PROVIDER); return factory.createConsumer(); } finally Modified: 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 2007-07-18 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -3,7 +3,7 @@ import java.io.File; import java.io.PrintStream; -import org.jboss.wsf.framework.utils.ServiceLoader; +import org.jboss.wsf.common.ServiceLoader; /** * WSContractProvider is responsible for generating the required portable @@ -62,7 +62,7 @@ try { Thread.currentThread().setContextClassLoader(loader); - WSContractProviderFactory factory = (WSContractProviderFactory)ServiceLoader.loadService(PROVIDER_PROPERTY, DEFAULT_PROVIDER); + WSContractProviderFactory factory = (WSContractProviderFactory) ServiceLoader.loadService(PROVIDER_PROPERTY, DEFAULT_PROVIDER); return factory.createProvider(loader); } finally Modified: 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 2007-07-18 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -24,7 +24,7 @@ import gnu.getopt.Getopt; import gnu.getopt.LongOpt; import org.jboss.wsf.spi.tools.WSContractProvider; -import org.jboss.wsf.framework.utils.JavaUtils; +import org.jboss.wsf.common.JavaUtils; import java.io.File; import java.io.PrintStream; 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -34,7 +34,7 @@ import junit.framework.TestCase; import org.jboss.logging.Logger; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -34,7 +34,7 @@ import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; -import org.jboss.wsf.framework.utils.ObjectNameFactory; +import org.jboss.wsf.common.ObjectNameFactory; /** * A JBossWS test helper that deals with test deployment/undeployment, etc. 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/metadata/sunjaxws/DDEndpoints.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -31,7 +31,7 @@ import java.util.List; import org.jboss.wsf.spi.deployment.WSFDeploymentException; -import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.common.IOUtils; //$Id$ 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.ObjectNameFactory; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -33,7 +33,7 @@ import java.util.List; import org.jboss.wsf.spi.deployment.WSFDeploymentException; -import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.common.IOUtils; //$Id$ 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.JavaUtils; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/EndpointInvocation.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/MessageTrace.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMWriter; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -32,7 +32,7 @@ import javax.xml.transform.stream.StreamResult; import org.jboss.ws.WSException; -import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.common.IOUtils; /** * @author Heiko.Braun(a)jboss.org @@ -64,7 +64,7 @@ { return null; } - + @Override public OutputStream getOutputStream() { @@ -82,7 +82,7 @@ { throw new UnsupportedOperationException(); } - + public String toString() { return baos.toString(); 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMWriter; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SerializationContextJAXRPC.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -34,7 +34,7 @@ import javax.xml.transform.stream.StreamSource; import org.jboss.ws.WSException; -import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.common.IOUtils; /** * A StreamSource that can be read repeatedly. @@ -62,7 +62,7 @@ Reader rd = source.getReader(); if (ins == null && rd != null) { - char[] auxbuf = new char[1024]; + char[] auxbuf = new char[1024]; CharArrayWriter wr = new CharArrayWriter(auxbuf.length); int r = rd.read(auxbuf); while (r > 0) @@ -107,7 +107,7 @@ { throw new UnsupportedOperationException(); } - + public String toString() { String retStr = null; 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializer.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMWriter; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializer.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.JavaUtils; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializer.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializer.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMWriter; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBMarshallerImpl.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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. @@ -678,7 +678,7 @@ String[] roles = handlerChain.getRoles(); if (roles != null) Collections.addAll(set, roles); - + return set; } 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/PortProxy.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.JavaUtils; public class DynamicWrapperGenerator extends AbstractWrapperGenerator { @@ -61,20 +61,20 @@ super(loader); init(loader); } - + private void init(ClassLoader loader) { pool = new ClassPool(true); pool.appendClassPath(new LoaderClassPath(loader)); } - + @Override public void reset(ClassLoader loader) { super.reset(loader); init(loader); } - + /** * Generates a wrapper type and assigns it to the passed ParameterMetaData * object. This routine requires the pmd to contain completed wrappedTypes @@ -112,7 +112,7 @@ clazz, parameter.getType(), parameter.getName(), parameter.getVariable(), parameter.getTypeArguments(), - new boolean[] {parameter.isSwaRef(), parameter.isXop()} + new boolean[] {parameter.isSwaRef(), parameter.isXop()} ); } clazz.stopPruning(!prune); @@ -135,7 +135,7 @@ if(log.isDebugEnabled()) log.debug("Generating fault bean: " + faultBeanName); QName xmlType = fmd.getXmlType(); - + Class exception = fmd.getJavaType(); try { @@ -152,7 +152,7 @@ new QName(property), property, null, new boolean[] {false, false} ); - + clazz.stopPruning(!prune); pool.toClass(clazz, loader); JavaUtils.clearBlacklists(loader); @@ -161,7 +161,7 @@ { throw new WSException("Could not generate fault wrapper bean: " + faultBeanName, e); } - + // Add the generated type to the types meta data TypesMetaData types = fmd.getOperationMetaData().getEndpointMetaData().getServiceMetaData().getTypesMetaData(); types.addTypeMapping(new TypeMappingMetaData(types, xmlType, faultBeanName)); @@ -220,7 +220,7 @@ // @XmlAttachmentRef if(attachments[0]) { - annotation = JavassistUtils.createAnnotation(XmlAttachmentRef.class, constPool); + annotation = JavassistUtils.createAnnotation(XmlAttachmentRef.class, constPool); annotation.markField(field); } // @XmlMimeType 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -22,7 +22,7 @@ package org.jboss.ws.core.jaxws; import org.jboss.ws.WSException; -import org.jboss.wsf.framework.utils.ServiceLoader; +import org.jboss.wsf.common.ServiceLoader; import javax.xml.bind.JAXBContext; @@ -41,7 +41,7 @@ public abstract JAXBContext createContext(Class clazz) throws WSException; /** - * Retrieve JAXBContextFactory instance through the {@link ServiceLoader}. + * Retrieve JAXBContextFactory instance through the {@link org.jboss.wsf.common.ServiceLoader}. * Defaults to {@link CustomizableJAXBContextFactory} * @return JAXBContextFactory */ 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPMessageMarshaller.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMWriter; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.JavaUtils; /** * The dynamic proxy that delegates to the underlying client implementation @@ -211,15 +211,15 @@ // Throw unwrapped WebServiceException if (cause instanceof WebServiceException) throw (WebServiceException)cause; - + // Throw wrapped SOAPException if (cause instanceof SOAPException) throw (SOAPFaultException)ex; - + // Throw wrapped RuntimeException if (cause instanceof RuntimeException) throw (SOAPFaultException)ex; - + // Throw all other causes throw (Exception)cause; } 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMWriter; /** * A helper that @@ -159,11 +159,11 @@ if (mode == Mode.PAYLOAD) { SOAPBodyImpl soapBody = (SOAPBodyImpl)resMsg.getSOAPBody(); - + SOAPFault soapFault = soapBody.getFault(); if (soapFault != null) throw new SOAPFaultException(soapFault); - + SOAPElement soapElement = soapBody.getBodyElement(); retObj = new DOMSource(soapElement); } 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMWriter; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.ServiceLoader; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/HttpServer.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -28,7 +28,7 @@ import javax.xml.ws.Endpoint; -import org.jboss.wsf.framework.utils.ServiceLoader; +import org.jboss.wsf.common.ServiceLoader; /** * An abstract HTTP Server @@ -36,39 +36,39 @@ * @author Thomas.Diesler(a)jboss.org * @since 07-Jul-2006 */ -public abstract class HttpServer +public abstract class HttpServer { public static String HTTP_SERVER_PROPERTY = HttpServer.class.getName(); - + private Map<String, Object> properties = new HashMap<String, Object>(); - + // Hide constructor protected HttpServer () { } - - /** + + /** * Create an instance of an HTTP server. * The discovery algorithm is described in {@link FactoryFinder.find(String,String)} */ public static HttpServer create() { - HttpServer server = (HttpServer)ServiceLoader.loadService(HTTP_SERVER_PROPERTY, null); + HttpServer server = (HttpServer) ServiceLoader.loadService(HTTP_SERVER_PROPERTY, null); return server; } - + /** Start an instance of this HTTP server */ public abstract void start(); - + /** Create an HTTP context */ public abstract HttpContext createContext(String string); - + /** Publish an JAXWS endpoint to the HTTP server */ public abstract void publish(HttpContext context, Endpoint endpoint); - + /** Destroys an JAXWS endpoint on the HTTP server */ public abstract void destroy(HttpContext context, Endpoint endpoint); - + public Map<String, Object> getProperties() { return properties; @@ -78,12 +78,12 @@ { properties = map; } - + public void setProperty(String key, Object value) { properties.put(key, value); } - + public Object getProperty(String key) { return properties.get(key); 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.JavaUtils; /** An implementation handles invocations on the endpoint * @@ -203,7 +203,7 @@ Invocation inv = setupInvocation(endpoint, sepInv, invContext); InvocationHandler invHandler = endpoint.getInvocationHandler(); invHandler.invoke(endpoint, inv); - + // Handler processing might have replaced the endpoint invocation sepInv = inv.getInvocationContext().getAttachment(EndpointInvocation.class); } @@ -309,7 +309,7 @@ } invContext.addAttachment(EndpointInvocation.class, epInv); - + Invocation wsInv = new DelegatingInvocation(); wsInv.setInvocationContext(invContext); wsInv.setJavaMethod(getImplMethod(endpoint, epInv)); 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/DetailImpl.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -34,7 +34,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -42,7 +42,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.core.CommonSOAPFaultException; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/HRefInlineHandler.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -32,8 +32,8 @@ import javax.xml.soap.Text; import org.jboss.logging.Logger; -import org.jboss.wsf.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.ServiceLoader; -import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.common.ServiceLoader; +import org.jboss.wsf.common.IOUtils; /** * MessageFactory implementation @@ -249,7 +249,7 @@ soapMessage.setAttachments(attachments); // Get the SOAPEnvelope builder - EnvelopeBuilder envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), EnvelopeBuilderDOM.class.getName()); + EnvelopeBuilder envBuilder = (EnvelopeBuilder) ServiceLoader.loadService(EnvelopeBuilder.class.getName(), EnvelopeBuilderDOM.class.getName()); envBuilder.setStyle(getStyle()); // Build the payload 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -31,8 +31,8 @@ import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; import org.jboss.ws.WSException; -import org.jboss.wsf.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementMessage.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -27,7 +27,7 @@ import javax.xml.rpc.JAXRPCException; import javax.xml.soap.SOAPBodyElement; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMWriter; /** * An abstract implemenation of the SOAPBodyElement @@ -48,7 +48,7 @@ { super(element); } - + public void writeElement(Writer writer) { try { 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -37,7 +37,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMWriter; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPDocument.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -21,7 +21,7 @@ */ package org.jboss.ws.core.soap; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -41,7 +41,7 @@ import org.jboss.util.NotImplementedException; import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementWriter.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -34,8 +34,8 @@ import javax.xml.soap.SOAPEnvelope; import org.jboss.ws.WSException; -import org.jboss.wsf.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -33,7 +33,7 @@ import javax.xml.soap.SOAPFault; import org.jboss.logging.Logger; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMWriter; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPHeaderElementImpl.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -37,7 +37,7 @@ import javax.xml.soap.SOAPHeaderElement; import org.jboss.ws.Constants; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -42,7 +42,7 @@ import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; -import org.jboss.wsf.framework.utils.ServiceLoader; +import org.jboss.wsf.common.ServiceLoader; import org.w3c.dom.Attr; import org.w3c.dom.CDATASection; import org.w3c.dom.Comment; @@ -172,7 +172,7 @@ else throw new SOAPException("Unsupported DOMSource node: " + node); - EnvelopeBuilder envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), EnvelopeBuilderDOM.class.getName()); + EnvelopeBuilder envBuilder = (EnvelopeBuilder) ServiceLoader.loadService(EnvelopeBuilder.class.getName(), EnvelopeBuilderDOM.class.getName()); envBuilder.setStyle(Style.DOCUMENT); envBuilder.build(soapMessage, domElement); } 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.JavaUtils; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/AttachmentPartImpl.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -22,7 +22,7 @@ package org.jboss.ws.core.soap.attachment; import org.jboss.util.Base64; -import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/ByteArrayContentHandler.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -33,7 +33,7 @@ import javax.activation.DataSource; import org.jboss.ws.core.utils.MimeUtils; -import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.common.IOUtils; /** * @author Heiko Braun <heiko.braun(a)jboss.com&gt; @@ -60,7 +60,7 @@ } public void writeTo(Object object, String string, OutputStream outputStream) throws IOException { - + if(object instanceof byte[]) { outputStream.write((byte[])object); 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/SwapableMemoryDataSource.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -33,7 +33,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/XmlDataContentHandler.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -26,14 +26,13 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.Reader; import javax.activation.ActivationDataFlavor; import javax.activation.DataContentHandler; import javax.activation.DataSource; import javax.xml.transform.stream.StreamSource; -import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -86,7 +86,7 @@ import javax.xml.rpc.holders.StringHolder; import org.jboss.logging.Logger; -import org.jboss.wsf.framework.utils.JavaUtils; +import org.jboss.wsf.common.JavaUtils; /** * HolderUtils provides static utility functions for both JAX-RPC @@ -320,9 +320,9 @@ { // For some reason the JDK 4 bytecode verifier trips up on this function if you use the ternary operator // The only difference between it and the working form here is the use of a goto instruction. JDK bug perhaps? - if (holder instanceof ParameterizedType) + if (holder instanceof ParameterizedType) return ((ParameterizedType)holder).getActualTypeArguments()[0]; - + return Object.class; } 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/MimeUtils.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -43,8 +43,8 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.wsf.framework.utils.IOUtils; -import org.jboss.wsf.framework.utils.JavaUtils; +import org.jboss.wsf.common.IOUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/EndpointReferenceImpl.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -41,8 +41,8 @@ import org.jboss.ws.WSException; import org.jboss.ws.extensions.addressing.soap.SOAPAddressingBuilderImpl; -import org.jboss.wsf.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractSubscriptionManagerEndpoint.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/NotificationFailure.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -25,7 +25,7 @@ import java.net.URISyntaxException; import org.jboss.ws.WSException; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/Subscription.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMWriter; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -31,7 +31,7 @@ import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDeployment; import org.jboss.ws.extensions.eventing.jaxws.EndpointReferenceType; -import org.jboss.wsf.framework.utils.ObjectNameFactory; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/Policy.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -29,8 +29,8 @@ import java.util.Iterator; import org.jboss.ws.WSException; -import org.jboss.wsf.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyAlternative.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -29,8 +29,8 @@ import java.util.Iterator; import org.jboss.ws.WSException; -import org.jboss.wsf.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyAssertion.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -23,8 +23,8 @@ //$Id$ -import org.jboss.wsf.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/PolicyFactory.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -29,7 +29,7 @@ import javax.xml.namespace.QName; import org.jboss.ws.WSException; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMWriter; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.JavaUtils; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxrpc/JBossXBContentAdapter.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.IOUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -21,7 +21,7 @@ */ package org.jboss.ws.extensions.xop.jaxws; -import org.jboss.wsf.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.ObjectNameFactory; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-07-18 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.IOUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -34,7 +34,6 @@ import org.jboss.ws.core.jaxrpc.binding.SOAPArrayDeserializerFactory; import org.jboss.ws.core.jaxrpc.binding.SOAPArraySerializerFactory; import org.jboss.ws.core.jaxws.JAXBContextCache; -import org.jboss.ws.core.jaxws.JAXBContextFactory; import org.jboss.ws.core.jaxws.JAXBDeserializerFactory; import org.jboss.ws.core.jaxws.JAXBSerializerFactory; import org.jboss.ws.core.jaxws.client.DispatchBinding; @@ -44,7 +43,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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.JavaUtils; /** * A Fault component describes a fault that a given operation supports. @@ -175,7 +175,7 @@ } return faultBean; } - + public Class getFaultBean() { Class tmpFaultBean = faultBean; 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.JavaUtils; /** * A request/response parameter that a given operation supports. @@ -121,7 +121,7 @@ return false; boolean matchTypes; - + if (JavaUtils.isRetro14()) { matchTypes = matchTypes(classParameters[index], expectedType, exact, holder); @@ -131,7 +131,7 @@ java.lang.reflect.Type[] genericParameters = method.getGenericParameterTypes(); matchTypes = matchTypes(genericParameters[index], expectedType, exact, holder); } - + if (matchTypes) { matches.add(index); @@ -140,7 +140,7 @@ return false; } - + private static boolean matchTypes(java.lang.reflect.Type actualType, Class expectedType, boolean exact, boolean holder) { if (holder && HolderUtils.isHolderType(actualType) == false) @@ -164,7 +164,7 @@ return matchTypesInternal(valueClass, expectedType, exact); } - + private static boolean matchTypesInternal(Class valueClass, Class expectedType, boolean exact) { // FIXME - Why do we need this hack? The method signature should _ALWAYS_ match, else we will get ambiguous or incorrect results @@ -235,7 +235,7 @@ javaTypeName = typeName; javaType = null; } - + public Class loadWrapperBean() { Class wrapperBean = null; @@ -375,7 +375,7 @@ String logmsg = "SOAPArrayCompType: [xmlType=" + xmlType + ",compType=" + compXmlType + "]"; log.debug((soapArrayCompType == null ? "set" : "reset") + logmsg); } - + this.soapArrayCompType = compXmlType; } @@ -470,7 +470,7 @@ { if (epType == EndpointMetaData.Type.JAXRPC) throw new WSException("Autogeneration of wrapper beans not supported with JAXRPC"); - + new DynamicWrapperGenerator( getClassLoader() ).generate(this); } @@ -490,8 +490,8 @@ /** * Identify MTOM and SWA:Ref parameter as these require special treatment. * This only affects JAX-WS endpoints. - * - * Note: For SEI parameter annotations this happens within the metadata builder. + * + * Note: For SEI parameter annotations this happens within the metadata builder. * @param epType */ private void initializeAttachmentParameter(Type epType) @@ -564,10 +564,10 @@ buffer.append("\n xmlName=" + getXmlName()); buffer.append("\n partName=" + getPartName()); buffer.append("\n xmlType=" + getXmlType()); - + if (soapArrayParam) buffer.append("\n soapArrayCompType=" + soapArrayCompType); - + buffer.append("\n javaType=" + getJavaTypeName()); buffer.append("\n mode=" + getMode()); buffer.append("\n inHeader=" + isInHeader()); 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -23,7 +23,7 @@ import javax.xml.namespace.QName; -import org.jboss.wsf.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -57,8 +57,8 @@ import org.jboss.util.NotImplementedException; import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.wsf.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMWriter; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/ToolsUtils.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WebservicesXMLCreatorImpl.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.JavaUtils; /** * Java To WSDL Helper which uses UnifiedMetaData @@ -284,7 +284,7 @@ } private void buildParamMapping(ServiceEndpointMethodMapping methodMapping, String interfaceName, OperationMetaData operation, - String name, String type, String mode, boolean header, int position) + String name, String type, String mode, boolean header, int position) { MethodParamPartsMapping paramMapping = new MethodParamPartsMapping(methodMapping); paramMapping.setParamPosition(position); 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ReformatXML.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -25,8 +25,8 @@ import java.io.FileNotFoundException; import java.io.InputStream; -import org.jboss.wsf.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -64,10 +64,9 @@ 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.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; -import org.jboss.wsf.framework.utils.IOUtils; -import org.jboss.wsf.framework.utils.JavaUtils; +import org.jboss.wsf.common.JavaUtils; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.*; /** * Helper class used by the cmd line tool "jbossws" @@ -211,7 +210,7 @@ } private void createWrapperType(ParameterMetaData parameter, String name, String packageName, Map<QName, JavaXmlTypeMapping> mappingIndex, ClassLoader classLoader, - String outDir) throws IOException + String outDir) throws IOException { List<WrappedParameter> wrappedParameters = parameter.getWrappedParameters(); @@ -311,7 +310,7 @@ MappingFileGenerator mgf = new MappingFileGenerator(wsdl, new LiteralTypeMapping()); mgf.setPackageName(getPackageName(wsdl, glc)); mgf.setServiceName(wsdl.getServices()[0].getName().getLocalPart()); - mgf.setParameterStyle(w2jc.parameterStyle); + mgf.setParameterStyle(w2jc.parameterStyle); JavaWsdlMapping jwm = mgf.generate(); Writer writer = IOUtils.getCharsetFileWriter(new File(outDir + "/" + w2jc.mappingFileName), Constants.DEFAULT_XML_CHARSET); @@ -342,10 +341,10 @@ WSDLService wsdlService = wsdl.getService(serviceName); String portName = wsdlService.getEndpoints()[0].getName().getLocalPart(); wscr.setPortName(portName); - + String wsdlShortName = wsdlURL.getPath(); wsdlShortName = wsdlShortName.substring(wsdlShortName.lastIndexOf("/")); - + if (w2jc.servletLink != null) { wscr.setMappingFile("WEB-INF/" + w2jc.mappingFileName); 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.JavaUtils; import javax.xml.bind.annotation.*; import javax.xml.namespace.QName; 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLWriter.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -50,7 +50,7 @@ import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayMarshallerTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayMarshallerTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayUnmarshallerTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayMarshallerTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayUnmarshallerTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.DOMUtils; /** * Test the JAXB marshalling of a SimpleUserType @@ -53,15 +53,15 @@ QName xmlType = new QName(TARGET_NAMESPACE, "SimpleUserType", "ns1"); String xsdSchema = generateSchema(xmlType, SimpleUserType.class); - String exp = - "<schema targetNamespace='http://org.jboss.ws/types' " + SCHEMA_NAMESPACES + " xmlns:tns='http://org.jboss.ws/types'>" + - " <complexType name='SimpleUserType'>" + - " <sequence>" + - " <element name='a' type='int'/>" + - " <element name='b' type='int'/>" + - " <element name='d' nillable='true' type='dateTime'/>" + - " </sequence>" + - " </complexType>" + + String exp = + "<schema targetNamespace='http://org.jboss.ws/types' " + SCHEMA_NAMESPACES + " xmlns:tns='http://org.jboss.ws/types'>" + + " <complexType name='SimpleUserType'>" + + " <sequence>" + + " <element name='a' type='int'/>" + + " <element name='b' type='int'/>" + + " <element name='d' nillable='true' type='dateTime'/>" + + " </sequence>" + + " </complexType>" + "</schema>"; assertEquals(DOMUtils.parse(exp), DOMUtils.parse(xsdSchema)); @@ -71,13 +71,13 @@ { SimpleUserType obj = new SimpleUserType(); - String exp = - "<ns1:SimpleUser xmlns:ns1='" + TARGET_NAMESPACE + "' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" + - " <a>0</a>" + - " <b>0</b>" + - " <d xsi:nil='1'/>" + + String exp = + "<ns1:SimpleUser xmlns:ns1='" + TARGET_NAMESPACE + "' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" + + " <a>0</a>" + + " <b>0</b>" + + " <d xsi:nil='1'/>" + "</ns1:SimpleUser>"; - + String was = marshalSimpleType(obj); assertEquals(DOMUtils.parse(exp), DOMUtils.parse(was)); } @@ -91,13 +91,13 @@ GregorianCalendar cal = new GregorianCalendar(1968, 11, 16); SimpleUserType obj = new SimpleUserType(1, 2, cal.getTime()); - String exp = - "<ns1:SimpleUser xmlns:ns1='" + TARGET_NAMESPACE + "' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" + - " <a>1</a>" + - " <b>2</b>" + - " <d>1968-12-16T00:00:00.000Z</d>" + + String exp = + "<ns1:SimpleUser xmlns:ns1='" + TARGET_NAMESPACE + "' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" + + " <a>1</a>" + + " <b>2</b>" + + " <d>1968-12-16T00:00:00.000Z</d>" + "</ns1:SimpleUser>"; - + String was = marshalSimpleType(obj); assertEquals(DOMUtils.parse(exp), DOMUtils.parse(was)); } @@ -121,7 +121,7 @@ super(date); } } - + TimeZone tz = TimeZone.getDefault(); TimeZone.setDefault(TimeZone.getTimeZone("GMT")); try @@ -130,11 +130,11 @@ UserDate userDate = new UserDate(cal.getTime().getTime()); SimpleUserType obj = new SimpleUserType(1, 2, userDate); - String exp = - "<ns1:SimpleUser xmlns:ns1='" + TARGET_NAMESPACE + "' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" + - " <a>1</a>" + - " <b>2</b>" + - " <d>1968-12-16T00:00:00.000Z</d>" + + String exp = + "<ns1:SimpleUser xmlns:ns1='" + TARGET_NAMESPACE + "' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" + + " <a>1</a>" + + " <b>2</b>" + + " <d>1968-12-16T00:00:00.000Z</d>" + "</ns1:SimpleUser>"; String was = marshalSimpleType(obj); 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.DOMUtils; /** * Test the JAXB unmarshalling of a SimpleUserType @@ -49,15 +49,15 @@ QName xmlType = new QName(TARGET_NAMESPACE, "SimpleUserType", "ns1"); String xsdSchema = generateSchema(xmlType, SimpleUserType.class); - String exp = - "<schema targetNamespace='http://org.jboss.ws/types' " + SCHEMA_NAMESPACES + " xmlns:tns='http://org.jboss.ws/types'>" + - " <complexType name='SimpleUserType'>" + - " <sequence>" + - " <element name='a' type='int'/>" + - " <element name='b' type='int'/>" + - " <element name='d' nillable='true' type='dateTime'/>" + - " </sequence>" + - " </complexType>" + + String exp = + "<schema targetNamespace='http://org.jboss.ws/types' " + SCHEMA_NAMESPACES + " xmlns:tns='http://org.jboss.ws/types'>" + + " <complexType name='SimpleUserType'>" + + " <sequence>" + + " <element name='a' type='int'/>" + + " <element name='b' type='int'/>" + + " <element name='d' nillable='true' type='dateTime'/>" + + " </sequence>" + + " </complexType>" + "</schema>"; assertEquals(DOMUtils.parse(exp), DOMUtils.parse(xsdSchema)); @@ -77,11 +77,11 @@ unmarshaller.setProperty(JBossXBConstants.JBXB_TYPE_QNAME, xmlType); unmarshaller.setProperty(JBossXBConstants.JBXB_JAVA_MAPPING, getJavaWSDLMapping()); - String xml = - "<ns1:SimpleUser xmlns:ns1='" + TARGET_NAMESPACE + "' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" + - " <a>0</a>" + - " <b>0</b>" + - " <d xsi:nil='1'/>" + + String xml = + "<ns1:SimpleUser xmlns:ns1='" + TARGET_NAMESPACE + "' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" + + " <a>0</a>" + + " <b>0</b>" + + " <d xsi:nil='1'/>" + "</ns1:SimpleUser>"; obj = (SimpleUserType)unmarshaller.unmarshal(new ByteArrayInputStream(xml.getBytes())); @@ -105,11 +105,11 @@ unmarshaller.setProperty(JBossXBConstants.JBXB_TYPE_QNAME, xmlType); unmarshaller.setProperty(JBossXBConstants.JBXB_JAVA_MAPPING, getJavaWSDLMapping()); - String xml = - "<ns1:SimpleUser xmlns:ns1='" + TARGET_NAMESPACE + "' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" + - " <a>0</a>" + - " <b>0</b>" + - " <d xsi:nil='1'/>" + + String xml = + "<ns1:SimpleUser xmlns:ns1='" + TARGET_NAMESPACE + "' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" + + " <a>0</a>" + + " <b>0</b>" + + " <d xsi:nil='1'/>" + "</ns1:SimpleUser>"; obj = (SimpleUserType)unmarshaller.unmarshal(new ByteArrayInputStream(xml.getBytes())); 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -35,15 +35,14 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.soap.Text; -import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamSource; import org.jboss.ws.Constants; import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.core.soap.Style; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPEnvelopeTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -33,7 +33,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -39,7 +39,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.core.jaxrpc.SOAPFaultHelperJAXRPC; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.DOMUtils; /** * Test the SOAPFault @@ -50,19 +50,19 @@ */ public class SOAPFaultTestCase extends JBossWSTest { - private String envStr = - "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - " <env:Header/>" + - " <env:Body>" + - " <env:Fault>" + - " <faultcode>env:Client</faultcode>" + - " <faultstring>Some fault message</faultstring>" + - " <faultactor>Some fault actor</faultactor>" + - " <detail>" + - " <ns1:name xmlns:ns1='http://somens'>Kermit</ns1:name>" + - " </detail>" + - " </env:Fault>" + - " </env:Body>" + + private String envStr = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + " <env:Header/>" + + " <env:Body>" + + " <env:Fault>" + + " <faultcode>env:Client</faultcode>" + + " <faultstring>Some fault message</faultstring>" + + " <faultactor>Some fault actor</faultactor>" + + " <detail>" + + " <ns1:name xmlns:ns1='http://somens'>Kermit</ns1:name>" + + " </detail>" + + " </env:Fault>" + + " </env:Body>" + "</env:Envelope>"; public void testExceptionToFault() throws Exception 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -34,7 +34,7 @@ import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.core.soap.NameImpl; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.DOMUtils; /** * Test the SOAPHeaderElement @@ -94,7 +94,7 @@ assertTrue(shElement.getMustUnderstand()); assertEquals("SomeOtherValue", shElement.getValue()); } - + /** Test access to the mustUnderstand attribute */ public void testSetMustUnderstand() throws Exception @@ -116,11 +116,11 @@ SOAPHeaderElement soapHeaderElement = soapHeader.addHeaderElement(name); soapHeaderElement.setMustUnderstand(true); soapHeaderElement.addTextNode("SomeOtherValue"); - + ByteArrayOutputStream baos = new ByteArrayOutputStream(); soapMessage.writeTo(baos); String wasEnv = new String(baos.toByteArray()); - + assertEquals(DOMUtils.parse(expEnv), DOMUtils.parse(wasEnv)); } } 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -36,7 +36,7 @@ import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.core.soap.NameImpl; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -23,8 +23,8 @@ import junit.framework.TestCase; import org.jboss.ws.core.soap.XMLFragment; -import org.jboss.wsf.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -35,8 +35,8 @@ import javax.xml.transform.stream.StreamSource; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/JavaUtilsTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -23,7 +23,7 @@ import org.jboss.test.ws.tools.jbws_161.custom.HelloObj; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.JavaUtils; +import org.jboss.wsf.common.JavaUtils; /** * Test the JavaUtils @@ -47,7 +47,7 @@ Integer[][] params = (Integer[][])JavaUtils.getWrapperValueArray(primParams); assertNotNull("Unexpected null", params); assertEquals(primParams[0], (int[])JavaUtils.getPrimitiveValueArray(params[0])); - assertEquals(primParams[1], (int[])JavaUtils.getPrimitiveValueArray(params[1])); + assertEquals(primParams[1], (int[]) JavaUtils.getPrimitiveValueArray(params[1])); assertEquals(primParams[2], (int[])JavaUtils.getPrimitiveValueArray(params[2])); } @@ -61,7 +61,7 @@ assertEquals(wrapParams[1], (Integer[])JavaUtils.getWrapperValueArray(params[1])); assertEquals(wrapParams[2], (Integer[])JavaUtils.getWrapperValueArray(params[2])); } - + public void testGetPrimitiveType() throws Exception { assertEquals(int.class, JavaUtils.getPrimitiveType("int")); 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -46,7 +46,7 @@ import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.ws.tools.wsdl.WSDLWriter; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLWithAnonTypesTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/InteropClientConfig.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -21,7 +21,7 @@ */ package org.jboss.test.ws.interop; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/InteropConfigFactory.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -22,7 +22,7 @@ package org.jboss.test.ws.interop; import org.jboss.logging.Logger; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -26,7 +26,7 @@ import org.jboss.ws.extensions.addressing.AddressingClientUtil; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/JavaBean.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.Calendar; -import org.jboss.wsf.framework.utils.JavaUtils; +import org.jboss.wsf.common.JavaUtils; public class JavaBean { @@ -55,10 +55,10 @@ } public JavaBean(BigDecimal myBigDecimal, BigDecimal[] myBigDecimalArray, BigInteger myBigInteger, BigInteger[] myBigIntegerArray, boolean myBoolean, - Boolean myBoolean1, Boolean[] myBoolean1Array, boolean[] myBooleanArray, byte myByte, Byte myByte1, byte[] myByteArray, Calendar myCalendar, - Calendar[] myCalendarArray, double myDouble, Double myDouble1, Double[] myDouble1Array, double[] myDoubleArray, float myFloat, Float myFloat1, - Float[] myFloat1Array, float[] myFloatArray, int myInt, Integer myInt1, Integer[] myInt1Array, int[] myIntArray, long myLong, Long myLong1, - Long[] myLong1Array, long[] myLongArray, short myShort, Short myShort1, Short[] myShort1Array, short[] myShortArray, String myString, String[] myStringArray) + Boolean myBoolean1, Boolean[] myBoolean1Array, boolean[] myBooleanArray, byte myByte, Byte myByte1, byte[] myByteArray, Calendar myCalendar, + Calendar[] myCalendarArray, double myDouble, Double myDouble1, Double[] myDouble1Array, double[] myDoubleArray, float myFloat, Float myFloat1, + Float[] myFloat1Array, float[] myFloatArray, int myInt, Integer myInt1, Integer[] myInt1Array, int[] myIntArray, long myLong, Long myLong1, + Long[] myLong1Array, long[] myLongArray, short myShort, Short myShort1, Short[] myShort1Array, short[] myShortArray, String myString, String[] myStringArray) { this.myBigDecimal = myBigDecimal; this.myBigDecimalArray = myBigDecimalArray; @@ -483,7 +483,7 @@ buf.append(",myLong=" + myLong); buf.append(",myLong1=" + myLong1); buf.append(",myLong1Array=" + (myLong1Array != null ? Arrays.asList(myLong1Array) : null)); - buf.append(",myLongArray=" + (myLongArray != null ? Arrays.asList((Object[])JavaUtils.getWrapperValueArray(myLongArray)) : null)); + buf.append(",myLongArray=" + (myLongArray != null ? Arrays.asList((Object[]) JavaUtils.getWrapperValueArray(myLongArray)) : null)); buf.append(",myShort=" + myShort); buf.append(",myShort1=" + myShort1); buf.append(",myShort1Array=" + (myShort1Array != null ? Arrays.asList(myShort1Array) : null)); 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/ValueType.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.Calendar; -import org.jboss.wsf.framework.utils.JavaUtils; +import org.jboss.wsf.common.JavaUtils; public class ValueType { @@ -55,11 +55,11 @@ } public ValueType(BigDecimal myBigDecimal, BigDecimal[] myBigDecimalArray, BigInteger myBigInteger, BigInteger[] myBigIntegerArray, boolean myBoolean, - Boolean myBoolean1, Boolean[] myBoolean1Array, boolean[] myBooleanArray, byte myByte, Byte myByte1, byte[] myByteArray, - Calendar myCalendar, Calendar[] myCalendarArray, double myDouble, Double myDouble1, Double[] myDouble1Array, - double[] myDoubleArray, float myFloat, Float myFloat1, Float[] myFloat1Array, float[] myFloatArray, int myInt, Integer myInt1, - Integer[] myInt1Array, int[] myIntArray, long myLong, Long myLong1, Long[] myLong1Array, long[] myLongArray, short myShort, - Short myShort1, Short[] myShort1Array, short[] myShortArray, String myString, String[] myStringArray) + Boolean myBoolean1, Boolean[] myBoolean1Array, boolean[] myBooleanArray, byte myByte, Byte myByte1, byte[] myByteArray, + Calendar myCalendar, Calendar[] myCalendarArray, double myDouble, Double myDouble1, Double[] myDouble1Array, + double[] myDoubleArray, float myFloat, Float myFloat1, Float[] myFloat1Array, float[] myFloatArray, int myInt, Integer myInt1, + Integer[] myInt1Array, int[] myIntArray, long myLong, Long myLong1, Long[] myLong1Array, long[] myLongArray, short myShort, + Short myShort1, Short[] myShort1Array, short[] myShortArray, String myString, String[] myStringArray) { this.myBigDecimal = myBigDecimal; this.myBigDecimalArray = myBigDecimalArray; @@ -447,12 +447,12 @@ { this.myStringArray = myStringArray; } - + public boolean equals(Object obj) { return toString().equals("" + obj); } - + public String toString() { StringBuffer buf = new StringBuffer("["); @@ -476,7 +476,7 @@ buf.append(",myFloat=" + myFloat); buf.append(",myFloat1=" + myFloat1); buf.append(",myFloat1Array=" + (myFloat1Array != null ? Arrays.asList(myFloat1Array) : null)); - buf.append(",myFloatArray=" + (myFloatArray != null ? Arrays.asList((Object[])JavaUtils.getWrapperValueArray(myFloatArray)) : null)); + buf.append(",myFloatArray=" + (myFloatArray != null ? Arrays.asList((Object[]) JavaUtils.getWrapperValueArray(myFloatArray)) : null)); buf.append(",myInt=" + myInt); buf.append(",myInt1=" + myInt1); buf.append(",myInt1Array=" + (myInt1Array != null ? Arrays.asList(myInt1Array) : null)); 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -37,7 +37,7 @@ import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -26,7 +26,7 @@ import javax.management.ObjectName; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.ObjectNameFactory; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -25,12 +25,11 @@ import javax.xml.rpc.handler.GenericHandler; import javax.xml.rpc.handler.MessageContext; import javax.xml.rpc.handler.soap.SOAPMessageContext; -import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPMessage; import org.jboss.logging.Logger; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -28,13 +28,12 @@ import javax.naming.InitialContext; import javax.xml.rpc.Service; import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPFactory; import junit.framework.Test; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -35,7 +35,7 @@ import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMWriter; /** * ComplexType cannot be constructed from attributes @@ -58,55 +58,55 @@ InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/DocumentTranslator"); DocumentTranslator port = (DocumentTranslator)service.getPort(DocumentTranslator.class); - + TDocumentHead tDocHead = new TDocumentHead("title", "en"); TDocumentBody tDocBody = new TDocumentBody(new String[] {"hi", "bye"}); TDocument tDocReq = new TDocument(tDocHead, tDocBody); TTranslationRequest tReq = new TTranslationRequest("es", tDocReq); - + TDocument tDocRes = port.translate(tReq); assertEquals("en", tDocRes.getHead().getLanguage()); assertEquals("title", tDocRes.getHead().getTitle()); assertEquals("hi", tDocRes.getBody().getParagraph()[0]); assertEquals("bye", tDocRes.getBody().getParagraph()[1]); } - + public void testSAAJAccess() throws Exception { - String reqStr = + String reqStr = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - " <env:Body>" + - " <sns:translationRequest targetLanguage='es' xmlns:sns='http://example.com/translator/types' xmlns:vendor='http://jbpm.org/bpel'>" + - " <sns:document>" + - " <head language='en' title='title'/>" + - " <body>" + - " <paragraph>hi</paragraph>" + - " <paragraph>bye</paragraph>" + - " </body>" + - " </sns:document>" + - " </sns:translationRequest>" + - " </env:Body>" + + " <env:Body>" + + " <sns:translationRequest targetLanguage='es' xmlns:sns='http://example.com/translator/types' xmlns:vendor='http://jbpm.org/bpel'>" + + " <sns:document>" + + " <head language='en' title='title'/>" + + " <body>" + + " <paragraph>hi</paragraph>" + + " <paragraph>bye</paragraph>" + + " </body>" + + " </sns:document>" + + " </sns:translationRequest>" + + " </env:Body>" + "</env:Envelope>"; - String resStr = + String resStr = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - "<env:Header/>" + - "<env:Body>" + - "<ns1:document xmlns:ns1='http://example.com/translator/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" + - "<head language='en' title='title'/>" + - "<body>" + - "<paragraph>hi</paragraph>" + - "<paragraph>bye</paragraph>" + - "</body>" + - "</ns1:document>" + - "</env:Body>" + + "<env:Header/>" + + "<env:Body>" + + "<ns1:document xmlns:ns1='http://example.com/translator/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" + + "<head language='en' title='title'/>" + + "<body>" + + "<paragraph>hi</paragraph>" + + "<paragraph>bye</paragraph>" + + "</body>" + + "</ns1:document>" + + "</env:Body>" + "</env:Envelope>"; SOAPMessage reqMsg = MessageFactory.newInstance().createMessage(null, new ByteArrayInputStream(reqStr.getBytes())); SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); SOAPMessage resMsg = con.call(reqMsg, "http://" + getServerHost() + ":8080/jaxrpc-jbws775/document"); SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope(); - + assertEquals(resStr, DOMWriter.printNode(resEnv, false)); } } 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -41,8 +41,8 @@ import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/ServerHandler.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -30,12 +30,12 @@ import javax.xml.soap.SOAPMessage; import org.jboss.logging.Logger; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMWriter; public class ServerHandler extends GenericHandler { private Logger log = Logger.getLogger(ServerHandler.class); - + public QName[] getHeaders() { return new QName[]{}; @@ -52,7 +52,7 @@ catch (SOAPException ex) { throw new RuntimeException(ex); - } + } return true; } @@ -67,7 +67,7 @@ catch (Exception ex) { throw new RuntimeException(ex); - } + } return true; } } 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/MessageJavaBean.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -35,7 +35,7 @@ import javax.xml.soap.SOAPMessage; import org.jboss.logging.Logger; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws955/JBWS955TestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -32,8 +32,8 @@ import javax.xml.soap.SOAPMessage; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.test.JBossWSTest; -import org.jboss.wsf.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -24,8 +24,6 @@ import java.util.Iterator; import java.util.List; -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.rpc.handler.HandlerInfo; @@ -34,10 +32,8 @@ import junit.framework.Test; import org.jboss.ws.core.jaxrpc.client.ServiceExt; -import org.jboss.ws.metadata.umdm.HandlerMetaData; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.framework.utils.ObjectNameFactory; /** * Test dynamic handlers @@ -75,12 +71,12 @@ String res = endpoint.testHandlers("InitalMessage"); assertEquals("InitalMessage|ClientRequest|ServerRequest|ServerResponse|ClientResponse", res); } - + public void testRemoveClientHandlers() throws Exception { HandlerRegistry registry = service.getDynamicHandlerRegistry(); QName portName = new QName(TARGET_NAMESPACE, "HandlerTestServicePort"); - + List infos = registry.getHandlerChain(portName); Iterator it = infos.iterator(); while (it.hasNext()) @@ -90,7 +86,7 @@ it.remove(); } registry.setHandlerChain(portName, infos); - + String res = endpoint.testHandlers("InitalMessage"); assertEquals("InitalMessage|ServerRequest|ServerResponse", res); } 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -22,7 +22,7 @@ import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -48,7 +48,7 @@ import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestServiceBean.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -35,8 +35,8 @@ import javax.xml.transform.dom.DOMSource; import org.jboss.logging.Logger; -import org.jboss.wsf.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/EmployeeRecordsImpl.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -28,7 +28,7 @@ import javax.activation.DataHandler; import javax.xml.transform.stream.StreamSource; -import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -28,7 +28,7 @@ import org.jboss.logging.Logger; import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.framework.utils.ObjectNameFactory; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -37,7 +37,7 @@ import org.jboss.ws.extensions.security.SecurityStore; import org.jboss.ws.extensions.security.Util; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -49,7 +49,7 @@ import org.jboss.ws.extensions.security.Util; import org.jboss.ws.extensions.security.WsuIdTarget; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -36,7 +36,7 @@ import org.jboss.ws.extensions.security.SecurityStore; import org.jboss.ws.extensions.security.Util; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -39,7 +39,7 @@ import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; import org.jboss.ws.core.StubExt; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.common.IOUtils; /** * @author Heiko Braun <heiko.braun(a)jboss.com&gt; @@ -49,7 +49,7 @@ public abstract class XOPBase extends JBossWSTest { private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg"); - + protected abstract XOPPing getPort(); // --------------------------------------------------------------------------------- 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -40,7 +40,7 @@ import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; import org.jboss.ws.core.StubExt; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -36,7 +36,7 @@ import org.jboss.ws.core.jaxrpc.client.CallImpl; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.framework.utils.ObjectNameFactory; +import org.jboss.wsf.common.ObjectNameFactory; /** * [JBWS-1178] Multiple virtual host and soap:address problem @@ -47,14 +47,14 @@ */ public class JBWS1178TestCase extends JBossWSTest { - + public static Test suite() { TestSetup testSetup = new JBossWSTestSetup(JBWS1178TestCase.class, "jaxws-jbws1178.war") { private final ObjectName objectName = ObjectNameFactory.create("jboss.ws:service=ServerConfig"); private String webServiceHost; - + public void setUp() throws Exception { // Setting the WebServiceHost to an empty string, causes the request host to be used. @@ -73,19 +73,19 @@ return testSetup; } - + public void testHostAddress() throws Exception { InetAddress inetAddr = InetAddress.getByName(getServerHost()); URL wsdlURL = new URL("http://" + inetAddr.getHostAddress() + ":8080/jaxws-jbws1178/testpattern?wsdl"); - + ServiceFactory factory = ServiceFactory.newInstance(); QName serviceName = new QName("http://org.jboss.ws/jbws1178", "TestEndpointService"); QName portName = new QName("http://org.jboss.ws/jbws1178", "TestEndpointPort"); Service service = factory.createService(wsdlURL, serviceName); CallImpl call = (CallImpl)service.createCall(portName); URL epURL = new URL(call.getEndpointMetaData().getEndpointAddress()); - + assertEquals(wsdlURL.getHost(), epURL.getHost()); } @@ -93,14 +93,14 @@ { InetAddress inetAddr = InetAddress.getByName(getServerHost()); URL wsdlURL = new URL("http://" + inetAddr.getHostName() + ":8080/jaxws-jbws1178/testpattern?wsdl"); - + ServiceFactory factory = ServiceFactory.newInstance(); QName serviceName = new QName("http://org.jboss.ws/jbws1178", "TestEndpointService"); QName portName = new QName("http://org.jboss.ws/jbws1178", "TestEndpointPort"); Service service = factory.createService(wsdlURL, serviceName); CallImpl call = (CallImpl)service.createCall(portName); URL epURL = new URL(call.getEndpointMetaData().getEndpointAddress()); - + assertEquals(wsdlURL.getHost(), epURL.getHost()); } } 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -36,8 +36,8 @@ import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -30,7 +30,7 @@ import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.common.IOUtils; /** * [JBWS-1666] Simplify jbosws jar dependencies 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointBean.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -30,7 +30,7 @@ import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -38,7 +38,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.utils.UUIDGenerator; import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -35,7 +35,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.DOMUtils; /** * A server side handler for the ws-addressing 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -25,7 +25,7 @@ import org.jboss.ws.extensions.addressing.EndpointReferenceImpl; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventSinkServlet.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -29,8 +29,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.jboss.wsf.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -31,7 +31,7 @@ import org.jboss.ws.extensions.eventing.jaxws.SubscribeResponse; import org.jboss.ws.extensions.eventing.mgmt.EventDispatcher; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -36,7 +36,7 @@ import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager; import org.jboss.ws.extensions.eventing.mgmt.SubscriptionTicket; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -40,8 +40,8 @@ import org.jboss.ws.tools.WSToolsConstants; import org.jboss.ws.tools.wsdl.WSDLWriter; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -47,8 +47,8 @@ import org.jboss.ws.tools.exceptions.JBossWSToolsException; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.JavaUtils; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -25,7 +25,7 @@ import org.jboss.ws.tools.WSTools; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -33,7 +33,7 @@ import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.tools.JavaToXSD; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -32,7 +32,7 @@ import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSTypeDefinition; import org.jboss.ws.tools.schema.SchemaTypeCreator; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -31,7 +31,7 @@ import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.spi.tools.WSContractProvider; -import org.jboss.wsf.framework.utils.JavaUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -28,7 +28,7 @@ import org.jboss.util.xml.DOMUtils; import org.jboss.ws.tools.WSTools; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -34,7 +34,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.core.soap.Style; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.IOUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -25,7 +25,7 @@ import org.jboss.ws.tools.WSTools; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -30,7 +30,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.tools.JavaToXSD; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -34,7 +34,7 @@ import org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils; import org.jboss.ws.tools.JavaToXSD; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardArraysTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardDoubleArraysTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -29,7 +29,7 @@ import org.jboss.test.ws.tools.WSToolsTest; import org.jboss.ws.Constants; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -37,7 +37,7 @@ import org.jboss.ws.metadata.jaxrpcmapping.WsdlMessageMapping; import org.jboss.ws.metadata.jaxrpcmapping.WsdlReturnValueMapping; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -32,7 +32,7 @@ import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidationHelper.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -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.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -42,7 +42,7 @@ import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.DOMUtils; /** * Test JAXWS asynchrous dispatch 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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -38,7 +38,7 @@ import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -39,7 +39,7 @@ import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -36,7 +36,7 @@ import org.jboss.logging.Logger; import org.jboss.wsf.test.GenericLogicalHandler; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -57,7 +57,7 @@ import javax.xml.registry.infomodel.User; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.framework.utils.ObjectNameFactory; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -36,7 +36,7 @@ import org.jboss.logging.Logger; import org.jboss.wsf.test.GenericLogicalHandler; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -35,8 +35,8 @@ import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -36,7 +36,7 @@ import org.jboss.logging.Logger; import org.jboss.wsf.test.GenericLogicalHandler; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -45,7 +45,7 @@ import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -46,7 +46,7 @@ import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.framework.utils.DOMUtils; +import org.jboss.wsf.common.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 17:54:43 UTC (rev 3939) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-07-18 18:03:28 UTC (rev 3940) @@ -46,8 +46,8 @@ import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.framework.utils.DOMUtils; -import org.jboss.wsf.framework.utils.DOMWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.DOMWriter; import org.w3c.dom.Element; /**