[jbossws-commits] JBossWS SVN: r3037 - in trunk: jbossws-core/src/java/org/jboss/ws/core/deployment and 69 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu May 10 03:36:04 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-05-10 03:36:03 -0400 (Thu, 10 May 2007)
New Revision: 3037
Added:
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/PortInfoImpl.java
Removed:
trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/JAXRPCClientDeployment.java
trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/JAXRPCDeployment.java
trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/JAXWSDeployment.java
trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/UnifiedDeploymentInfo.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/PortInfoImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/
trunk/jbossws-core/src/java/org/jboss/ws/metadata/webservices/
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/CommonClient.java
trunk/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java
trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/PublishContractDeployer.java
trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/ServiceEndpointPublisher.java
trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/UnifiedMetaDataDeployer.java
trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/WSDLFilePublisher.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializer.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializer.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializer.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerCallback.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/ServerHandlerChain.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/BindingExt.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/server/AbstractInvocationHandler.java
trunk/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java
trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistryMBean.java
trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfigMBean.java
trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServerHandlerDelegate.java
trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointGeneratorEJB.java
trunk/jbossws-core/src/java/org/jboss/ws/core/server/WSDLRequestHandler.java
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/DetailImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/HRefInlineHandler.java
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/NodeImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPBodyImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPDocument.java
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPElementImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPElementWriter.java
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPHeaderElementImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLContent.java
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java
trunk/jbossws-core/src/java/org/jboss/ws/extensions/addressing/EndpointReferenceImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/jaxws/AbstractSubscriptionManagerEndpoint.java
trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java
trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java
trunk/jbossws-core/src/java/org/jboss/ws/extensions/policy/Policy.java
trunk/jbossws-core/src/java/org/jboss/ws/extensions/policy/PolicyAlternative.java
trunk/jbossws-core/src/java/org/jboss/ws/extensions/policy/PolicyAssertion.java
trunk/jbossws-core/src/java/org/jboss/ws/extensions/policy/PolicyFactory.java
trunk/jbossws-core/src/java/org/jboss/ws/extensions/xop/XOPContext.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/CommonConfig.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/jaxrpc/CommonConfigJAXRPC.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/jaxws/CommonConfigJAXWS.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXRPC.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXWS.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java
trunk/jbossws-core/src/java/org/jboss/ws/tools/JavaToWSDL.java
trunk/jbossws-core/src/java/org/jboss/ws/tools/WebservicesXMLCreatorImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/tools/helpers/ReformatXML.java
trunk/jbossws-core/src/java/org/jboss/ws/tools/helpers/ToolsHelper.java
trunk/jbossws-core/src/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java
trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java
trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDLWriter.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/JBossWSTest.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/JBossWSTestHelper.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayMarshallerTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayMarshallerTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayUnmarshallerTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayMarshallerTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayUnmarshallerTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPEnvelopeTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/common/wsdl11/WSDLWithAnonTypesTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/interop/InteropClientConfig.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/interop/InteropConfigFactory.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws955/JBWS955TestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestServiceBean.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/oneway/JSR181OneWayTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webmethod/JSR181WebMethodTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/EventSinkServlet.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/WSToolsTest.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/enums/EnumTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws_204/StandardArraysTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws_204/StandardDoubleArraysTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java
Log:
Add sunri-jboss50
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/CommonClient.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/CommonClient.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -54,6 +54,7 @@
import org.jboss.ws.core.utils.HolderUtils;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
import org.jboss.ws.integration.ResourceLoaderAdapter;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
@@ -61,7 +62,6 @@
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
/**
* Provides support for the dynamic invocation of a service endpoint.
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -70,13 +70,13 @@
import org.jboss.ws.core.soap.UnboundHeader;
import org.jboss.ws.core.soap.attachment.AttachmentPartImpl;
import org.jboss.ws.core.soap.attachment.CIDGenerator;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.JavaUtils;
import org.jboss.ws.core.utils.MimeUtils;
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
import org.jboss.ws.metadata.umdm.TypesMetaData;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.xb.binding.NamespaceRegistry;
import org.w3c.dom.Element;
Deleted: trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/JAXRPCClientDeployment.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/JAXRPCClientDeployment.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/JAXRPCClientDeployment.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -1,41 +0,0 @@
-/*
- * 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.ws.core.deployment;
-
-//$Id$
-
-import org.jboss.ws.integration.deployment.Deployment.DeploymentType;
-
-/**
- * The container independent deployment info.
- *
- * @author Thomas.Diesler at jboss.org
- * @since 05-May-2006
- */
-public class JAXRPCClientDeployment extends UnifiedDeploymentInfo
-{
-
- public JAXRPCClientDeployment(DeploymentType type)
- {
- super(type);
- }
-}
Deleted: trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/JAXRPCDeployment.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/JAXRPCDeployment.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/JAXRPCDeployment.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -1,84 +0,0 @@
-/*
- * 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.ws.core.deployment;
-
-import java.io.InputStream;
-import java.net.URL;
-
-import org.jboss.ws.WSException;
-import org.jboss.ws.integration.UnifiedVirtualFile;
-import org.jboss.ws.integration.deployment.Deployment.DeploymentType;
-import org.jboss.ws.metadata.webservices.WebservicesFactory;
-import org.jboss.ws.metadata.webservices.WebservicesMetaData;
-import org.jboss.xb.binding.ObjectModelFactory;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
-
-// $Id$
-
-/**
- * The container independent deployment info.
- *
- * @author Thomas.Diesler at jboss.org
- * @since 05-May-2006
- */
-public class JAXRPCDeployment extends UnifiedDeploymentInfo
-{
- private WebservicesMetaData wsMetaData;
-
- public JAXRPCDeployment(DeploymentType type, WebservicesMetaData wsMetaData)
- {
- super(type);
- this.wsMetaData = wsMetaData;
- }
-
- public JAXRPCDeployment(DeploymentType type, UnifiedVirtualFile vfWebservices)
- {
- super(type);
-
- try
- {
- // Unmarshall webservices.xml
- URL webservicesURL = vfWebservices.toURL();
- InputStream is = webservicesURL.openStream();
- try
- {
- Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
- ObjectModelFactory factory = new WebservicesFactory(webservicesURL);
- wsMetaData = (WebservicesMetaData)unmarshaller.unmarshal(is, factory, null);
- }
- finally
- {
- is.close();
- }
- }
- catch (Exception ex)
- {
- WSException.rethrow(ex);
- }
- }
-
- public WebservicesMetaData getWebservicesMetaData()
- {
- return wsMetaData;
- }
-}
Deleted: trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/JAXWSDeployment.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/JAXWSDeployment.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/JAXWSDeployment.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -1,40 +0,0 @@
-/*
- * 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.ws.core.deployment;
-
-//$Id$
-
-import org.jboss.ws.integration.deployment.Deployment.DeploymentType;
-
-/**
- * The container independent deployment info.
- *
- * @author Thomas.Diesler at jboss.org
- * @since 29-Jun-2006
- */
-public class JAXWSDeployment extends UnifiedDeploymentInfo
-{
- public JAXWSDeployment(DeploymentType type)
- {
- super(type);
- }
-}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/PublishContractDeployer.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/PublishContractDeployer.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/PublishContractDeployer.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -27,6 +27,7 @@
import org.jboss.ws.integration.deployment.AbstractDeployer;
import org.jboss.ws.integration.deployment.Deployment;
+import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
import org.jboss.ws.integration.deployment.WSDeploymentException;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/ServiceEndpointPublisher.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/ServiceEndpointPublisher.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/ServiceEndpointPublisher.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -36,11 +36,12 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
import org.jboss.ws.core.utils.IOUtils;
import org.jboss.ws.core.utils.JavaUtils;
import org.jboss.ws.integration.Endpoint;
+import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Deleted: trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/UnifiedDeploymentInfo.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/UnifiedDeploymentInfo.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/UnifiedDeploymentInfo.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -1,144 +0,0 @@
-/*
- * 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.ws.core.deployment;
-
-// $Id: UnifiedDeploymentInfo.java 2923 2007-04-25 14:23:29Z thomas.diesler at jboss.com $
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.management.ObjectName;
-
-import org.jboss.ws.integration.UnifiedVirtualFile;
-import org.jboss.ws.integration.deployment.Deployment.DeploymentType;
-
-/**
- * The container independent deployment info.
- *
- * @author Thomas.Diesler at jboss.org
- * @since 05-May-2006
- */
-public class UnifiedDeploymentInfo
-{
- public UnifiedDeploymentInfo(DeploymentType type)
- {
- this.type = type;
- }
-
- /** The type of this deployment */
- public DeploymentType type;
- /** Sub deployments have a parent */
- public UnifiedDeploymentInfo parent;
- /** The suffix of the deployment url */
- public String simpleName;
- /** The URL for this deployment */
- public URL url;
- /** The virtual file for the deployment root */
- public UnifiedVirtualFile vfRoot;
- /** The string identifing this deployment **/
- public String name;
- /** The URL to the expanded webapp **/
- public URL webappURL;
- /** We can hold "typed" metadata */
- public Object metaData;
- /** The deployment classloader **/
- public ClassLoader classLoader;
- /** An optional ObjectName of the deployed object */
- public ObjectName deployedObject;
-
- /** An arbitrary map of state associated with the deployment */
- private Map<Class, Object> attachments = new HashMap<Class, Object>();
-
- public <T> T getAttachment(Class<T> key)
- {
- return (T)attachments.get(key);
- }
-
- public <T> T addAttachment(Class<T> key, T value)
- {
- return (T)attachments.put(key, value);
- }
-
- /** The sortName concatenated with the canonical names of all parents. */
- public String getCanonicalName()
- {
- String name = simpleName;
- if (parent != null)
- name = parent.getCanonicalName() + "/" + name;
- return name;
- }
-
- public URL getMetaDataFileURL(String resourcePath) throws IOException
- {
- URL resourceURL = null;
- if (resourcePath != null && resourcePath.length() > 0)
- {
- if (resourcePath.startsWith("/"))
- resourcePath = resourcePath.substring(1);
-
- try
- {
- // assign an absolute URL
- resourceURL = new URL(resourcePath);
- }
- catch (MalformedURLException ex)
- {
- // ignore
- }
-
- if (resourceURL == null && vfRoot != null)
- {
- UnifiedVirtualFile vfResource = vfRoot.findChild(resourcePath);
- resourceURL = vfResource.toURL();
- }
-
- if (resourceURL == null)
- {
- String deploymentPath = url.toExternalForm();
-
- if (deploymentPath.startsWith("jar:") && deploymentPath.endsWith("!/") == false)
- deploymentPath += "!/";
-
- if (deploymentPath.endsWith("/") == false)
- deploymentPath += "/";
-
- // assign a relative URL
- resourceURL = new URL(deploymentPath + resourcePath);
- }
- }
- return resourceURL;
- }
-
- public String toString()
- {
- StringBuilder builder = new StringBuilder();
- builder.append("[");
- builder.append("type=" + type);
- builder.append(",simpleName=" + simpleName);
- builder.append(",url=" + url);
- builder.append("]");
- return builder.toString();
- }
-}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/UnifiedMetaDataDeployer.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/UnifiedMetaDataDeployer.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/UnifiedMetaDataDeployer.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -25,6 +25,8 @@
import org.jboss.ws.integration.deployment.AbstractDeployer;
import org.jboss.ws.integration.deployment.Deployment;
+import org.jboss.ws.integration.deployment.JAXRPCDeployment;
+import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
import org.jboss.ws.integration.deployment.Deployment.DeploymentType;
import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder;
import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilderEJB3;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/WSDLFilePublisher.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/WSDLFilePublisher.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/WSDLFilePublisher.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -42,15 +42,16 @@
import org.jboss.util.NotImplementedException;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.IOUtils;
import org.jboss.ws.core.utils.ResourceURL;
+import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
import org.jboss.ws.integration.management.ServerConfig;
import org.jboss.ws.integration.management.ServerConfigFactory;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLWriter;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -30,9 +30,9 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.extensions.xop.jaxrpc.XOPUnmarshallerImpl;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.xb.binding.SimpleTypeBindings;
import org.jboss.xb.binding.sunday.xop.XOPUnmarshaller;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializer.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializer.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializer.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -27,7 +27,7 @@
import javax.xml.transform.Source;
import org.jboss.logging.Logger;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializer.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializer.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializer.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -29,7 +29,7 @@
import javax.xml.transform.Source;
import org.jboss.logging.Logger;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.xb.binding.NamespaceRegistry;
import org.jboss.xb.binding.SimpleTypeBindings;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -36,9 +36,9 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.JavaUtils;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializer.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializer.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializer.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -29,7 +29,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.soap.SOAPFactoryImpl;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -62,12 +62,12 @@
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.utils.JavaUtils;
import org.jboss.ws.extensions.xop.XOPContext;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.umdm.TypesMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
/** Provides support for the dynamic invocation of a service endpoint.
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -36,10 +36,10 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.jaxrpc.handler.ClientHandlerChain;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
/**
* Provides support for the programmatic configuration of
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -51,6 +51,7 @@
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaData;
@@ -58,7 +59,6 @@
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
/**
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerCallback.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerCallback.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerCallback.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -23,7 +23,7 @@
// $Id$
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
/**
* A handler callback for the EJB21 Invoker
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -40,11 +40,6 @@
import javax.xml.rpc.handler.HandlerChain;
import javax.xml.rpc.handler.HandlerInfo;
import javax.xml.rpc.handler.MessageContext;
-import javax.xml.rpc.soap.SOAPFaultException;
-import javax.xml.soap.Name;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPHeaderElement;
import javax.xml.soap.SOAPPart;
import org.jboss.logging.Logger;
@@ -53,11 +48,7 @@
import org.jboss.ws.core.soap.SOAPElementImpl;
import org.jboss.ws.core.soap.SOAPElementWriter;
import org.jboss.ws.core.soap.SOAPEnvelopeImpl;
-import org.jboss.ws.core.soap.SOAPMessageImpl;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.metadata.umdm.OperationMetaData;
-import org.jboss.ws.metadata.umdm.ParameterMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
/**
* Represents a list of handlers. All elements in the
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -41,10 +41,10 @@
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedInitParamMetaData;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.umdm.HandlerMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
/** Delegates to JAXRPC handlers
*
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/ServerHandlerChain.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/ServerHandlerChain.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/ServerHandlerChain.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -26,10 +26,9 @@
import java.util.List;
import java.util.Set;
-import javax.xml.namespace.QName;
import javax.xml.rpc.handler.MessageContext;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
/**
* Represents a list of handlers. All elements in the
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/BindingExt.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/BindingExt.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/BindingExt.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -26,7 +26,7 @@
import javax.xml.ws.Binding;
import javax.xml.ws.handler.Handler;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
// $Id$
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -30,7 +30,7 @@
import org.jboss.logging.Logger;
import org.jboss.util.NotImplementedException;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
/**
* The Binding interface is the base interface for JAXWS protocol bindings.
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -43,9 +43,9 @@
import org.jboss.ws.core.jaxrpc.binding.BindingException;
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.soap.UnboundHeader;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
/**
* The HTTPBinding interface is an abstraction for the XML/HTTP binding.
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -43,9 +43,9 @@
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.soap.SOAPMessageImpl;
import org.jboss.ws.core.soap.UnboundHeader;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
/** A binding for unprocessed SOAP Messages
*
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -51,9 +51,9 @@
import org.jboss.ws.core.soap.SOAPMessageImpl;
import org.jboss.ws.core.soap.UnboundHeader;
import org.jboss.ws.core.soap.XMLFragment;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
/** A BindingProvider for a JAXWS payload
*
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -35,8 +35,8 @@
import org.jboss.ws.core.CommonSOAP11Binding;
import org.jboss.ws.core.jaxws.SOAPFaultHelperJAXWS;
import org.jboss.ws.core.soap.SOAPFaultImpl;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.umdm.OperationMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
/**
* The JAXWS SOAP11Binding
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -33,14 +33,11 @@
import javax.xml.ws.handler.Handler;
import javax.xml.ws.soap.SOAPBinding;
-import org.jboss.util.NotImplementedException;
-import org.jboss.ws.Constants;
import org.jboss.ws.core.CommonSOAP12Binding;
-import org.jboss.ws.core.MessageAbstraction;
import org.jboss.ws.core.jaxws.SOAPFaultHelperJAXWS;
import org.jboss.ws.core.soap.SOAPFaultImpl;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.umdm.OperationMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
/**
* The SOAP11Binding
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -40,6 +40,7 @@
import javax.xml.ws.handler.Handler;
import javax.xml.ws.handler.HandlerResolver;
import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.PortInfo;
import javax.xml.ws.handler.soap.SOAPHandler;
import javax.xml.ws.http.HTTPBinding;
import javax.xml.ws.http.HTTPException;
@@ -62,9 +63,9 @@
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.metadata.config.Configurable;
import org.jboss.ws.metadata.config.ConfigurationProvider;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
/**
* Provides support for the dynamic invocation of a service endpoint.
@@ -103,8 +104,9 @@
private void initBindingHandlerChain(boolean clearExistingHandlers)
{
BindingExt binding = (BindingExt)getBindingProvider().getBinding();
- PortInfoImpl portInfo = new PortInfoImpl(epMetaData);
+ PortInfo portInfo = getPortInfo(epMetaData);
+
if (handlerResolver instanceof HandlerResolverImpl)
{
HandlerResolverImpl impl = (HandlerResolverImpl)handlerResolver;
@@ -381,7 +383,8 @@
return ((HandlerResolverImpl)handlerResolver).getHeaders();
Set<QName> headers = new HashSet<QName>();
- List<Handler> handlerChain = handlerResolver.getHandlerChain(new PortInfoImpl(epMetaData));
+ PortInfo portInfo = getPortInfo(epMetaData);
+ List<Handler> handlerChain = handlerResolver.getHandlerChain(portInfo);
if (handlerChain != null)
{
for (Handler handler : handlerChain)
@@ -398,4 +401,13 @@
Object bool = getRequestContext().get(BindingProvider.SESSION_MAINTAIN_PROPERTY);
return Boolean.TRUE.equals(bool);
}
+
+ private PortInfo getPortInfo(EndpointMetaData epMetaData)
+ {
+ QName serviceName = epMetaData.getServiceMetaData().getServiceName();
+ QName portName = epMetaData.getPortName();
+ String bindingID = epMetaData.getBindingId();
+ PortInfo portInfo = new PortInfoImpl(serviceName, portName, bindingID);
+ return portInfo;
+ }
}
\ No newline at end of file
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -35,9 +35,9 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.server.ServerHandlerDelegate;
import org.jboss.ws.core.soap.MessageContextAssociation;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
/**
* Delegates to JAXWS handlers
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -45,11 +45,11 @@
import org.jboss.logging.Logger;
import org.jboss.util.NotImplementedException;
import org.jboss.ws.WSException;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
/**
* HandlerResolver is an interface implemented by an application to get control over
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -41,7 +41,7 @@
import org.jboss.ws.core.MessageAbstraction;
import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.soap.*;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Deleted: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/PortInfoImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/PortInfoImpl.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/PortInfoImpl.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -1,91 +0,0 @@
-/*
- * 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.ws.core.jaxws.handler;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.handler.PortInfo;
-
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-
-/**
- * The PortInfo interface is used by a HandlerResolver to query information about the
- * port it is being asked to create a handler chain for.
- *
- * @author Thomas.Diesler at jboss.com
- * @since 03-May-2006
- */
-public class PortInfoImpl implements PortInfo
-{
- private QName serviceName;
- private QName portName;
- private String bindingID;
-
- public PortInfoImpl()
- {
- }
-
- public PortInfoImpl(EndpointMetaData epMetaData)
- {
- this.serviceName = epMetaData.getServiceMetaData().getServiceName();
- this.portName = epMetaData.getPortName();
- this.bindingID = epMetaData.getBindingId();
- }
-
- public PortInfoImpl(QName serviceName, QName portName, String bindingID)
- {
- this.serviceName = serviceName;
- this.portName = portName;
- this.bindingID = bindingID;
- }
-
- public String getBindingID()
- {
- return bindingID;
- }
-
- public QName getPortName()
- {
- return portName;
- }
-
- public QName getServiceName()
- {
- return serviceName;
- }
-
- public int hashCode()
- {
- return toString().hashCode();
- }
-
- public boolean equals(Object obj)
- {
- if (!(obj instanceof PortInfoImpl))
- return false;
- return (obj != null ? toString().equals(obj.toString()) : false);
- }
-
- public String toString()
- {
- return "[service=" + serviceName + ",port=" + portName + ",binding=" + bindingID + "]";
- }
-}
\ No newline at end of file
Added: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/PortInfoImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/PortInfoImpl.java (rev 0)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/PortInfoImpl.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -0,0 +1,82 @@
+/*
+ * 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.ws.core.jaxws.handler;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.handler.PortInfo;
+
+/**
+ * The PortInfo interface is used by a HandlerResolver to query information about the
+ * port it is being asked to create a handler chain for.
+ *
+ * @author Thomas.Diesler at jboss.com
+ * @since 03-May-2006
+ */
+public class PortInfoImpl implements PortInfo
+{
+ private QName serviceName;
+ private QName portName;
+ private String bindingID;
+
+ public PortInfoImpl()
+ {
+ }
+
+ public PortInfoImpl(QName serviceName, QName portName, String bindingID)
+ {
+ this.serviceName = serviceName;
+ this.portName = portName;
+ this.bindingID = bindingID;
+ }
+
+ public String getBindingID()
+ {
+ return bindingID;
+ }
+
+ public QName getPortName()
+ {
+ return portName;
+ }
+
+ public QName getServiceName()
+ {
+ return serviceName;
+ }
+
+ public int hashCode()
+ {
+ return toString().hashCode();
+ }
+
+ public boolean equals(Object obj)
+ {
+ if (!(obj instanceof PortInfoImpl))
+ return false;
+ return (obj != null ? toString().equals(obj.toString()) : false);
+ }
+
+ public String toString()
+ {
+ return "[service=" + serviceName + ",port=" + portName + ",binding=" + bindingID + "]";
+ }
+}
\ No newline at end of file
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -27,7 +27,6 @@
import java.io.InputStream;
import java.lang.reflect.Proxy;
import java.net.URL;
-import java.security.CodeSource;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -67,13 +66,13 @@
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
/**
@@ -153,8 +152,8 @@
{
for (UnifiedHandlerMetaData uhmd : UnifiedHandlerChainMetaData.getHandlers())
{
- HandlerMetaDataJAXWS handler = uhmd.getHandlerMetaDataJAXWS(HandlerType.ENDPOINT);
- serviceMetaData.addHandler(handler);
+ HandlerMetaDataJAXWS hmd = HandlerMetaDataJAXWS.newInstance(uhmd, HandlerType.ENDPOINT);
+ serviceMetaData.addHandler(hmd);
}
}
((HandlerResolverImpl)handlerResolver).initServiceHandlerChain(serviceMetaData);
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/AbstractInvocationHandler.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/server/AbstractInvocationHandler.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/AbstractInvocationHandler.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -61,10 +61,10 @@
import org.jboss.ws.integration.Endpoint;
import org.jboss.ws.integration.invocation.InvocationContext;
import org.jboss.ws.integration.invocation.InvocationHandler;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
/** An implementation handles invocations on the endpoint
*
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -39,10 +39,10 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
import org.jboss.ws.integration.Endpoint;
-import org.jboss.ws.integration.ObjectNameFactory;
import org.jboss.ws.integration.RequestHandler;
import org.jboss.ws.integration.management.EndpointRegistry;
import org.jboss.ws.integration.management.EndpointRegistryFactory;
+import org.jboss.ws.utils.ObjectNameFactory;
/**
* A servlet that is installed for every web service endpoint.
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistryMBean.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistryMBean.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistryMBean.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -23,8 +23,8 @@
import javax.management.ObjectName;
-import org.jboss.ws.integration.ObjectNameFactory;
import org.jboss.ws.integration.management.EndpointRegistry;
+import org.jboss.ws.utils.ObjectNameFactory;
/**
* MBean interface.
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfigMBean.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfigMBean.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfigMBean.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -23,8 +23,8 @@
import javax.management.ObjectName;
-import org.jboss.ws.integration.ObjectNameFactory;
import org.jboss.ws.integration.management.ServerConfig;
+import org.jboss.ws.utils.ObjectNameFactory;
/**
* MBean interface.
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServerHandlerDelegate.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServerHandlerDelegate.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServerHandlerDelegate.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -25,8 +25,8 @@
import org.jboss.ws.core.HeaderSource;
import org.jboss.ws.metadata.config.Configurable;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
/**
* @author Thomas.Diesler at jboss.org
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointGeneratorEJB.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointGeneratorEJB.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointGeneratorEJB.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -33,15 +33,15 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.deployment.UnifiedDeploymentInfo;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
+import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
import org.jboss.ws.integration.management.ServerConfig;
import org.jboss.ws.integration.management.ServerConfigFactory;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/WSDLRequestHandler.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -29,8 +29,8 @@
import java.net.URL;
import org.jboss.logging.Logger;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/DetailImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/DetailImpl.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/DetailImpl.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -34,7 +34,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -43,7 +43,7 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.Style;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Comment;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/HRefInlineHandler.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/HRefInlineHandler.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/HRefInlineHandler.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -33,8 +33,8 @@
import javax.xml.soap.Text;
import org.jboss.logging.Logger;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/NodeImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/NodeImpl.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/NodeImpl.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -31,8 +31,8 @@
import org.jboss.logging.Logger;
import org.jboss.util.NotImplementedException;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPBodyImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -37,7 +37,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Comment;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPDocument.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPDocument.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPDocument.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -21,7 +21,7 @@
*/
package org.jboss.ws.core.soap;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Comment;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPElementImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -41,7 +41,7 @@
import org.jboss.util.NotImplementedException;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPElementWriter.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPElementWriter.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPElementWriter.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -34,8 +34,8 @@
import javax.xml.soap.SOAPEnvelope;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
/**
* Writes a SAAJ elements to an output stream.
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -33,7 +33,7 @@
import javax.xml.soap.SOAPFault;
import org.jboss.logging.Logger;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPHeaderElementImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPHeaderElementImpl.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPHeaderElementImpl.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -37,7 +37,7 @@
import javax.xml.soap.SOAPHeaderElement;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Attr;
/**
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLContent.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLContent.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLContent.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -47,12 +47,12 @@
import org.jboss.ws.core.jaxrpc.binding.DeserializerSupport;
import org.jboss.ws.core.jaxrpc.binding.SerializationContext;
import org.jboss.ws.core.soap.attachment.SwapableMemoryDataSource;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.JavaUtils;
import org.jboss.ws.core.utils.MimeUtils;
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Comment;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -43,8 +43,8 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.binding.BufferedStreamResult;
import org.jboss.ws.core.jaxrpc.binding.BufferedStreamSource;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Deleted: trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -1,596 +0,0 @@
-/*
- * 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.ws.core.utils;
-
-// $Id$
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.WSException;
-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.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * DOM2 utilites
- *
- * @author Thomas.Diesler at jboss.org
- * @version $Revision$
- */
-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();
- builder.setEntityResolver(new JBossWSEntityResolver());
- return builder;
- }
- catch (ParserConfigurationException e)
- {
- throw new RuntimeException("Failed to create DocumentBuilder", e);
- }
- }
- };
-
- // 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 WSException("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 WSException("Source type not implemented: " + source.getClass().getName());
- }
-
- }
- catch (TransformerException ex)
- {
- IOException ioex = new IOException();
- ioex.initCause(ex);
- throw ioex;
- }
-
- return retElement;
- }
-}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/extensions/addressing/EndpointReferenceImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/extensions/addressing/EndpointReferenceImpl.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/addressing/EndpointReferenceImpl.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -40,9 +40,9 @@
import javax.xml.ws.addressing.soap.SOAPAddressingBuilder;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
import org.jboss.ws.extensions.addressing.soap.SOAPAddressingBuilderImpl;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-core/src/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -48,10 +48,10 @@
import org.jboss.util.NotImplementedException;
import org.jboss.ws.core.soap.NameImpl;
import org.jboss.ws.core.soap.SOAPFactoryImpl;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl;
import org.jboss.ws.extensions.addressing.EndpointReferenceImpl;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.xb.binding.NamespaceRegistry;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/jaxws/AbstractSubscriptionManagerEndpoint.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/jaxws/AbstractSubscriptionManagerEndpoint.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/jaxws/AbstractSubscriptionManagerEndpoint.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -41,10 +41,10 @@
import org.jboss.ws.annotation.EndpointConfig;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.soap.MessageContextAssociation;
-import org.jboss.ws.core.utils.DOMUtils;
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.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -53,7 +53,6 @@
import org.jboss.logging.Logger;
import org.jboss.util.naming.Util;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
import org.jboss.ws.core.utils.UUIDGenerator;
import org.jboss.ws.extensions.eventing.EventingConstants;
@@ -61,7 +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.ws.integration.ObjectNameFactory;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.ObjectNameFactory;
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -31,7 +31,7 @@
import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDeployment;
import org.jboss.ws.extensions.eventing.jaxws.EndpointReferenceType;
-import org.jboss.ws.integration.ObjectNameFactory;
+import org.jboss.ws.utils.ObjectNameFactory;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-core/src/java/org/jboss/ws/extensions/policy/Policy.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/extensions/policy/Policy.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/policy/Policy.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -29,8 +29,8 @@
import java.util.Iterator;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.xb.binding.NamespaceRegistry;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/extensions/policy/PolicyAlternative.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/extensions/policy/PolicyAlternative.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/policy/PolicyAlternative.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -29,8 +29,8 @@
import java.util.Iterator;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-core/src/java/org/jboss/ws/extensions/policy/PolicyAssertion.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/extensions/policy/PolicyAssertion.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/policy/PolicyAssertion.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -23,8 +23,8 @@
//$Id$
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/extensions/policy/PolicyFactory.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/extensions/policy/PolicyFactory.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/policy/PolicyFactory.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -29,7 +29,7 @@
import javax.xml.namespace.QName;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/extensions/xop/XOPContext.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/extensions/xop/XOPContext.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/xop/XOPContext.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -44,10 +44,10 @@
import org.jboss.ws.core.soap.SOAPElementImpl;
import org.jboss.ws.core.soap.SOAPMessageImpl;
import org.jboss.ws.core.soap.attachment.MimeConstants;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.JavaUtils;
import org.jboss.ws.core.utils.MimeUtils;
import org.jboss.ws.extensions.xop.jaxrpc.XOPMarshallerImpl;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.xb.binding.SimpleTypeBindings;
import org.jboss.xb.binding.sunday.xop.XOPMarshaller;
import org.jboss.xb.binding.sunday.xop.XOPObject;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -46,14 +46,13 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.deployment.UnifiedDeploymentInfo;
import org.jboss.ws.core.jaxrpc.Use;
import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl;
import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt;
import org.jboss.ws.extensions.eventing.EventingConstants;
import org.jboss.ws.extensions.eventing.EventingUtils;
import org.jboss.ws.extensions.eventing.metadata.EventingEpMetaExt;
-import org.jboss.ws.integration.ObjectNameFactory;
+import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
import org.jboss.ws.integration.management.ServerConfig;
import org.jboss.ws.integration.management.ServerConfigFactory;
import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData;
@@ -78,6 +77,7 @@
import org.jboss.ws.metadata.wsdl.WSDLService;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
+import org.jboss.ws.utils.ObjectNameFactory;
/** An abstract meta data builder.
*
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -36,15 +36,16 @@
import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory;
import org.jboss.ws.metadata.jaxrpcmapping.ServiceEndpointInterfaceMapping;
import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
+import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLEndpoint;
import org.jboss.ws.metadata.wsdl.WSDLService;
@@ -228,7 +229,8 @@
Set<String> portNames = uhmd.getPortNames();
if (portNames.size() == 0 || portNames.contains(portName.getLocalPart()))
{
- epMetaData.addHandler(uhmd.getHandlerMetaDataJAXRPC(HandlerType.ENDPOINT));
+ HandlerMetaDataJAXRPC hmd = HandlerMetaDataJAXRPC.newInstance(uhmd, HandlerType.ENDPOINT);
+ epMetaData.addHandler(hmd);
}
}
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -29,19 +29,20 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.deployment.JAXRPCDeployment;
+import org.jboss.ws.integration.deployment.JAXRPCDeployment;
import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.ServiceEndpointInterfaceMapping;
+import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
import org.jboss.ws.metadata.webservices.PortComponentMetaData;
import org.jboss.ws.metadata.webservices.WebserviceDescriptionMetaData;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
@@ -226,7 +227,8 @@
Set<String> portNames = uhmd.getPortNames();
if (portNames.size() == 0 || portNames.contains(portName.getLocalPart()))
{
- sepMetaData.addHandler(uhmd.getHandlerMetaDataJAXRPC(HandlerType.ENDPOINT));
+ HandlerMetaDataJAXRPC hmd = HandlerMetaDataJAXRPC.newInstance(uhmd, HandlerType.ENDPOINT);
+ sepMetaData.addHandler(hmd);
}
}
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -73,14 +73,15 @@
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.FaultMetaData;
+import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
import org.jboss.ws.metadata.umdm.TypeMappingMetaData;
import org.jboss.ws.metadata.umdm.TypesMetaData;
import org.jboss.ws.metadata.umdm.WrappedParameter;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
import org.jboss.ws.metadata.wsdl.WSDLBinding;
import org.jboss.ws.metadata.wsdl.WSDLBindingMessageReference;
import org.jboss.ws.metadata.wsdl.WSDLBindingOperation;
@@ -168,7 +169,8 @@
{
for (UnifiedHandlerMetaData uhmd : UnifiedHandlerChainMetaData.getHandlers())
{
- epMetaData.addHandler(uhmd.getHandlerMetaDataJAXWS(HandlerType.ENDPOINT));
+ HandlerMetaDataJAXWS hmd = HandlerMetaDataJAXWS.newInstance(uhmd, HandlerType.ENDPOINT);
+ epMetaData.addHandler(hmd);
}
}
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -30,7 +30,7 @@
import org.jboss.annotation.security.SecurityDomain;
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.deployment.UnifiedDeploymentInfo;
+import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -26,7 +26,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.deployment.UnifiedDeploymentInfo;
+import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -37,10 +37,10 @@
import javax.xml.ws.Service.Mode;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.deployment.UnifiedDeploymentInfo;
import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.soap.SOAPContentElement;
import org.jboss.ws.core.utils.JavaUtils;
+import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
import org.jboss.ws.metadata.builder.MetaDataBuilder;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -28,7 +28,7 @@
import org.jboss.ws.annotation.EndpointConfig;
import org.jboss.ws.annotation.WebContext;
-import org.jboss.ws.core.deployment.UnifiedDeploymentInfo;
+import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
import org.jboss.ws.integration.deployment.Deployment.DeploymentType;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -23,7 +23,10 @@
// $Id$
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.Writer;
import java.net.URL;
import javax.jws.HandlerChain;
@@ -34,23 +37,28 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.deployment.UnifiedDeploymentInfo;
import org.jboss.ws.core.utils.IOUtils;
+import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
import org.jboss.ws.metadata.builder.MetaDataBuilder;
-import org.jboss.ws.metadata.umdm.*;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.umdm.EndpointMetaData;
+import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS;
+import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
+import org.jboss.ws.metadata.umdm.ServiceMetaData;
+import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+import org.jboss.ws.metadata.webservices.PortComponentMetaData;
+import org.jboss.ws.metadata.webservices.WebserviceDescriptionMetaData;
+import org.jboss.ws.metadata.webservices.WebservicesFactory;
+import org.jboss.ws.metadata.webservices.WebservicesMetaData;
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.ws.metadata.wsse.WSSecurityConfigFactory;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
import org.jboss.ws.metadata.wsse.WSSecurityOMFactory;
-import org.jboss.ws.metadata.webservices.WebservicesMetaData;
-import org.jboss.ws.metadata.webservices.WebservicesFactory;
-import org.jboss.ws.metadata.webservices.WebserviceDescriptionMetaData;
-import org.jboss.ws.metadata.webservices.PortComponentMetaData;
-import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
-import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData;
import org.jboss.ws.tools.ToolsUtils;
import org.jboss.ws.tools.jaxws.JAXBWSDLGenerator;
import org.jboss.ws.tools.wsdl.WSDLGenerator;
@@ -230,9 +238,9 @@
{
for (UnifiedHandlerMetaData uhmd : handlerChain.getHandlers())
{
- HandlerMetaDataJAXWS handlerMetaDataJAXWS = uhmd.getHandlerMetaDataJAXWS(HandlerMetaData.HandlerType.ENDPOINT);
- sepMetaData.addHandler(handlerMetaDataJAXWS);
- log.debug("Contribute handler from webservices.xml: " + handlerMetaDataJAXWS.getHandlerName());
+ log.debug("Contribute handler from webservices.xml: " + uhmd.getHandlerName());
+ HandlerMetaDataJAXWS hmd = HandlerMetaDataJAXWS.newInstance(uhmd, HandlerType.ENDPOINT);
+ sepMetaData.addHandler(hmd);
}
}
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/CommonConfig.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/CommonConfig.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/CommonConfig.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -28,9 +28,9 @@
import java.util.ArrayList;
import java.util.List;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
/**
* A common configuration
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -28,13 +28,13 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.integration.ResourceLoaderAdapter;
import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.ws.metadata.config.binding.OMFactoryJAXRPC;
import org.jboss.ws.metadata.config.binding.OMFactoryJAXWS;
import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC;
import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.xb.binding.JBossXBException;
import org.jboss.xb.binding.Unmarshaller;
import org.jboss.xb.binding.UnmarshallerFactory;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/jaxrpc/CommonConfigJAXRPC.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/jaxrpc/CommonConfigJAXRPC.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/jaxrpc/CommonConfigJAXRPC.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -27,9 +27,10 @@
import org.jboss.ws.metadata.config.CommonConfig;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC;
// $Id$
@@ -82,7 +83,8 @@
{
for (UnifiedHandlerMetaData uhmd : handlerChain.getHandlers())
{
- handlers.add(uhmd.getHandlerMetaDataJAXRPC(type));
+ HandlerMetaDataJAXRPC hmd = HandlerMetaDataJAXRPC.newInstance(uhmd, type);
+ handlers.add(hmd);
}
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/jaxws/CommonConfigJAXWS.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/jaxws/CommonConfigJAXWS.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/config/jaxws/CommonConfigJAXWS.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -27,10 +27,10 @@
import org.jboss.ws.metadata.config.CommonConfig;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
// $Id$
@@ -82,9 +82,9 @@
{
for (UnifiedHandlerMetaData uhmd : handlerChain.getHandlers())
{
- HandlerMetaDataJAXWS handler = uhmd.getHandlerMetaDataJAXWS(type);
- handler.setEndpointMetaData(epMetaData);
- handlers.add(handler);
+ HandlerMetaDataJAXWS hmd = HandlerMetaDataJAXWS.newInstance(uhmd, type);
+ hmd.setEndpointMetaData(epMetaData);
+ handlers.add(hmd);
}
}
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -26,7 +26,7 @@
import javax.xml.namespace.QName;
import org.jboss.ws.metadata.config.ConfigurationProvider;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
/**
* Client side endpoint meta data.
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -23,6 +23,23 @@
// $Id$
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Observable;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.jws.soap.SOAPBinding.ParameterStyle;
+import javax.xml.namespace.QName;
+import javax.xml.rpc.ParameterMode;
+import javax.xml.ws.Service.Mode;
+
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
@@ -41,17 +58,14 @@
import org.jboss.ws.core.jaxws.client.DispatchBinding;
import org.jboss.ws.core.utils.JavaUtils;
import org.jboss.ws.integration.UnifiedVirtualFile;
-import org.jboss.ws.metadata.config.*;
+import org.jboss.ws.metadata.config.CommonConfig;
+import org.jboss.ws.metadata.config.Configurable;
+import org.jboss.ws.metadata.config.ConfigurationProvider;
+import org.jboss.ws.metadata.config.EndpointFeature;
+import org.jboss.ws.metadata.config.JBossWSConfigFactory;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.ParameterMode;
-import javax.xml.ws.Service.Mode;
-import java.lang.reflect.Method;
-import java.util.*;
-
/**
* A Service component describes a set of endpoints.
*
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -34,6 +34,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedInitParamMetaData;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
/**
* The common metdata data for a handler element
@@ -46,11 +47,6 @@
// provide logging
private final Logger log = Logger.getLogger(HandlerMetaData.class);
- public enum HandlerType
- {
- PRE, ENDPOINT, POST, ALL
- };
-
private transient EndpointMetaData epMetaData;
// The required <handler-name> element
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXRPC.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXRPC.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXRPC.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -26,6 +26,8 @@
import java.util.HashSet;
import java.util.Set;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
/**
* The JAXRPC metdata data for a handler element
@@ -33,15 +35,27 @@
* @author Thomas.Diesler at jboss.org
* @since 05-May-2006
*/
-public class HandlerMetaDataJAXRPC extends HandlerMetaData
+public class HandlerMetaDataJAXRPC extends HandlerMetaData
{
private static final long serialVersionUID = -5232305815202943509L;
-
+
// The optional <soap-role> elements
private Set<String> soapRoles = new HashSet<String>();
// The optional <port-name> elements
private Set<String> portNames = new HashSet<String>();
+ public static HandlerMetaDataJAXRPC newInstance(UnifiedHandlerMetaData uhmd, HandlerType type)
+ {
+ HandlerMetaDataJAXRPC hmd = new HandlerMetaDataJAXRPC(type);
+ hmd.setHandlerName(uhmd.getHandlerName());
+ hmd.setHandlerClassName(uhmd.getHandlerClass());
+ hmd.seiInitParams(uhmd.getInitParams());
+ hmd.setSoapHeaders(uhmd.getSoapHeaders());
+ hmd.setSoapRoles(uhmd.getSoapRoles());
+ hmd.setPortNames(uhmd.getPortNames());
+ return hmd;
+ }
+
public HandlerMetaDataJAXRPC(HandlerType type)
{
super(type);
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXWS.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXWS.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXWS.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -25,6 +25,9 @@
import javax.xml.namespace.QName;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
/**
* The JAXWS metdata data for a handler element
@@ -32,22 +35,38 @@
* @author Thomas.Diesler at jboss.org
* @since 05-May-2006
*/
-public class HandlerMetaDataJAXWS extends HandlerMetaData
+public class HandlerMetaDataJAXWS extends HandlerMetaData
{
private static final long serialVersionUID = 7631133188974299826L;
-
+
// The JAXWS service name pattern
private QName serviceNamePattern;
// The JAXWS port name pattern
private QName portNamePattern;
// The JAXWS protocol bindings
private String protocolBindings;
-
+
+ public static HandlerMetaDataJAXWS newInstance(UnifiedHandlerMetaData uhmd, HandlerType type)
+ {
+ HandlerMetaDataJAXWS hmd = new HandlerMetaDataJAXWS(type);
+ hmd.setHandlerName(uhmd.getHandlerName());
+ hmd.setHandlerClassName(uhmd.getHandlerClass());
+ hmd.seiInitParams(uhmd.getInitParams());
+ UnifiedHandlerChainMetaData handlerChain = uhmd.getHandlerChain();
+ if (handlerChain != null)
+ {
+ hmd.setProtocolBindings(handlerChain.getProtocolBindings());
+ hmd.setServiceNamePattern(handlerChain.getServiceNamePattern());
+ hmd.setPortNamePattern(handlerChain.getPortNamePattern());
+ }
+ return hmd;
+ }
+
public HandlerMetaDataJAXWS(HandlerType type)
{
super(type);
}
-
+
public QName getPortNamePattern()
{
return portNamePattern;
@@ -77,7 +96,7 @@
{
this.serviceNamePattern = serviceNamePattern;
}
-
+
public String toString()
{
StringBuffer buffer = new StringBuffer("\nHandlerMetaDataJAXWS:");
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -28,7 +28,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.metadata.config.ConfigurationProvider;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
/**
* Client side endpoint meta data.
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -43,9 +43,9 @@
import org.jboss.ws.core.jaxrpc.Use;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.SchemaBindingBuilder;
import org.jboss.ws.integration.UnifiedVirtualFile;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLTypes;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -57,8 +57,8 @@
import org.jboss.util.NotImplementedException;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.xb.binding.NamespaceRegistry;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/JavaToWSDL.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/tools/JavaToWSDL.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/tools/JavaToWSDL.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -35,7 +35,6 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.Style;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
@@ -43,6 +42,7 @@
import org.jboss.ws.tools.Configuration.OperationConfig;
import org.jboss.ws.tools.metadata.ToolsUnifiedMetaDataBuilder;
import org.jboss.ws.tools.wsdl.WSDLWriter;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/WebservicesXMLCreatorImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/tools/WebservicesXMLCreatorImpl.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/tools/WebservicesXMLCreatorImpl.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -31,13 +31,13 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
import org.jboss.ws.metadata.webservices.PortComponentMetaData;
import org.jboss.ws.metadata.webservices.WebserviceDescriptionMetaData;
import org.jboss.ws.metadata.webservices.WebservicesFactory;
import org.jboss.ws.metadata.webservices.WebservicesMetaData;
import org.jboss.ws.tools.interfaces.WebservicesXMLCreator;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.xb.binding.JBossXBException;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.Unmarshaller;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/helpers/ReformatXML.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/tools/helpers/ReformatXML.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/tools/helpers/ReformatXML.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -25,8 +25,8 @@
import java.io.FileNotFoundException;
import java.io.InputStream;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/helpers/ToolsHelper.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -40,7 +40,6 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.LiteralTypeMapping;
import org.jboss.ws.core.jaxrpc.Style;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
import org.jboss.ws.core.utils.IOUtils;
import org.jboss.ws.core.utils.JavaUtils;
@@ -68,6 +67,7 @@
import org.jboss.ws.tools.interfaces.WebservicesXMLCreator;
import org.jboss.ws.tools.mapping.MappingFileGenerator;
import org.jboss.ws.tools.wsdl.WSDLWriter;
+import org.jboss.ws.utils.DOMUtils;
/**
* Helper class used by the command line tool "jbossws"
Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderImpl.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderImpl.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -30,8 +30,8 @@
import javax.ejb.Stateless;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.deployment.UnifiedDeploymentInfo;
import org.jboss.ws.integration.ResourceLoaderAdapter;
+import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
import org.jboss.ws.integration.deployment.Deployment.DeploymentType;
import org.jboss.ws.metadata.builder.jaxws.JAXWSWebServiceMetaDataBuilder;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -73,7 +73,6 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.core.jaxrpc.Style;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
import org.jboss.ws.core.utils.ResourceURL;
import org.jboss.ws.metadata.wsdl.WSDLBinding;
@@ -102,6 +101,7 @@
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.ws.utils.DOMUtils;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -33,7 +33,6 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
import org.jboss.ws.metadata.wsdl.WSDLBinding;
import org.jboss.ws.metadata.wsdl.WSDLBindingMessageReference;
@@ -55,6 +54,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.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -38,11 +38,11 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.JBossWSEntityResolver;
import org.jboss.ws.core.utils.ResourceURL;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLException;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.EntityResolver;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDLWriter.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDLWriter.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDLWriter.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -32,7 +32,6 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
import org.jboss.ws.metadata.wsdl.DOMTypes;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
@@ -41,6 +40,7 @@
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.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/JBossWSTest.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/JBossWSTest.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/JBossWSTest.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -35,8 +35,8 @@
import junit.framework.TestCase;
import org.jboss.logging.Logger;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/JBossWSTestHelper.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -31,7 +31,7 @@
import javax.naming.NamingException;
import org.jboss.logging.Logger;
-import org.jboss.ws.integration.ObjectNameFactory;
+import org.jboss.ws.utils.ObjectNameFactory;
/**
* A JBossWS test helper that deals with test deployment/undeployment, etc.
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -47,10 +47,10 @@
import org.jboss.ws.core.soap.MessageFactoryImpl;
import org.jboss.ws.core.soap.SOAPMessageImpl;
import org.jboss.ws.core.soap.UnboundHeader;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
+import org.jboss.ws.utils.DOMUtils;
/**
* Test the SOAPBindingProvider
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayMarshallerTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayMarshallerTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayMarshallerTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -30,8 +30,8 @@
import org.jboss.test.ws.tools.WSToolsTest;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
+import org.jboss.ws.utils.DOMUtils;
/**
* Test the JAXB marshalling of array types
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -30,8 +30,8 @@
import org.jboss.test.ws.tools.WSToolsTest;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBUnmarshallerImpl;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
+import org.jboss.ws.utils.DOMUtils;
/**
* Test the JAXB marshalling of array types
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayMarshallerTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayMarshallerTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayMarshallerTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -32,8 +32,8 @@
import org.jboss.test.ws.tools.WSToolsTest;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
+import org.jboss.ws.utils.DOMUtils;
/**
* Test the JAXB marshalling of array types
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayUnmarshallerTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayUnmarshallerTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayUnmarshallerTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -32,8 +32,8 @@
import org.jboss.test.ws.tools.WSToolsTest;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBUnmarshallerImpl;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
+import org.jboss.ws.utils.DOMUtils;
/**
* Test the JAXB marshalling of array types
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayMarshallerTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayMarshallerTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayMarshallerTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -29,8 +29,8 @@
import org.jboss.test.ws.tools.WSToolsTest;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
+import org.jboss.ws.utils.DOMUtils;
/**
* Test the JAXB marshalling of array types
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayUnmarshallerTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayUnmarshallerTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayUnmarshallerTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -29,8 +29,8 @@
import org.jboss.test.ws.tools.WSToolsTest;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBUnmarshallerImpl;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
+import org.jboss.ws.utils.DOMUtils;
/**
* Test the JAXB marshalling of array types
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -32,9 +32,9 @@
import org.jboss.test.ws.tools.WSToolsTest;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory;
+import org.jboss.ws.utils.DOMUtils;
/**
* Test the JAXB marshalling of complex types
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -32,9 +32,9 @@
import org.jboss.test.ws.tools.WSToolsTest;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory;
+import org.jboss.ws.utils.DOMUtils;
/**
* Test the JAXB marshalling of complex types
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -33,9 +33,9 @@
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.MarshalException;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.PackageMapping;
+import org.jboss.ws.utils.DOMUtils;
/**
* Test the JAXB marshalling of a SimpleUserType
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -29,9 +29,9 @@
import org.jboss.test.ws.tools.WSToolsTest;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBUnmarshallerImpl;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.PackageMapping;
+import org.jboss.ws.utils.DOMUtils;
/**
* Test the JAXB unmarshalling of a SimpleUserType
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -40,8 +40,8 @@
import org.jboss.ws.Constants;
import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.soap.MessageFactoryImpl;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPEnvelopeTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPEnvelopeTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPEnvelopeTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -33,7 +33,7 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.Constants;
import org.jboss.ws.core.soap.MessageFactoryImpl;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -38,7 +38,7 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.Constants;
import org.jboss.ws.core.jaxrpc.SOAPFaultHelperJAXRPC;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
/**
* Test the SOAPFault
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -34,7 +34,7 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.core.soap.MessageFactoryImpl;
import org.jboss.ws.core.soap.NameImpl;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
/**
* Test the SOAPHeaderElement
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -36,7 +36,7 @@
import org.jboss.ws.Constants;
import org.jboss.ws.core.soap.MessageFactoryImpl;
import org.jboss.ws.core.soap.NameImpl;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
/**
* Test the SOAPHeader
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -23,8 +23,8 @@
import junit.framework.TestCase;
import org.jboss.ws.core.soap.XMLFragment;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
import javax.xml.transform.dom.DOMSource;
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -35,8 +35,8 @@
import javax.xml.transform.stream.StreamSource;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/wsdl11/WSDLWithAnonTypesTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/wsdl11/WSDLWithAnonTypesTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/wsdl11/WSDLWithAnonTypesTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -32,10 +32,10 @@
import org.apache.xerces.xs.XSTerm;
import org.apache.xerces.xs.XSTypeDefinition;
import org.jboss.test.ws.tools.WSToolsTest;
-import org.jboss.ws.core.utils.DOMUtils;
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.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/interop/InteropClientConfig.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/interop/InteropClientConfig.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/interop/InteropClientConfig.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.ws.interop;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.test.ws.interop.ClientScenario;
import org.w3c.dom.Element;
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/interop/InteropConfigFactory.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/interop/InteropConfigFactory.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/interop/InteropConfigFactory.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -22,7 +22,7 @@
package org.jboss.test.ws.interop;
import org.jboss.logging.Logger;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.test.ws.interop.ClientScenario;
import org.jboss.test.ws.interop.InteropClientConfig;
import org.w3c.dom.Element;
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -25,8 +25,8 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.StubExt;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.extensions.addressing.AddressingClientUtil;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
import javax.xml.namespace.QName;
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -34,7 +34,7 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Attr;
import org.w3c.dom.NamedNodeMap;
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -41,8 +41,8 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws955/JBWS955TestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws955/JBWS955TestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws955/JBWS955TestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -32,8 +32,8 @@
import javax.xml.soap.SOAPMessage;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -36,8 +36,8 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.jaxrpc.client.ServiceExt;
-import org.jboss.ws.integration.ObjectNameFactory;
import org.jboss.ws.metadata.umdm.HandlerMetaData;
+import org.jboss.ws.utils.ObjectNameFactory;
/**
* Test dynamic handlers
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -24,7 +24,7 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
/**
* A web service client that connects to a MDB endpoint.
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -51,7 +51,7 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestServiceBean.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestServiceBean.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestServiceBean.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -36,7 +36,7 @@
import javax.xml.transform.dom.DOMSource;
import org.jboss.logging.Logger;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -28,7 +28,7 @@
import org.jboss.logging.Logger;
import org.jboss.test.ws.JBossWSTestHelper;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.integration.ObjectNameFactory;
+import org.jboss.ws.utils.ObjectNameFactory;
/**
* A test setup that deploys process archives.
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -33,11 +33,11 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.core.soap.MessageFactoryImpl;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.extensions.security.Constants;
import org.jboss.ws.extensions.security.SecurityDecoder;
import org.jboss.ws.extensions.security.SecurityStore;
import org.jboss.ws.extensions.security.Util;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -33,8 +33,8 @@
import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.ResourceURL;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -41,7 +41,7 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.xml.sax.InputSource;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -39,9 +39,9 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -36,7 +36,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.jaxws.handler.GenericLogicalHandler;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -57,7 +57,7 @@
import javax.xml.registry.infomodel.User;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.ws.integration.ObjectNameFactory;
+import org.jboss.ws.utils.ObjectNameFactory;
/**
* Acts as the base class for Jaxr Test Cases
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -36,7 +36,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.jaxws.handler.GenericLogicalHandler;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/oneway/JSR181OneWayTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/oneway/JSR181OneWayTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/oneway/JSR181OneWayTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -35,8 +35,8 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -36,7 +36,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.jaxws.handler.GenericLogicalHandler;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -45,9 +45,9 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.ws.utils.DOMUtils;
/**
* Test a Provider<SOAPMessage>
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -46,9 +46,9 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webmethod/JSR181WebMethodTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webmethod/JSR181WebMethodTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webmethod/JSR181WebMethodTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -43,7 +43,7 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.soap.NameImpl;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -37,8 +37,8 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.UUIDGenerator;
+import org.jboss.ws.utils.DOMUtils;
/**
* A client side handler for the ws-addressing
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -35,7 +35,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
/**
* A server side handler for the ws-addressing
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -24,8 +24,8 @@
//$Id$
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.extensions.addressing.EndpointReferenceImpl;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/EventSinkServlet.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/EventSinkServlet.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/EventSinkServlet.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -29,8 +29,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -28,10 +28,10 @@
import junit.framework.Test;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.extensions.eventing.EventingConstants;
import org.jboss.ws.extensions.eventing.jaxws.SubscribeResponse;
import org.jboss.ws.extensions.eventing.mgmt.EventDispatcher;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -29,7 +29,6 @@
import javax.xml.namespace.QName;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.extensions.eventing.EventingConstants;
import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDeployment;
import org.jboss.ws.extensions.eventing.jaxws.AttributedURIType;
@@ -37,6 +36,7 @@
import org.jboss.ws.extensions.eventing.mgmt.Filter;
import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager;
import org.jboss.ws.extensions.eventing.mgmt.SubscriptionTicket;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -35,13 +35,13 @@
import org.jboss.test.ws.tools.sei.StandardJavaTypes;
import org.jboss.ws.Constants;
import org.jboss.ws.core.jaxrpc.Style;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.IOUtils;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.tools.JavaToWSDL;
import org.jboss.ws.tools.WSToolsConstants;
import org.jboss.ws.tools.wsdl.WSDLWriter;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -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.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/** Test the XSD schema generator
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/WSToolsTest.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/WSToolsTest.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/WSToolsTest.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -39,7 +39,6 @@
import org.jboss.test.ws.tools.validation.WSDLValidator;
import org.jboss.ws.Constants;
import org.jboss.ws.core.jaxrpc.Style;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.JavaUtils;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
@@ -49,6 +48,7 @@
import org.jboss.ws.tools.client.ServiceCreator;
import org.jboss.ws.tools.exceptions.JBossWSToolsException;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -29,13 +29,13 @@
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.core.jaxrpc.LiteralTypeMapping;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.WSDLToJava;
import org.jboss.ws.tools.client.ServiceCreator;
import org.jboss.ws.tools.mapping.MappingFileGenerator;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -27,12 +27,12 @@
import org.jboss.test.ws.tools.WSToolsTest;
import org.jboss.ws.Constants;
import org.jboss.ws.core.jaxrpc.Style;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.IOUtils;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.JavaToWSDL;
import org.jboss.ws.tools.WSToolsConstants;
import org.jboss.ws.tools.wsdl.WSDLWriter;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/enums/EnumTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -24,8 +24,8 @@
import java.io.FileInputStream;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.tools.WSTools;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -32,7 +32,6 @@
import org.jboss.ws.Constants;
import org.jboss.ws.core.jaxrpc.LiteralTypeMapping;
import org.jboss.ws.core.jaxrpc.Style;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.IOUtils;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.JavaToWSDL;
@@ -42,6 +41,7 @@
import org.jboss.ws.tools.interfaces.WSDLToJavaIntf;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
import org.jboss.ws.tools.wsdl.WSDLWriter;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -31,9 +31,9 @@
import org.jboss.test.ws.common.jbossxb.complex.Derived;
import org.jboss.test.ws.common.jbossxb.simple.SimpleUserType;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.tools.JavaToXSD;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -29,10 +29,10 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.jbws_161.customexceptions.UserException;
import org.jboss.test.ws.tools.sei.Derived;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSTypeDefinition;
import org.jboss.ws.tools.schema.SchemaTypeCreator;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -26,8 +26,8 @@
import java.io.FileReader;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.tools.WSTools;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -24,8 +24,8 @@
import java.io.FileInputStream;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.tools.WSTools;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -29,8 +29,8 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.jbws_204.wscompile.anontypes.Items;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.tools.JavaToXSD;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -31,10 +31,10 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.jbws_204.wscompile.nillabletypes.NillableType;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils;
import org.jboss.ws.tools.JavaToXSD;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws_204/StandardArraysTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws_204/StandardArraysTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws_204/StandardArraysTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -29,8 +29,8 @@
import org.jboss.test.ws.tools.WSToolsTest;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.tools.JavaToXSD;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws_204/StandardDoubleArraysTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws_204/StandardDoubleArraysTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws_204/StandardDoubleArraysTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -29,7 +29,7 @@
import org.jboss.test.ws.tools.WSToolsTest;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -27,7 +27,6 @@
import javax.xml.namespace.QName;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory;
import org.jboss.ws.metadata.jaxrpcmapping.MethodParamPartsMapping;
@@ -38,6 +37,7 @@
import org.jboss.ws.metadata.jaxrpcmapping.ServiceInterfaceMapping;
import org.jboss.ws.metadata.jaxrpcmapping.WsdlMessageMapping;
import org.jboss.ws.metadata.jaxrpcmapping.WsdlReturnValueMapping;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java 2007-05-10 07:33:24 UTC (rev 3036)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java 2007-05-10 07:36:03 UTC (rev 3037)
@@ -28,11 +28,11 @@
import javax.xml.namespace.QName;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.metadata.webservices.PortComponentMetaData;
import org.jboss.ws.metadata.webservices.WebserviceDescriptionMetaData;
import org.jboss.ws.metadata.webservices.WebservicesFactory;
import org.jboss.ws.metadata.webservices.WebservicesMetaData;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.Unmarshaller;
import org.jboss.xb.binding.UnmarshallerFactory;
More information about the jbossws-commits
mailing list