[jboss-svn-commits] JBossWS SVN: r907 - in branches/jbossws-1.0/src: main/java/org/jboss/ws/addressing main/java/org/jboss/ws/addressing/soap main/java/org/jboss/ws/binding/soap main/java/org/jboss/ws/deployment main/java/org/jboss/ws/eventing main/java/org/jboss/ws/eventing/deployment main/java/org/jboss/ws/eventing/mgmt main/java/org/jboss/ws/integration/jboss main/java/org/jboss/ws/integration/other main/java/org/jboss/ws/jaxrpc main/java/org/jboss/ws/jaxrpc/encoding main/java/org/jboss/ws/metadata/wsdl main/java/org/jboss/ws/metadata/wsdl/xmlschema main/java/org/jboss/ws/server main/java/org/jboss/ws/soap main/java/org/jboss/ws/tools main/java/org/jboss/ws/tools/helpers main/java/org/jboss/ws/utils main/java/org/jboss/ws/wspolicy main/java/org/jboss/ws/wsse main/java/org/jboss/ws/xop test/java/org/jboss/test/ws test/java/org/jboss/test/ws/addressing test/java/org/jboss/test/ws/addressing/replyto test/java/org/jboss/test/ws/binding test/java/org/jboss/test/ws/eventing test/java/org! /jboss/test/ws/interop/microsoft test/java/org/jboss/test/ws/interop/microsoft/addressing/wsa10 test/java/org/jboss/test/ws/jaxb/array test/java/org/jboss/test/ws/jaxb/complex test/java/org/jboss/test/ws/jaxb/docstyle test/java/org/jboss/test/ws/jaxb/simple test/java/org/jboss/test/ws/jbws434 test/java/org/jboss/test/ws/jbws720 test/java/org/jboss/test/ws/jbws775 test/java/org/jboss/test/ws/jbws812 test/java/org/jboss/test/ws/jbws947 test/java/org/jboss/test/ws/jbws955 test/java/org/jboss/test/ws/samples/jmstransport test/java/org/jboss/test/ws/samples/message test/java/org/jboss/test/ws/samples/wsaddressing test/java/org/jboss/test/ws/soap test/java/org/jboss/test/ws/tools test/java/org/jboss/test/ws/tools/clientside test/java/org/jboss/test/ws/tools/doclit test/java/org/jboss/test/ws/tools/enums test/java/org/jboss/test/ws/tools/holders test/java/org/jboss/test/ws/tools/java2xsd test/java/org/jboss/test/ws/tools/jbws1090 test/java/org/jboss/test/ws/tools/jbws818 test/java! /org/jboss/test/ws/tools/jbws_204 test/java/org/jboss/test/ws/tools/jsr181/webservice test/java/org/jboss/test/ws/tools/metadata test/java/org/jboss/test/ws/wsdl11 test/java/org/jboss/test/ws/wsse test/java/org/jboss/test/ws/xop
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Sep 7 01:51:04 EDT 2006
Author: thomas.diesler at jboss.com
Date: 2006-09-07 01:49:14 -0400 (Thu, 07 Sep 2006)
New Revision: 907
Added:
branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/DOMUtils.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/DOMWriter.java
Modified:
branches/jbossws-1.0/src/main/java/org/jboss/ws/addressing/EndpointReferenceImpl.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/addressing/soap/SOAPAddressingPropertiesImpl.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/binding/soap/SOAPBindingProvider.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/ServiceEndpointPublisher.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/SubscriptionManagerEndpointImpl.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/deployment/EventingEndpointDI.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/mgmt/Subscription.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointGenerator.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointGeneratorEJB21.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointGeneratorEJB3.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/other/DeploymentInfoAdaptor.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/SOAPFaultExceptionHelper.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/ElementDeserializer.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/ElementSerializer.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/QNameDeserializer.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPArrayDeserializer.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPElementDeserializer.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPElementSerializer.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Writer.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitionsFactory.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDLWriter.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpoint.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/server/WSDLFilePublisher.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/server/WSDLRequestHandler.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/DOMEnvelopeBuilder.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/NodeImpl.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPBodyElementMessage.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPBodyElementRpc.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPDocument.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPElementImpl.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPFactoryImpl.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPFaultImpl.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPPartImpl.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/STAXEnvelopeBuilder.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/WSDotXMLCreator.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/wspolicy/Policy.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/wspolicy/PolicyAlternative.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/wspolicy/PolicyAssertion.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/wspolicy/PolicyFactory.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/wsse/WSSecurityDispatcher.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPContext.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/JBossWSTest.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/addressing/EndpointReferenceTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/addressing/replyto/FaultToEndpointImpl.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/binding/SOAPBindingTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/eventing/EventSinkServlet.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/eventing/NotificationTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/eventing/SubscriptionManagerTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/interop/microsoft/InteropClientConfig.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/interop/microsoft/InteropConfigFactory.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/interop/microsoft/addressing/wsa10/AddressingTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/BigDecimalArrayMarshallerTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/BigDecimalArrayUnmarshallerTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/CalendarArrayMarshallerTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/CalendarArrayUnmarshallerTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/QNameArrayMarshallerTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/QNameArrayUnmarshallerTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/complex/ComplexTypeMarshallerTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/docstyle/DocumentStyleMarshallerTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/simple/SimpleUserTypeMarshallerTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/simple/SimpleUserTypeUnmarshallerTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws434/JBWS434TestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws720/GetProperty.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws775/JBWS775TestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws812/JBWS812TestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws812/ServerHandler.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws947/JBWS947TestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws947/MessageEndpointImpl.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws955/JBWS955TestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/jmstransport/JMSTransportTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/message/MessageTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/message/MessageTestServiceBean.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/wsaddressing/ClientHandler.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/wsaddressing/ServerHandler.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/soap/MessageFactoryTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/soap/SAAJElementWriterTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/soap/SOAPEnvelopeTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/soap/SOAPFaultTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/soap/SOAPHeaderTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardArraysTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardDoubleArraysTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jsr181/webservice/JavaToWSDLTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsdl11/WSDLWithAnonTypesTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsse/MicrosoftInteropTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsse/RoundTripTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsse/SunInteropTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/xop/XOPElementRPCTestCase.java
Log:
Pull from common DOMWriter, DOMUtils
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/addressing/EndpointReferenceImpl.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/addressing/EndpointReferenceImpl.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/addressing/EndpointReferenceImpl.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -38,8 +38,8 @@
import javax.xml.ws.addressing.ReferenceParameters;
import javax.xml.ws.addressing.soap.SOAPAddressingBuilder;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.WSException;
import org.jboss.ws.addressing.soap.SOAPAddressingBuilderImpl;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/addressing/soap/SOAPAddressingPropertiesImpl.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/addressing/soap/SOAPAddressingPropertiesImpl.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/addressing/soap/SOAPAddressingPropertiesImpl.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -46,7 +46,7 @@
import javax.xml.ws.addressing.soap.SOAPAddressingProperties;
import org.jboss.util.NotImplementedException;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.addressing.AddressingConstantsImpl;
import org.jboss.ws.addressing.AddressingPropertiesImpl;
import org.jboss.ws.addressing.EndpointReferenceImpl;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/binding/soap/SOAPBindingProvider.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/binding/soap/SOAPBindingProvider.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/binding/soap/SOAPBindingProvider.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -26,7 +26,7 @@
import org.apache.xerces.xs.XSElementDeclaration;
import org.apache.xerces.xs.XSTypeDefinition;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.binding.BindingException;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -35,7 +35,7 @@
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.WSException;
import org.jboss.ws.metadata.EndpointMetaData;
import org.jboss.ws.metadata.ServerEndpointMetaData;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/ServiceEndpointPublisher.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/ServiceEndpointPublisher.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/ServiceEndpointPublisher.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -32,8 +32,8 @@
import java.util.Map;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.WSException;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/SubscriptionManagerEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/SubscriptionManagerEndpointImpl.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/SubscriptionManagerEndpointImpl.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -23,7 +23,7 @@
// $Id$
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.Constants;
import org.jboss.ws.eventing.element.*;
import org.jboss.ws.eventing.mgmt.SubscriptionError;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/deployment/EventingEndpointDI.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/deployment/EventingEndpointDI.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/deployment/EventingEndpointDI.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -1,6 +1,6 @@
package org.jboss.ws.eventing.deployment;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
import java.io.IOException;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/mgmt/Subscription.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/mgmt/Subscription.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/mgmt/Subscription.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -26,7 +26,7 @@
import org.apache.xpath.XPathAPI;
import org.apache.xpath.objects.XObject;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.eventing.EventingConstants;
import org.jboss.ws.eventing.element.EndpointReference;
import org.jboss.ws.soap.SOAPConnectionImpl;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointGenerator.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointGenerator.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointGenerator.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -34,8 +34,8 @@
import org.jboss.logging.Logger;
import org.jboss.system.server.ServerConfig;
import org.jboss.system.server.ServerConfigLocator;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.WSException;
import org.jboss.ws.metadata.EndpointMetaData;
import org.jboss.ws.metadata.ServerEndpointMetaData;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointGeneratorEJB21.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointGeneratorEJB21.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointGeneratorEJB21.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -30,7 +30,7 @@
import org.jboss.logging.Logger;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.AssemblyDescriptorMetaData;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointGeneratorEJB3.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointGeneratorEJB3.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointGeneratorEJB3.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -34,7 +34,7 @@
import org.jboss.mx.util.MBeanProxy;
import org.jboss.mx.util.MBeanProxyCreationException;
import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.WSException;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/other/DeploymentInfoAdaptor.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/other/DeploymentInfoAdaptor.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/other/DeploymentInfoAdaptor.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -34,7 +34,7 @@
import javax.servlet.ServletContext;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.WSException;
import org.jboss.ws.deployment.UnifiedDeploymentInfo;
import org.jboss.ws.deployment.ServiceEndpointPublisher;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/SOAPFaultExceptionHelper.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/SOAPFaultExceptionHelper.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/SOAPFaultExceptionHelper.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -43,8 +43,8 @@
import javax.xml.soap.SOAPMessage;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.binding.BindingException;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/ElementDeserializer.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/ElementDeserializer.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/ElementDeserializer.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -26,7 +26,7 @@
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.binding.BindingException;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/ElementSerializer.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/ElementSerializer.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/ElementSerializer.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -26,7 +26,7 @@
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.binding.BindingException;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/QNameDeserializer.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/QNameDeserializer.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/QNameDeserializer.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -28,7 +28,7 @@
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.binding.BindingException;
import org.jboss.xb.binding.NamespaceRegistry;
import org.jboss.xb.binding.SimpleTypeBindings;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPArrayDeserializer.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPArrayDeserializer.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPArrayDeserializer.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -31,8 +31,8 @@
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.binding.BindingException;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPElementDeserializer.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPElementDeserializer.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPElementDeserializer.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -26,7 +26,7 @@
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.binding.BindingException;
import org.jboss.ws.soap.SOAPElementImpl;
import org.jboss.ws.soap.SOAPFactoryImpl;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPElementSerializer.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPElementSerializer.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPElementSerializer.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -27,7 +27,7 @@
import javax.xml.soap.SOAPElement;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.binding.BindingException;
import org.w3c.dom.NamedNodeMap;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -66,8 +66,8 @@
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.jaxrpc.Style;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Writer.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Writer.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Writer.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -32,8 +32,8 @@
import javax.wsdl.factory.WSDLFactory;
import javax.xml.namespace.QName;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitionsFactory.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitionsFactory.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitionsFactory.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -36,7 +36,7 @@
import javax.xml.parsers.DocumentBuilder;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.Constants;
import org.jboss.ws.utils.JBossWSEntityResolver;
import org.w3c.dom.Document;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDLWriter.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDLWriter.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDLWriter.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -30,8 +30,8 @@
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.Constants;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -54,8 +54,8 @@
import org.apache.xerces.xs.XSTerm;
import org.apache.xerces.xs.XSTypeDefinition;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.xb.binding.NamespaceRegistry;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpoint.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpoint.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpoint.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -24,7 +24,7 @@
// $Id$
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.binding.BindingException;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/server/WSDLFilePublisher.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/server/WSDLFilePublisher.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/server/WSDLFilePublisher.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -41,7 +41,7 @@
import org.jboss.logging.Logger;
import org.jboss.util.NotImplementedException;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.deployment.UnifiedDeploymentInfo;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/server/WSDLRequestHandler.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/server/WSDLRequestHandler.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/server/WSDLRequestHandler.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -28,7 +28,7 @@
import java.net.URL;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.metadata.EndpointMetaData;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/DOMEnvelopeBuilder.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/DOMEnvelopeBuilder.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/DOMEnvelopeBuilder.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -2,8 +2,8 @@
import org.w3c.dom.*;
import org.w3c.dom.Node;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.xb.binding.NamespaceRegistry;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.WSException;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/NodeImpl.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/NodeImpl.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/NodeImpl.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -31,8 +31,8 @@
import org.jboss.logging.Logger;
import org.jboss.util.NotImplementedException;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.WSException;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPBodyElementMessage.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPBodyElementMessage.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPBodyElementMessage.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -21,7 +21,7 @@
*/
package org.jboss.ws.soap;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMWriter;
import javax.xml.soap.Name;
import javax.xml.soap.SOAPBodyElement;
import java.io.Writer;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPBodyElementRpc.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPBodyElementRpc.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPBodyElementRpc.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -21,7 +21,7 @@
*/
package org.jboss.ws.soap;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.WSException;
import org.w3c.dom.Element;
import javax.xml.soap.Name;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -22,8 +22,8 @@
package org.jboss.ws.soap;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.binding.BindingException;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPDocument.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPDocument.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPDocument.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -21,7 +21,7 @@
*/
package org.jboss.ws.soap;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Comment;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPElementImpl.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPElementImpl.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPElementImpl.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -36,8 +36,8 @@
import javax.xml.soap.Text;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.Constants;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPFactoryImpl.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPFactoryImpl.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPFactoryImpl.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -30,7 +30,7 @@
import javax.xml.soap.SOAPFactory;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.Constants;
import org.jboss.ws.xop.XOPContext;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPFaultImpl.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPFaultImpl.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPFaultImpl.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -36,8 +36,8 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.xb.QNameBuilder;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.w3c.dom.Element;
/**
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPPartImpl.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPPartImpl.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPPartImpl.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -40,7 +40,7 @@
import org.jboss.logging.Logger;
import org.jboss.util.NotImplementedException;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Comment;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/STAXEnvelopeBuilder.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/STAXEnvelopeBuilder.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/STAXEnvelopeBuilder.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -1,7 +1,7 @@
package org.jboss.ws.soap;
import com.ctc.wstx.stax.WstxInputFactory;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.xb.binding.NamespaceRegistry;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/WSDotXMLCreator.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/WSDotXMLCreator.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/WSDotXMLCreator.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -30,8 +30,8 @@
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.WSException;
import org.jboss.ws.metadata.jsr109.PortComponentMetaData;
import org.jboss.ws.metadata.jsr109.WebserviceDescriptionMetaData;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -36,8 +36,8 @@
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.jaxrpc.LiteralTypeMapping;
Added: branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/DOMUtils.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/DOMUtils.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/DOMUtils.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -0,0 +1,506 @@
+/*
+ * 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.utils;
+
+// $Id$
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+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 org.jboss.logging.Logger;
+import org.jboss.util.xml.JBossEntityResolver;
+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 JBossEntityResolver());
+ 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 giveen 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);
+ }
+
+ 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;
+ }
+}
Property changes on: branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/DOMUtils.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/DOMWriter.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/DOMWriter.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/DOMWriter.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -0,0 +1,545 @@
+/*
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache at apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+package org.jboss.ws.utils;
+
+// $Id$
+
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * Traverse a DOM tree in order to print a document that is parsed.
+ *
+ * @author Andy Clark, IBM
+ * @author Thomas.Diesler at jboss.org
+ * @version $Revision$
+ */
+public class DOMWriter
+{
+ // Print writer
+ private PrintWriter out;
+ // True, if canonical output
+ private boolean canonical;
+ // True, if pretty printing should be used
+ private boolean prettyprint;
+ // True, if the XML declaration should be written
+ private boolean writeXMLDeclaration;
+ // Explicit character set encoding
+ private String charsetName;
+ // indent for the pretty printer
+ private int prettyIndent;
+ // True, if the XML declaration has been written
+ private boolean wroteXMLDeclaration;
+ // The node that started the write
+ private Node rootNode;
+
+ public DOMWriter(Writer w)
+ {
+ this.out = new PrintWriter(w);
+ }
+
+ public DOMWriter(OutputStream stream)
+ {
+ try
+ {
+ this.out = new PrintWriter(new OutputStreamWriter(stream, "UTF-8"));
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ // ignore, UTF-8 should be available
+ }
+ }
+
+ public DOMWriter(OutputStream stream, String charsetName)
+ {
+ try
+ {
+ this.out = new PrintWriter(new OutputStreamWriter(stream, charsetName));
+ this.charsetName = charsetName;
+ this.writeXMLDeclaration = true;
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ throw new IllegalArgumentException("Unsupported encoding: " + charsetName);
+ }
+ }
+
+ /**
+ * Print a node with explicit prettyprinting.
+ * The defaults for all other DOMWriter properties apply.
+ *
+ */
+ public static String printNode(Node node, boolean prettyprint)
+ {
+ StringWriter strw = new StringWriter();
+ new DOMWriter(strw).setPrettyprint(prettyprint).print(node);
+ return strw.toString();
+ }
+
+ public boolean isCanonical()
+ {
+ return canonical;
+ }
+
+ /**
+ * Set wheter entities should appear in their canonical form.
+ * The default is false.
+ */
+ public DOMWriter setCanonical(boolean canonical)
+ {
+ this.canonical = canonical;
+ return this;
+ }
+
+ public boolean isPrettyprint()
+ {
+ return prettyprint;
+ }
+
+ /**
+ * Set wheter element should be indented.
+ * The default is false.
+ */
+ public DOMWriter setPrettyprint(boolean prettyprint)
+ {
+ this.prettyprint = prettyprint;
+ return this;
+ }
+
+ public boolean isWriteXMLDeclaration()
+ {
+ return writeXMLDeclaration;
+ }
+
+ /**
+ * Set wheter the XML declaration should be written.
+ * The default is false.
+ */
+ public DOMWriter setWriteXMLDeclaration(boolean writeXMLDeclaration)
+ {
+ this.writeXMLDeclaration = writeXMLDeclaration;
+ return this;
+ }
+
+ public void print(Node node)
+ {
+ rootNode = node;
+ printInternal(node, false);
+ }
+
+ private void printInternal(Node node, boolean indentEndMarker)
+ {
+ // is there anything to do?
+ if (node == null)
+ {
+ return;
+ }
+
+ // JBAS-2117 - Don't skip the DOCUMENT_NODE
+ // if (node instanceof Document) node = ((Document)node).getDocumentElement();
+
+ if (wroteXMLDeclaration == false && writeXMLDeclaration == true && canonical == false)
+ {
+ out.print("<?xml version='1.0'");
+ if (charsetName != null)
+ out.print(" encoding='" + charsetName + "'");
+
+ out.println("?>");
+ wroteXMLDeclaration = true;
+ }
+
+ int type = node.getNodeType();
+ boolean hasChildNodes = node.getChildNodes().getLength() > 0;
+
+ String nodeName = node.getNodeName();
+ switch (type)
+ {
+ // print document
+ case Node.DOCUMENT_NODE:
+ {
+ NodeList children = node.getChildNodes();
+ for (int iChild = 0; iChild < children.getLength(); iChild++)
+ {
+ printInternal(children.item(iChild), false);
+ }
+ out.flush();
+ break;
+ }
+
+ // print element with attributes
+ case Node.ELEMENT_NODE:
+ {
+ Element element = (Element)node;
+ if (prettyprint)
+ {
+ for (int i = 0; i < prettyIndent; i++)
+ {
+ out.print(' ');
+ }
+ prettyIndent++;
+ }
+
+ out.print('<');
+ out.print(nodeName);
+
+ Map nsMap = new HashMap();
+ String elPrefix = node.getPrefix();
+ if (elPrefix != null)
+ {
+ String nsURI = getNamespaceURI(elPrefix, element, rootNode);
+ nsMap.put(elPrefix, nsURI);
+ }
+
+ Attr attrs[] = sortAttributes(node.getAttributes());
+ for (int i = 0; i < attrs.length; i++)
+ {
+ Attr attr = attrs[i];
+ String atPrefix = attr.getPrefix();
+ String atName = attr.getNodeName();
+ String atValue = normalize(attr.getNodeValue());
+
+ if (atPrefix != null && (atPrefix.equals("xmlns") || atPrefix.equals("xml")) == false)
+ {
+ String nsURI = getNamespaceURI(atPrefix, element, rootNode);
+ nsMap.put(atPrefix, nsURI);
+ }
+
+ out.print(" " + atName + "='" + atValue + "'");
+ }
+
+ // Add missing namespace declaration
+ Iterator itPrefix = nsMap.keySet().iterator();
+ while (itPrefix.hasNext())
+ {
+ String prefix = (String)itPrefix.next();
+ String nsURI = (String)nsMap.get(prefix);
+ if (nsURI == null)
+ {
+ nsURI = getNamespaceURI(prefix, element, null);
+ out.print(" xmlns:" + prefix + "='" + nsURI + "'");
+ }
+ }
+
+ if (hasChildNodes)
+ {
+ out.print('>');
+ }
+
+ // Find out if the end marker is indented
+ indentEndMarker = isEndMarkerIndented(node);
+
+ if (indentEndMarker)
+ {
+ out.print('\n');
+ }
+
+ NodeList childNodes = node.getChildNodes();
+ int len = childNodes.getLength();
+ for (int i = 0; i < len; i++)
+ {
+ Node childNode = childNodes.item(i);
+ printInternal(childNode, false);
+ }
+ break;
+ }
+
+ // handle entity reference nodes
+ case Node.ENTITY_REFERENCE_NODE:
+ {
+ if (canonical)
+ {
+ NodeList children = node.getChildNodes();
+ if (children != null)
+ {
+ int len = children.getLength();
+ for (int i = 0; i < len; i++)
+ {
+ printInternal(children.item(i), false);
+ }
+ }
+ }
+ else
+ {
+ out.print('&');
+ out.print(nodeName);
+ out.print(';');
+ }
+ break;
+ }
+
+ // print cdata sections
+ case Node.CDATA_SECTION_NODE:
+ {
+ if (canonical)
+ {
+ out.print(normalize(node.getNodeValue()));
+ }
+ else
+ {
+ out.print("<![CDATA[");
+ out.print(node.getNodeValue());
+ out.print("]]>");
+ }
+ break;
+ }
+
+ // print text
+ case Node.TEXT_NODE:
+ {
+ String text = normalize(node.getNodeValue());
+ if (prettyprint == false || text.trim().length() > 0)
+ out.print(text);
+ break;
+ }
+
+ // print processing instruction
+ case Node.PROCESSING_INSTRUCTION_NODE:
+ {
+ out.print("<?");
+ out.print(nodeName);
+ String data = node.getNodeValue();
+ if (data != null && data.length() > 0)
+ {
+ out.print(' ');
+ out.print(data);
+ }
+ out.print("?>");
+ break;
+ }
+
+ // print comment
+ case Node.COMMENT_NODE:
+ {
+ for (int i = 0; i < prettyIndent; i++)
+ {
+ out.print(' ');
+ }
+
+ out.print("<!--");
+ String data = node.getNodeValue();
+ if (data != null)
+ {
+ out.print(data);
+ }
+ out.print("-->");
+
+ if (prettyprint)
+ {
+ out.print('\n');
+ }
+
+ break;
+ }
+ }
+
+ if (type == Node.ELEMENT_NODE)
+ {
+ if (prettyprint)
+ prettyIndent--;
+
+ if (hasChildNodes == false)
+ {
+ out.print("/>");
+ }
+ else
+ {
+ if (indentEndMarker)
+ {
+ for (int i = 0; i < prettyIndent; i++)
+ {
+ out.print(' ');
+ }
+ }
+
+ out.print("</");
+ out.print(nodeName);
+ out.print('>');
+ }
+
+ if (prettyIndent > 0)
+ {
+ out.print('\n');
+ }
+ }
+ out.flush();
+ }
+
+ private String getNamespaceURI(String prefix, Element element, Node stopNode)
+ {
+ Node parent = element.getParentNode();
+ String nsURI = element.getAttribute("xmlns:" + prefix);
+ if (nsURI.length() == 0 && element != stopNode && parent instanceof Element)
+ return getNamespaceURI(prefix, (Element)parent, stopNode);
+
+ return (nsURI.length() > 0 ? nsURI : null);
+ }
+
+ private boolean isEndMarkerIndented(Node node)
+ {
+ if (prettyprint)
+ {
+ NodeList childNodes = node.getChildNodes();
+ int len = childNodes.getLength();
+ for (int i = 0; i < len; i++)
+ {
+ Node children = childNodes.item(i);
+ if (children.getNodeType() == Node.ELEMENT_NODE)
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /** Returns a sorted list of attributes. */
+ private Attr[] sortAttributes(NamedNodeMap attrs)
+ {
+
+ int len = (attrs != null) ? attrs.getLength() : 0;
+ Attr array[] = new Attr[len];
+ for (int i = 0; i < len; i++)
+ {
+ array[i] = (Attr)attrs.item(i);
+ }
+ for (int i = 0; i < len - 1; i++)
+ {
+ String name = array[i].getNodeName();
+ int index = i;
+ for (int j = i + 1; j < len; j++)
+ {
+ String curName = array[j].getNodeName();
+ if (curName.compareTo(name) < 0)
+ {
+ name = curName;
+ index = j;
+ }
+ }
+ if (index != i)
+ {
+ Attr temp = array[i];
+ array[i] = array[index];
+ array[index] = temp;
+ }
+ }
+ return (array);
+ }
+
+ /** Normalizes the given string. */
+ private String normalize(String s)
+ {
+ StringBuffer str = new StringBuffer();
+
+ int len = (s != null) ? s.length() : 0;
+ for (int i = 0; i < len; i++)
+ {
+ char ch = s.charAt(i);
+ switch (ch)
+ {
+ case '<':
+ {
+ str.append("<");
+ break;
+ }
+ case '>':
+ {
+ str.append(">");
+ break;
+ }
+ case '&':
+ {
+ str.append("&");
+ break;
+ }
+ case '"':
+ {
+ str.append(""");
+ break;
+ }
+ case '\r':
+ case '\n':
+ {
+ if (canonical)
+ {
+ str.append("&#");
+ str.append(Integer.toString(ch));
+ str.append(';');
+ break;
+ }
+ // else, default append char
+ }
+ default:
+ {
+ str.append(ch);
+ }
+ }
+ }
+ return (str.toString());
+ }
+}
\ No newline at end of file
Property changes on: branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/DOMWriter.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/wspolicy/Policy.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/wspolicy/Policy.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/wspolicy/Policy.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -28,8 +28,8 @@
import java.util.Collection;
import java.util.Iterator;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.WSException;
import org.jboss.xb.binding.NamespaceRegistry;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/wspolicy/PolicyAlternative.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/wspolicy/PolicyAlternative.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/wspolicy/PolicyAlternative.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -28,8 +28,8 @@
import java.util.Collection;
import java.util.Iterator;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.WSException;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/wspolicy/PolicyAssertion.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/wspolicy/PolicyAssertion.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/wspolicy/PolicyAssertion.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -23,8 +23,8 @@
//$Id$
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/wspolicy/PolicyFactory.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/wspolicy/PolicyFactory.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/wspolicy/PolicyFactory.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -28,7 +28,7 @@
import javax.xml.namespace.QName;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.WSException;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/wsse/WSSecurityDispatcher.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/wsse/WSSecurityDispatcher.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/wsse/WSSecurityDispatcher.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -33,7 +33,7 @@
import javax.xml.soap.SOAPHeader;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.WSException;
import org.jboss.ws.jaxrpc.StubExt;
import org.jboss.ws.metadata.EndpointMetaData;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPContext.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPContext.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPContext.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -22,7 +22,7 @@
package org.jboss.ws.xop;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.jaxrpc.StubExt;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/JBossWSTest.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/JBossWSTest.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/JBossWSTest.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -36,7 +36,7 @@
import org.apache.xerces.xs.XSModel;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.tools.JavaToXSD;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/addressing/EndpointReferenceTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/addressing/EndpointReferenceTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/addressing/EndpointReferenceTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -24,7 +24,7 @@
//$Id$
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.addressing.EndpointReferenceImpl;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/addressing/replyto/FaultToEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/addressing/replyto/FaultToEndpointImpl.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/addressing/replyto/FaultToEndpointImpl.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -35,7 +35,7 @@
import javax.xml.soap.SOAPFault;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMWriter;
/**
* WS-Addressing service endpoint
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/binding/SOAPBindingTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/binding/SOAPBindingTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/binding/SOAPBindingTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -35,7 +35,7 @@
import javax.xml.soap.SOAPMessage;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.Constants;
import org.jboss.ws.binding.BindingProvider;
import org.jboss.ws.binding.EndpointInvocation;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/eventing/EventSinkServlet.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/eventing/EventSinkServlet.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/eventing/EventSinkServlet.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -21,8 +21,8 @@
*/
package org.jboss.test.ws.eventing;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.w3c.dom.Element;
import javax.servlet.ServletException;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/eventing/NotificationTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/eventing/NotificationTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/eventing/NotificationTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -25,7 +25,7 @@
import junit.framework.Test;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.eventing.EventingConstants;
import org.jboss.ws.eventing.element.SubscribeResponse;
import org.jboss.ws.eventing.mgmt.EventDispatcher;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/eventing/SubscriptionManagerTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/eventing/SubscriptionManagerTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/eventing/SubscriptionManagerTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -24,7 +24,7 @@
// $Id$
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.eventing.EventingConstants;
import org.jboss.ws.eventing.deployment.EventingEndpointDI;
import org.jboss.ws.eventing.element.EndpointReference;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/interop/microsoft/InteropClientConfig.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/interop/microsoft/InteropClientConfig.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/interop/microsoft/InteropClientConfig.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.ws.interop.microsoft;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
import java.net.URL;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/interop/microsoft/InteropConfigFactory.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/interop/microsoft/InteropConfigFactory.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/interop/microsoft/InteropConfigFactory.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -22,7 +22,7 @@
package org.jboss.test.ws.interop.microsoft;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
import java.io.IOException;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/interop/microsoft/addressing/wsa10/AddressingTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/interop/microsoft/addressing/wsa10/AddressingTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/interop/microsoft/addressing/wsa10/AddressingTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -5,7 +5,7 @@
import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.test.ws.interop.microsoft.ClientScenario;
import org.jboss.test.ws.interop.microsoft.InteropConfigFactory;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.addressing.AddressingClientUtil;
import org.jboss.ws.jaxrpc.StubExt;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/BigDecimalArrayMarshallerTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/BigDecimalArrayMarshallerTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/BigDecimalArrayMarshallerTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -28,7 +28,7 @@
import org.apache.xerces.xs.XSModel;
import org.jboss.test.ws.tools.WSToolsTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.jaxb.JAXBConstants;
import org.jboss.ws.jaxb.JBossXBMarshallerImpl;
import org.jboss.ws.jaxb.JAXBMarshaller;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/BigDecimalArrayUnmarshallerTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/BigDecimalArrayUnmarshallerTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/BigDecimalArrayUnmarshallerTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -28,7 +28,7 @@
import org.apache.xerces.xs.XSModel;
import org.jboss.test.ws.tools.WSToolsTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.jaxb.JAXBConstants;
import org.jboss.ws.jaxb.JBossXBUnmarshallerImpl;
import org.jboss.ws.jaxb.JAXBUnmarshaller;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/CalendarArrayMarshallerTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/CalendarArrayMarshallerTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/CalendarArrayMarshallerTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -30,7 +30,7 @@
import org.apache.xerces.xs.XSModel;
import org.jboss.test.ws.tools.WSToolsTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.jaxb.JAXBConstants;
import org.jboss.ws.jaxb.JBossXBMarshallerImpl;
import org.jboss.ws.jaxb.JAXBMarshaller;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/CalendarArrayUnmarshallerTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/CalendarArrayUnmarshallerTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/CalendarArrayUnmarshallerTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -30,7 +30,7 @@
import org.apache.xerces.xs.XSModel;
import org.jboss.test.ws.tools.WSToolsTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.jaxb.JAXBConstants;
import org.jboss.ws.jaxb.JBossXBUnmarshallerImpl;
import org.jboss.ws.jaxb.JAXBUnmarshaller;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/QNameArrayMarshallerTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/QNameArrayMarshallerTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/QNameArrayMarshallerTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -27,7 +27,7 @@
import org.apache.xerces.xs.XSModel;
import org.jboss.test.ws.tools.WSToolsTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.jaxb.JAXBConstants;
import org.jboss.ws.jaxb.JBossXBMarshallerImpl;
import org.jboss.ws.jaxb.JAXBMarshaller;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/QNameArrayUnmarshallerTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/QNameArrayUnmarshallerTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/array/QNameArrayUnmarshallerTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -27,7 +27,7 @@
import org.apache.xerces.xs.XSModel;
import org.jboss.test.ws.tools.WSToolsTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.jaxb.JAXBConstants;
import org.jboss.ws.jaxb.JBossXBUnmarshallerImpl;
import org.jboss.ws.jaxb.JAXBUnmarshaller;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/complex/ComplexTypeMarshallerTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/complex/ComplexTypeMarshallerTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/complex/ComplexTypeMarshallerTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -30,7 +30,7 @@
import org.apache.xerces.xs.XSModel;
import org.jboss.test.ws.tools.WSToolsTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.jaxb.JAXBConstants;
import org.jboss.ws.jaxb.JBossXBMarshallerImpl;
import org.jboss.ws.jaxb.JAXBMarshaller;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/docstyle/DocumentStyleMarshallerTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/docstyle/DocumentStyleMarshallerTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/docstyle/DocumentStyleMarshallerTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -30,7 +30,7 @@
import org.apache.xerces.xs.XSModel;
import org.jboss.test.ws.tools.WSToolsTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.jaxb.JAXBConstants;
import org.jboss.ws.jaxb.JBossXBMarshallerImpl;
import org.jboss.ws.jaxb.JAXBMarshaller;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/simple/SimpleUserTypeMarshallerTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/simple/SimpleUserTypeMarshallerTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/simple/SimpleUserTypeMarshallerTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -27,7 +27,7 @@
import org.apache.xerces.xs.XSModel;
import org.jboss.test.ws.tools.WSToolsTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.jaxb.JAXBConstants;
import org.jboss.ws.jaxb.JBossXBMarshallerImpl;
import org.jboss.ws.jaxb.JAXBMarshaller;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/simple/SimpleUserTypeUnmarshallerTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/simple/SimpleUserTypeUnmarshallerTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxb/simple/SimpleUserTypeUnmarshallerTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -27,7 +27,7 @@
import org.apache.xerces.xs.XSModel;
import org.jboss.test.ws.tools.WSToolsTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.jaxb.JAXBConstants;
import org.jboss.ws.jaxb.JBossXBUnmarshallerImpl;
import org.jboss.ws.jaxb.JAXBUnmarshaller;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws434/JBWS434TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws434/JBWS434TestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws434/JBWS434TestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -33,7 +33,7 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Attr;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws720/GetProperty.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws720/GetProperty.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws720/GetProperty.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -8,7 +8,7 @@
import javax.xml.soap.Name;
import javax.xml.soap.SOAPElement;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMWriter;
public class GetProperty
{
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws775/JBWS775TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws775/JBWS775TestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws775/JBWS775TestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -35,7 +35,7 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMWriter;
/**
* Web services deployment can fail when deploying multiple EJB JARs
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws812/JBWS812TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws812/JBWS812TestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws812/JBWS812TestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -41,8 +41,8 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.w3c.dom.Element;
/**
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws812/ServerHandler.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws812/ServerHandler.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws812/ServerHandler.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -30,7 +30,7 @@
import javax.xml.soap.SOAPMessage;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMWriter;
public class ServerHandler extends GenericHandler
{
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws947/JBWS947TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws947/JBWS947TestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws947/JBWS947TestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -20,7 +20,7 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.test.ws.jbws947.Items.Item;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/*
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws947/MessageEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws947/MessageEndpointImpl.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws947/MessageEndpointImpl.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -32,7 +32,7 @@
import javax.xml.bind.Unmarshaller;
import javax.xml.soap.SOAPElement;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMWriter;
@WebService (serviceName="MessageEndpoint", targetNamespace="http://org.jboss.test.ws/jbws947")
@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, parameterStyle = SOAPBinding.ParameterStyle.BARE)
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws955/JBWS955TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws955/JBWS955TestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws955/JBWS955TestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -32,8 +32,8 @@
import javax.xml.soap.SOAPMessage;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.w3c.dom.Element;
/**
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/jmstransport/JMSTransportTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/jmstransport/JMSTransportTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -24,7 +24,7 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
/**
* A web service client that connects to a MDB endpoint.
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/message/MessageTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/message/MessageTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/message/MessageTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -52,7 +52,7 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.jaxrpc.ServiceFactoryImpl;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/message/MessageTestServiceBean.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/message/MessageTestServiceBean.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/message/MessageTestServiceBean.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -36,7 +36,7 @@
import javax.xml.transform.dom.DOMSource;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/wsaddressing/ClientHandler.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/wsaddressing/ClientHandler.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/wsaddressing/ClientHandler.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -36,7 +36,7 @@
import javax.xml.ws.addressing.ReferenceParameters;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.addressing.AddressingClientUtil;
import org.jboss.ws.utils.UUIDGenerator;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/wsaddressing/ServerHandler.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/wsaddressing/ServerHandler.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/wsaddressing/ServerHandler.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -34,7 +34,7 @@
import javax.xml.ws.addressing.ReferenceParameters;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
/**
* A server side handler for the ws-addressing
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/soap/MessageFactoryTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/soap/MessageFactoryTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/soap/MessageFactoryTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -27,7 +27,7 @@
import javax.xml.soap.*;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.Constants;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.soap.*;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/soap/SAAJElementWriterTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/soap/SAAJElementWriterTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/soap/SAAJElementWriterTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -26,7 +26,7 @@
import org.jboss.ws.soap.MessageFactoryImpl;
import org.jboss.ws.soap.SOAPElementImpl;
import org.jboss.ws.soap.SAAJElementWriter;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMWriter;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPMessage;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/soap/SOAPEnvelopeTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/soap/SOAPEnvelopeTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/soap/SOAPEnvelopeTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -31,7 +31,7 @@
import javax.xml.soap.SOAPMessage;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.Constants;
import org.jboss.ws.soap.MessageFactoryImpl;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/soap/SOAPFaultTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/soap/SOAPFaultTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/soap/SOAPFaultTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -37,7 +37,7 @@
import javax.xml.soap.SOAPMessage;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.Constants;
import org.jboss.ws.jaxrpc.SOAPFaultExceptionHelper;
import org.jboss.ws.soap.NameImpl;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/soap/SOAPHeaderTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/soap/SOAPHeaderTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/soap/SOAPHeaderTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -22,7 +22,7 @@
package org.jboss.test.ws.soap;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.Constants;
import org.jboss.ws.soap.MessageFactoryImpl;
import org.jboss.ws.soap.NameImpl;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -33,7 +33,7 @@
import org.jboss.test.ws.tools.sei.PrimitiveTypes;
import org.jboss.test.ws.tools.sei.ServiceException;
import org.jboss.test.ws.tools.sei.StandardJavaTypes;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.Constants;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -28,7 +28,7 @@
import org.jboss.test.ws.jaxb.complex.Base;
import org.jboss.test.ws.jaxb.complex.Composite;
import org.jboss.test.ws.jaxb.complex.Derived;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/** Test the XSD schema generator
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -38,8 +38,8 @@
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.WSDL11Validator;
import org.jboss.test.ws.tools.validation.WSDLValidator;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.Constants;
import org.jboss.ws.jaxrpc.LiteralTypeMapping;
import org.jboss.ws.jaxrpc.Style;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -28,8 +28,8 @@
import org.jboss.test.ws.tools.WSToolsTest;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.jaxrpc.LiteralTypeMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -25,7 +25,7 @@
import java.io.Writer;
import org.jboss.test.ws.tools.WSToolsTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.Constants;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -24,7 +24,7 @@
import java.io.FileInputStream;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.tools.WSTools;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -29,7 +29,7 @@
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.WSDL11Validator;
import org.jboss.test.ws.tools.validation.WSDLValidator;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.Constants;
import org.jboss.ws.jaxrpc.LiteralTypeMapping;
import org.jboss.ws.jaxrpc.Style;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -30,7 +30,7 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.jaxb.complex.Derived;
import org.jboss.test.ws.jaxb.simple.SimpleUserType;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.Constants;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.tools.JavaToXSD;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -29,7 +29,7 @@
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.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.tools.schema.SchemaTypeCreator;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSTypeDefinition;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -27,7 +27,7 @@
import java.nio.channels.FileChannel;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.tools.WSTools;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -24,7 +24,7 @@
import java.io.FileInputStream;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.tools.WSTools;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -28,7 +28,7 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.jbws_204.wscompile.anontypes.Items;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.Constants;
import org.jboss.ws.tools.JavaToXSD;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -30,7 +30,7 @@
import org.apache.xerces.xs.XSTypeDefinition;
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.jbws_204.wscompile.nillabletypes.NillableType;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.Constants;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardArraysTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardArraysTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardArraysTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -28,7 +28,7 @@
import javax.xml.namespace.QName;
import org.jboss.test.ws.tools.WSToolsTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.Constants;
import org.jboss.ws.tools.JavaToXSD;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardDoubleArraysTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardDoubleArraysTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardDoubleArraysTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -28,7 +28,7 @@
import javax.xml.namespace.QName;
import org.jboss.test.ws.tools.WSToolsTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.Constants;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jsr181/webservice/JavaToWSDLTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jsr181/webservice/JavaToWSDLTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jsr181/webservice/JavaToWSDLTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -26,7 +26,7 @@
import java.io.Writer;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.Constants;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.JavaToWSDL;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -27,7 +27,7 @@
import javax.xml.namespace.QName;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory;
import org.jboss.ws.metadata.jaxrpcmapping.MethodParamPartsMapping;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -28,7 +28,7 @@
import javax.xml.namespace.QName;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.metadata.jsr109.PortComponentMetaData;
import org.jboss.ws.metadata.jsr109.WebserviceDescriptionMetaData;
import org.jboss.ws.metadata.jsr109.WebservicesFactory;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsdl11/WSDLWithAnonTypesTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsdl11/WSDLWithAnonTypesTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsdl11/WSDLWithAnonTypesTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -32,7 +32,7 @@
import org.apache.xerces.xs.XSTerm;
import org.apache.xerces.xs.XSTypeDefinition;
import org.jboss.test.ws.tools.WSToolsTest;
-import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.w3c.dom.Element;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsse/MicrosoftInteropTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsse/MicrosoftInteropTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsse/MicrosoftInteropTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -22,8 +22,8 @@
package org.jboss.test.ws.wsse;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.soap.MessageFactoryImpl;
import org.jboss.ws.wsse.Constants;
import org.jboss.ws.wsse.SecurityDecoder;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsse/RoundTripTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsse/RoundTripTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsse/RoundTripTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -23,7 +23,7 @@
import org.jboss.security.SecurityAssociation;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.soap.MessageFactoryImpl;
import org.jboss.ws.wsse.*;
import org.w3c.dom.Document;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsse/SunInteropTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsse/SunInteropTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/wsse/SunInteropTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -31,7 +31,7 @@
import javax.xml.soap.SOAPMessage;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.soap.MessageFactoryImpl;
import org.jboss.ws.wsse.Constants;
import org.jboss.ws.wsse.SecurityDecoder;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/xop/XOPElementRPCTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/xop/XOPElementRPCTestCase.java 2006-09-06 18:57:40 UTC (rev 906)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/xop/XOPElementRPCTestCase.java 2006-09-07 05:49:14 UTC (rev 907)
@@ -22,8 +22,8 @@
package org.jboss.test.ws.xop;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.util.xml.DOMUtils;
-import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.utils.DOMWriter;
import org.jboss.ws.Constants;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.metadata.OperationMetaData;
More information about the jboss-svn-commits
mailing list