[jbossws-commits] JBossWS SVN: r1283 - in branches/jbossws-1.0.3.GA-JBWS-1311/src: main/java/org/jboss/ws/addressing main/java/org/jboss/ws/deployment main/java/org/jboss/ws/eventing/mgmt main/java/org/jboss/ws/integration/jboss 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/j

Author: jason.greene(a)jboss.com Date: 2006-10-22 22:07:46 -0400 (Sun, 22 Oct 2006) New Revision: 1283 Added: branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/utils/DOMWriter.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/JBWS1303TestCase.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/LastMod_PortType.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/Lastmod.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/LastmodImpl.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/LastmodResponse.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/ServerHandler.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/META-INF/ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/META-INF/application-client.xml branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/META-INF/jboss-client.xml branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/WEB-INF/ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/WEB-INF/jaxrpc-mapping.xml branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/WEB-INF/web.xml branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/WEB-INF/webservices.xml branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/WEB-INF/wsdl/ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/WEB-INF/wsdl/lastmodified.wsdl branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/wstools-config.xml Modified: branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/addressing/EndpointReferenceImpl.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/deployment/ServiceEndpointPublisher.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/eventing/mgmt/Subscription.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointGenerator.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/jaxrpc/SOAPFaultExceptionHelper.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/jaxrpc/encoding/ElementSerializer.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPArrayDeserializer.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPElementSerializer.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Writer.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/metadata/wsdl/WSDLWriter.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/server/ServiceEndpoint.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/DOMEnvelopeBuilder.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/NodeImpl.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/SOAPBodyElementMessage.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/SOAPBodyElementRpc.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/SOAPContentElement.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/SOAPElementImpl.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/SOAPFaultImpl.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/STAXEnvelopeBuilder.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/tools/WSDotXMLCreator.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/wspolicy/Policy.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/wspolicy/PolicyAlternative.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/wspolicy/PolicyAssertion.java branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/wsse/WSSecurityDispatcher.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/ant/build-jars.xml branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/JBossWSTest.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/addressing/replyto/FaultToEndpointImpl.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/eventing/EventSinkServlet.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws720/GetProperty.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws775/JBWS775TestCase.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws812/JBWS812TestCase.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws812/ServerHandler.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws947/MessageEndpointImpl.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws955/JBWS955TestCase.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/soap/SAAJElementWriterTestCase.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/wsse/MicrosoftInteropTestCase.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/wsse/RoundTripTestCase.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/wsse/SunInteropTestCase.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/xop/XOPElementRPCTestCase.java Log: Hand merge JBWS-1303 Modified: branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/addressing/EndpointReferenceImpl.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/addressing/EndpointReferenceImpl.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/addressing/EndpointReferenceImpl.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -39,7 +39,7 @@ import javax.xml.ws.addressing.soap.SOAPAddressingBuilder; import org.jboss.util.xml.DOMUtils; -import org.jboss.util.xml.DOMWriter; +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.3.GA-JBWS-1311/src/main/java/org/jboss/ws/deployment/ServiceEndpointPublisher.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/deployment/ServiceEndpointPublisher.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/deployment/ServiceEndpointPublisher.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -33,7 +33,7 @@ import org.jboss.logging.Logger; import org.jboss.util.xml.DOMUtils; -import org.jboss.util.xml.DOMWriter; +import org.jboss.ws.utils.DOMWriter; import org.jboss.ws.WSException; import org.w3c.dom.Element; Modified: branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/eventing/mgmt/Subscription.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/eventing/mgmt/Subscription.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/eventing/mgmt/Subscription.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -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.3.GA-JBWS-1311/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointGenerator.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointGenerator.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointGenerator.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -35,7 +35,7 @@ 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.DOMWriter; import org.jboss.ws.WSException; import org.jboss.ws.metadata.EndpointMetaData; import org.jboss.ws.metadata.ServerEndpointMetaData; Modified: branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/jaxrpc/SOAPFaultExceptionHelper.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/jaxrpc/SOAPFaultExceptionHelper.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/jaxrpc/SOAPFaultExceptionHelper.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -44,7 +44,7 @@ import org.jboss.logging.Logger; import org.jboss.util.xml.DOMUtils; -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.3.GA-JBWS-1311/src/main/java/org/jboss/ws/jaxrpc/encoding/ElementSerializer.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/jaxrpc/encoding/ElementSerializer.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/jaxrpc/encoding/ElementSerializer.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -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.3.GA-JBWS-1311/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPArrayDeserializer.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPArrayDeserializer.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPArrayDeserializer.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -32,7 +32,7 @@ import org.jboss.logging.Logger; import org.jboss.util.xml.DOMUtils; -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.3.GA-JBWS-1311/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPElementSerializer.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPElementSerializer.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/jaxrpc/encoding/SOAPElementSerializer.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -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.3.GA-JBWS-1311/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -67,7 +67,7 @@ import org.jboss.logging.Logger; import org.jboss.util.xml.DOMUtils; -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.jaxrpc.Style; Modified: branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Writer.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Writer.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Writer.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -33,7 +33,7 @@ import javax.xml.namespace.QName; import org.jboss.util.xml.DOMUtils; -import org.jboss.util.xml.DOMWriter; +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.3.GA-JBWS-1311/src/main/java/org/jboss/ws/metadata/wsdl/WSDLWriter.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/metadata/wsdl/WSDLWriter.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/metadata/wsdl/WSDLWriter.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -31,7 +31,7 @@ import org.jboss.logging.Logger; import org.jboss.util.xml.DOMUtils; -import org.jboss.util.xml.DOMWriter; +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.3.GA-JBWS-1311/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -55,7 +55,7 @@ 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.DOMWriter; import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.xb.binding.NamespaceRegistry; Modified: branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/server/ServiceEndpoint.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/server/ServiceEndpoint.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/server/ServiceEndpoint.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -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.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/DOMEnvelopeBuilder.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/DOMEnvelopeBuilder.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/DOMEnvelopeBuilder.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -2,7 +2,7 @@ import org.w3c.dom.*; import org.jboss.util.xml.DOMUtils; -import org.jboss.util.xml.DOMWriter; +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.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/NodeImpl.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/NodeImpl.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/NodeImpl.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -32,7 +32,7 @@ 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.DOMWriter; import org.jboss.ws.WSException; import org.w3c.dom.DOMException; import org.w3c.dom.Document; Modified: branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/SOAPBodyElementMessage.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/SOAPBodyElementMessage.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/SOAPBodyElementMessage.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -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 javax.xml.rpc.JAXRPCException; Modified: branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/SOAPBodyElementRpc.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/SOAPBodyElementRpc.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/SOAPBodyElementRpc.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -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.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/SOAPContentElement.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/SOAPContentElement.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/SOAPContentElement.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -23,7 +23,7 @@ import org.jboss.logging.Logger; import org.jboss.util.xml.DOMUtils; -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.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/SOAPElementImpl.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/SOAPElementImpl.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/SOAPElementImpl.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -37,7 +37,7 @@ import org.jboss.logging.Logger; import org.jboss.util.xml.DOMUtils; -import org.jboss.util.xml.DOMWriter; +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.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/SOAPFaultImpl.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/SOAPFaultImpl.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/SOAPFaultImpl.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -38,7 +38,7 @@ 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.DOMWriter; import org.w3c.dom.Element; /** Modified: branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/STAXEnvelopeBuilder.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/STAXEnvelopeBuilder.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/soap/STAXEnvelopeBuilder.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -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.3.GA-JBWS-1311/src/main/java/org/jboss/ws/tools/WSDotXMLCreator.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/tools/WSDotXMLCreator.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/tools/WSDotXMLCreator.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -31,7 +31,7 @@ import org.jboss.logging.Logger; import org.jboss.util.xml.DOMUtils; -import org.jboss.util.xml.DOMWriter; +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.3.GA-JBWS-1311/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -37,7 +37,7 @@ import org.jboss.logging.Logger; import org.jboss.util.xml.DOMUtils; -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.jaxrpc.LiteralTypeMapping; Added: branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/utils/DOMWriter.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/utils/DOMWriter.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/utils/DOMWriter.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -0,0 +1,579 @@ +/* + * ==================================================================== + * + * The Apache Software License, Version 1.1 + * + * Copyright (c) 1999 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, if + * any, must include the following acknowlegement: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowlegement may appear in the software itself, + * if and wherever such third-party acknowlegements normally appear. + * + * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software + * Foundation" must not be used to endorse or promote products derived + * from this software without prior written permission. For written + * permission, please contact apache(a)apache.org. + * + * 5. Products derived from this software may not be called "Apache" + * nor may "Apache" appear in their names without prior written + * permission of the Apache Group. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * <http://www.apache.org/>;. + */ +package org.jboss.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(a)jboss.org + * @version $Revision$ + */ +public class DOMWriter +{ + // Print writer + private PrintWriter out; + // True, if canonical output + private boolean canonical; + // True, if pretty printing should be used + private boolean prettyprint; + // True, if the XML declaration should be written + private boolean writeXMLDeclaration; + // Explicit character set encoding + private String charsetName; + // indent for the pretty printer + private int prettyIndent; + // True, if the XML declaration has been written + private boolean wroteXMLDeclaration; + // The node that started the write + private Node rootNode; + // True if we want namespace completion + private boolean completeNamespaces = true; + + public DOMWriter(Writer w) + { + this.out = new PrintWriter(w); + } + + public DOMWriter(Writer w, String charsetName) + { + this.out = new PrintWriter(w); + this.charsetName = charsetName; + this.writeXMLDeclaration = true; + } + + public DOMWriter(OutputStream stream) + { + try + { + this.out = new PrintWriter(new OutputStreamWriter(stream, "UTF-8")); + } + catch (UnsupportedEncodingException e) + { + // ignore, UTF-8 should be available + } + } + + public DOMWriter(OutputStream stream, String charsetName) + { + try + { + this.out = new PrintWriter(new OutputStreamWriter(stream, charsetName)); + this.charsetName = charsetName; + this.writeXMLDeclaration = true; + } + catch (UnsupportedEncodingException e) + { + throw new IllegalArgumentException("Unsupported encoding: " + charsetName); + } + } + + /** + * Print a node with explicit prettyprinting. + * The defaults for all other DOMWriter properties apply. + * + */ + public static String printNode(Node node, boolean prettyprint) + { + StringWriter strw = new StringWriter(); + new DOMWriter(strw).setPrettyprint(prettyprint).print(node); + return strw.toString(); + } + + public boolean isCanonical() + { + return canonical; + } + + /** + * Set wheter entities should appear in their canonical form. + * The default is false. + */ + public DOMWriter setCanonical(boolean canonical) + { + this.canonical = canonical; + return this; + } + + /** + * Set wheter subelements should have their namespaces completed. + * Setting this to false may lead to invalid XML fragments. + * The default is true. + */ + public DOMWriter setCompleteNamespaces(boolean complete) + { + this.completeNamespaces = complete; + return this; + } + + public boolean isPrettyprint() + { + return prettyprint; + } + + /** + * Set wheter element should be indented. + * The default is false. + */ + public DOMWriter setPrettyprint(boolean prettyprint) + { + this.prettyprint = prettyprint; + return this; + } + + public boolean isWriteXMLDeclaration() + { + return writeXMLDeclaration; + } + + /** + * Set wheter the XML declaration should be written. + * The default is false. + */ + public DOMWriter setWriteXMLDeclaration(boolean flag) + { + this.writeXMLDeclaration = flag; + return this; + } + + public void print(Node node) + { + rootNode = node; + printInternal(node, false); + } + + private void printInternal(Node node, boolean indentEndMarker) + { + // is there anything to do? + if (node == null) + { + return; + } + + // JBAS-2117 - Don't skip the DOCUMENT_NODE + // if (node instanceof Document) node = ((Document)node).getDocumentElement(); + + if (wroteXMLDeclaration == false && writeXMLDeclaration == true && canonical == false) + { + out.print("<?xml version='1.0'"); + if (charsetName != null) + out.print(" encoding='" + charsetName + "'"); + + out.print("?>"); + if (prettyprint) + out.println(); + + wroteXMLDeclaration = true; + } + + int type = node.getNodeType(); + boolean hasChildNodes = node.getChildNodes().getLength() > 0; + + String nodeName = node.getNodeName(); + switch (type) + { + // print document + case Node.DOCUMENT_NODE: + { + NodeList children = node.getChildNodes(); + for (int iChild = 0; iChild < children.getLength(); iChild++) + { + printInternal(children.item(iChild), false); + } + out.flush(); + break; + } + + // print element with attributes + case Node.ELEMENT_NODE: + { + Element element = (Element)node; + if (prettyprint) + { + for (int i = 0; i < prettyIndent; i++) + { + out.print(' '); + } + prettyIndent++; + } + + out.print('<'); + out.print(nodeName); + + Map nsMap = new HashMap(); + String elPrefix = node.getPrefix(); + if (elPrefix != null) + { + String nsURI = getNamespaceURI(elPrefix, element, rootNode); + nsMap.put(elPrefix, nsURI); + } + + Attr attrs[] = sortAttributes(node.getAttributes()); + for (int i = 0; i < attrs.length; i++) + { + Attr attr = attrs[i]; + String atPrefix = attr.getPrefix(); + String atName = attr.getNodeName(); + String atValue = normalize(attr.getNodeValue(), canonical); + + if (atPrefix != null && !atPrefix.equals("xmlns") && !atPrefix.equals("xml")) + { + String nsURI = getNamespaceURI(atPrefix, element, rootNode); + nsMap.put(atPrefix, nsURI); + + // xsi:type='ns1:SubType', xsi:type='xsd:string' + if (atName.equals(atPrefix + ":type") && nsURI.equals("http://www.w3.org/2001/XMLSchema-instance") && atValue.indexOf(":") > 0) + { + String typePrefix = atValue.substring(0, atValue.indexOf(":")); + String typeURI = getNamespaceURI(typePrefix, element, rootNode); + nsMap.put(typePrefix, typeURI); + } + } + + out.print(" " + atName + "='" + atValue + "'"); + } + + // Add missing namespace declaration + if (completeNamespaces) + { + Iterator itPrefix = nsMap.keySet().iterator(); + while (itPrefix.hasNext()) + { + String prefix = (String)itPrefix.next(); + String nsURI = (String)nsMap.get(prefix); + if (nsURI == null) + { + nsURI = getNamespaceURI(prefix, element, null); + out.print(" xmlns:" + prefix + "='" + nsURI + "'"); + } + } + } + + if (hasChildNodes) + { + out.print('>'); + } + + // Find out if the end marker is indented + indentEndMarker = isEndMarkerIndented(node); + + if (indentEndMarker) + { + out.print('\n'); + } + + NodeList childNodes = node.getChildNodes(); + int len = childNodes.getLength(); + for (int i = 0; i < len; i++) + { + Node childNode = childNodes.item(i); + printInternal(childNode, false); + } + break; + } + + // handle entity reference nodes + case Node.ENTITY_REFERENCE_NODE: + { + if (canonical) + { + NodeList children = node.getChildNodes(); + if (children != null) + { + int len = children.getLength(); + for (int i = 0; i < len; i++) + { + printInternal(children.item(i), false); + } + } + } + else + { + out.print('&'); + out.print(nodeName); + out.print(';'); + } + break; + } + + // print cdata sections + case Node.CDATA_SECTION_NODE: + { + if (canonical) + { + out.print(normalize(node.getNodeValue(), canonical)); + } + else + { + out.print("<![CDATA["); + out.print(node.getNodeValue()); + out.print("]]>"); + } + break; + } + + // print text + case Node.TEXT_NODE: + { + String text = normalize(node.getNodeValue(), canonical); + if (prettyprint == false || text.trim().length() > 0) + out.print(text); + break; + } + + // print processing instruction + case Node.PROCESSING_INSTRUCTION_NODE: + { + out.print("<?"); + out.print(nodeName); + String data = node.getNodeValue(); + if (data != null && data.length() > 0) + { + out.print(' '); + out.print(data); + } + out.print("?>"); + break; + } + + // print comment + case Node.COMMENT_NODE: + { + for (int i = 0; i < prettyIndent; i++) + { + out.print(' '); + } + + out.print("<!--"); + String data = node.getNodeValue(); + if (data != null) + { + out.print(data); + } + out.print("-->"); + + if (prettyprint) + { + out.print('\n'); + } + + break; + } + } + + if (type == Node.ELEMENT_NODE) + { + if (prettyprint) + prettyIndent--; + + if (hasChildNodes == false) + { + out.print("/>"); + } + else + { + if (indentEndMarker) + { + for (int i = 0; i < prettyIndent; i++) + { + out.print(' '); + } + } + + out.print("</"); + out.print(nodeName); + out.print('>'); + } + + if (prettyIndent > 0) + { + out.print('\n'); + } + } + out.flush(); + } + + private String getNamespaceURI(String prefix, Element element, Node stopNode) + { + Node parent = element.getParentNode(); + String nsURI = element.getAttribute("xmlns:" + prefix); + if (nsURI.length() == 0 && element != stopNode && parent instanceof Element) + return getNamespaceURI(prefix, (Element)parent, stopNode); + + return (nsURI.length() > 0 ? nsURI : null); + } + + private boolean isEndMarkerIndented(Node node) + { + if (prettyprint) + { + NodeList childNodes = node.getChildNodes(); + int len = childNodes.getLength(); + for (int i = 0; i < len; i++) + { + Node children = childNodes.item(i); + if (children.getNodeType() == Node.ELEMENT_NODE) + { + return true; + } + } + } + return false; + } + + /** Returns a sorted list of attributes. */ + private Attr[] sortAttributes(NamedNodeMap attrs) + { + + int len = (attrs != null) ? attrs.getLength() : 0; + Attr array[] = new Attr[len]; + for (int i = 0; i < len; i++) + { + array[i] = (Attr)attrs.item(i); + } + for (int i = 0; i < len - 1; i++) + { + String name = array[i].getNodeName(); + int index = i; + for (int j = i + 1; j < len; j++) + { + String curName = array[j].getNodeName(); + if (curName.compareTo(name) < 0) + { + name = curName; + index = j; + } + } + if (index != i) + { + Attr temp = array[i]; + array[i] = array[index]; + array[index] = temp; + } + } + return (array); + } + + /** Normalizes the given string. */ + public static String normalize(String s, boolean canonical) + { + StringBuffer str = new StringBuffer(); + + int len = (s != null) ? s.length() : 0; + for (int i = 0; i < len; i++) + { + char ch = s.charAt(i); + switch (ch) + { + case '<': + { + str.append("&lt;"); + break; + } + case '>': + { + str.append("&gt;"); + break; + } + case '&': + { + str.append("&amp;"); + break; + } + case '"': + { + str.append("&quot;"); + break; + } + case '\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.3.GA-JBWS-1311/src/main/java/org/jboss/ws/utils/DOMWriter.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/wspolicy/Policy.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/wspolicy/Policy.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/wspolicy/Policy.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -29,7 +29,7 @@ import java.util.Iterator; import org.jboss.util.xml.DOMUtils; -import org.jboss.util.xml.DOMWriter; +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.3.GA-JBWS-1311/src/main/java/org/jboss/ws/wspolicy/PolicyAlternative.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/wspolicy/PolicyAlternative.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/wspolicy/PolicyAlternative.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -29,7 +29,7 @@ import java.util.Iterator; import org.jboss.util.xml.DOMUtils; -import org.jboss.util.xml.DOMWriter; +import org.jboss.ws.utils.DOMWriter; import org.jboss.ws.WSException; import org.w3c.dom.Element; Modified: branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/wspolicy/PolicyAssertion.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/wspolicy/PolicyAssertion.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/wspolicy/PolicyAssertion.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -24,7 +24,7 @@ //$Id$ import org.jboss.util.xml.DOMUtils; -import org.jboss.util.xml.DOMWriter; +import org.jboss.ws.utils.DOMWriter; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/wsse/WSSecurityDispatcher.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/wsse/WSSecurityDispatcher.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/wsse/WSSecurityDispatcher.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -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.3.GA-JBWS-1311/src/test/ant/build-jars.xml =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/ant/build-jars.xml 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/ant/build-jars.xml 2006-10-23 02:07:46 UTC (rev 1283) @@ -981,7 +981,34 @@ <include name="wsdl/**"/> </metainf> </jar> - + + <!-- jaxrpc-jbws1303 --> + <war warfile="${build.test.dir}/libs/jaxrpc-jbws1303.war" webxml="${build.test.dir}/resources/jbws1303/WEB-INF/web.xml"> + <classes dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jbws1303/*.class"/> + <exclude name="org/jboss/test/ws/jbws1303/*TestCase.class"/> + </classes> + <webinf dir="${build.test.dir}/resources/jbws1303/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1303-client.jar"> + <fileset dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jbws1303/*.class"/> + <exclude name="org/jboss/test/ws/jbws1303/*TestCase.class"/> + </fileset> + <metainf dir="${build.test.dir}/resources/jbws1303/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${build.test.dir}/resources/jbws1303/WEB-INF"> + <include name="wsdl/**"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + <!-- jbossws-marshall-doclit.war --> <war warfile="${build.test.dir}/libs/jbossws-marshall-doclit.war" webxml="${build.test.dir}/resources/marshall-doclit/WEB-INF/web.xml"> <classes dir="${build.test.dir}/classes"> Modified: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/JBossWSTest.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/JBossWSTest.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/JBossWSTest.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -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.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/addressing/replyto/FaultToEndpointImpl.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/addressing/replyto/FaultToEndpointImpl.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/addressing/replyto/FaultToEndpointImpl.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -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.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/eventing/EventSinkServlet.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/eventing/EventSinkServlet.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/eventing/EventSinkServlet.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -22,7 +22,7 @@ package org.jboss.test.ws.eventing; import org.jboss.util.xml.DOMUtils; -import org.jboss.util.xml.DOMWriter; +import org.jboss.ws.utils.DOMWriter; import org.w3c.dom.Element; import javax.servlet.ServletException; Added: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/JBWS1303TestCase.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/JBWS1303TestCase.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/JBWS1303TestCase.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -0,0 +1,68 @@ +/* + * 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.test.ws.jbws1303; + +// $Id$ + +import javax.naming.InitialContext; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; + +/** + * Unmarshall issue with xsi:type specified bean property + * + * http://jira.jboss.org/jira/browse/JBWS-1303 + * + * @author Thomas.Diesler(a)jboss.org + * @since 16-Oct-2006 + */ +public class JBWS1303TestCase extends JBossWSTest +{ + private static LastMod_PortType port; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(JBWS1303TestCase.class, "jaxrpc-jbws1303.war, jaxrpc-jbws1303-client.jar"); + } + + protected void setUp() throws Exception + { + super.setUp(); + if (port == null) + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + port = (LastMod_PortType)service.getPort(LastMod_PortType.class); + } + } + + public void testEndpoint() throws Exception + { + Lastmod lastmod = new Lastmod("yesterday"); + LastmodResponse lastmodRes = port.lastmod(lastmod); + assertEquals("yesterday", lastmodRes.getTimeChanged()); + } +} Property changes on: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/JBWS1303TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/LastMod_PortType.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/LastMod_PortType.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/LastMod_PortType.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Sun Oct 22 20:21:32 CDT 2006 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1303; +public interface LastMod_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1303.LastmodResponse lastmod(org.jboss.test.ws.jbws1303.Lastmod lastmod) throws java.rmi.RemoteException; +} Property changes on: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/LastMod_PortType.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/Lastmod.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/Lastmod.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/Lastmod.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Sun Oct 22 20:21:32 CDT 2006 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1303; + + +public class Lastmod +{ + +protected java.lang.String lastmodRequest; +public Lastmod(){} + +public Lastmod(java.lang.String lastmodRequest){ +this.lastmodRequest=lastmodRequest; +} +public java.lang.String getLastmodRequest() { return lastmodRequest ;} + +public void setLastmodRequest(java.lang.String lastmodRequest){ this.lastmodRequest = lastmodRequest; } + +} Property changes on: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/Lastmod.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/LastmodImpl.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/LastmodImpl.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/LastmodImpl.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -0,0 +1,39 @@ +/* + * 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.test.ws.jbws1303; + +import java.rmi.RemoteException; + +import org.jboss.logging.Logger; + +public class LastmodImpl implements LastMod_PortType +{ + // Provide logging + private static Logger log = Logger.getLogger(LastmodImpl.class); + + public LastmodResponse lastmod(Lastmod lastmod) throws RemoteException + { + String req = lastmod.getLastmodRequest(); + log.info("lastmod: " + req); + return new LastmodResponse(req); + } +} Property changes on: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/LastmodImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/LastmodResponse.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/LastmodResponse.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/LastmodResponse.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Sun Oct 22 20:21:32 CDT 2006 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1303; + + +public class LastmodResponse +{ + +protected java.lang.String timeChanged; +public LastmodResponse(){} + +public LastmodResponse(java.lang.String timeChanged){ +this.timeChanged=timeChanged; +} +public java.lang.String getTimeChanged() { return timeChanged ;} + +public void setTimeChanged(java.lang.String timeChanged){ this.timeChanged=timeChanged; } + +} Property changes on: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/LastmodResponse.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/ServerHandler.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/ServerHandler.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/ServerHandler.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -0,0 +1,73 @@ +/* + * 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.test.ws.jbws1303; + +import javax.xml.namespace.QName; +import javax.xml.rpc.handler.GenericHandler; +import javax.xml.rpc.handler.MessageContext; +import javax.xml.rpc.handler.soap.SOAPMessageContext; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPMessage; + +import org.jboss.ws.Constants; + +public class ServerHandler extends GenericHandler +{ + public QName[] getHeaders() + { + return new QName[] {}; + } + + /** + * <env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + * <env:Header/> + * <env:Body> + * <lastmodResponse xmlns='http://netid.msu.edu:8080/lastmod.pl'> + * <TimeChanged xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='xsd:string'>yesterday</TimeChanged> + * </lastmodResponse> + * </env:Body> + * </env:Envelope> + */ + public boolean handleResponse(MessageContext msgContext) + { + try + { + SOAPMessage soapMessage = MessageFactory.newInstance().createMessage(); + SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope(); + soapEnvelope.addNamespaceDeclaration(Constants.PREFIX_XSD, Constants.NS_SCHEMA_XSD); + SOAPElement bodyElement = soapMessage.getSOAPBody().addChildElement("lastmodResponse"); + bodyElement.setAttribute("xmlns", "http://netid.msu.edu:8080/lastmod.pl"); + SOAPElement soapElement = bodyElement.addChildElement("TimeChanged"); + soapElement.addNamespaceDeclaration(Constants.PREFIX_XSI, Constants.NS_SCHEMA_XSI); + soapElement.setAttribute("xsi:type", "xsd:string"); + soapElement.setValue("yesterday"); + ((SOAPMessageContext)msgContext).setMessage(soapMessage); + } + catch (Exception ex) + { + throw new RuntimeException(ex); + } + return true; + } +} Property changes on: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/ServerHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws720/GetProperty.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws720/GetProperty.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws720/GetProperty.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -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.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws775/JBWS775TestCase.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws775/JBWS775TestCase.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws775/JBWS775TestCase.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -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.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws812/JBWS812TestCase.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws812/JBWS812TestCase.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws812/JBWS812TestCase.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -42,7 +42,7 @@ 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.DOMWriter; import org.w3c.dom.Element; /** Modified: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws812/ServerHandler.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws812/ServerHandler.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws812/ServerHandler.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -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.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws947/MessageEndpointImpl.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws947/MessageEndpointImpl.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws947/MessageEndpointImpl.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -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.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws955/JBWS955TestCase.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws955/JBWS955TestCase.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws955/JBWS955TestCase.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -33,7 +33,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.util.xml.DOMUtils; -import org.jboss.util.xml.DOMWriter; +import org.jboss.ws.utils.DOMWriter; import org.w3c.dom.Element; /** Modified: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/soap/SAAJElementWriterTestCase.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/soap/SAAJElementWriterTestCase.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/soap/SAAJElementWriterTestCase.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -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.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -39,7 +39,7 @@ 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.DOMWriter; import org.jboss.ws.Constants; import org.jboss.ws.jaxrpc.LiteralTypeMapping; import org.jboss.ws.jaxrpc.Style; Modified: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -29,7 +29,7 @@ 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.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.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/wsse/MicrosoftInteropTestCase.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/wsse/MicrosoftInteropTestCase.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/wsse/MicrosoftInteropTestCase.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -23,7 +23,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.util.xml.DOMUtils; -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.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/wsse/RoundTripTestCase.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/wsse/RoundTripTestCase.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/wsse/RoundTripTestCase.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -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.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/wsse/SunInteropTestCase.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/wsse/SunInteropTestCase.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/wsse/SunInteropTestCase.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -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.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/xop/XOPElementRPCTestCase.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/xop/XOPElementRPCTestCase.java 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/xop/XOPElementRPCTestCase.java 2006-10-23 02:07:46 UTC (rev 1283) @@ -23,7 +23,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.util.xml.DOMUtils; -import org.jboss.util.xml.DOMWriter; +import org.jboss.ws.utils.DOMWriter; import org.jboss.ws.Constants; import org.jboss.ws.jaxrpc.Style; import org.jboss.ws.metadata.OperationMetaData; Added: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/META-INF/application-client.xml 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/META-INF/application-client.xml 2006-10-23 02:07:46 UTC (rev 1283) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application-client xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" + version="1.4"> + + <display-name>JAXRPC simple tests</display-name> + + <service-ref> + <service-ref-name>service/TestService</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> + <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jbws1303.LastMod_PortType</service-endpoint-interface> + </port-component-ref> + </service-ref> + +</application-client> + Property changes on: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/META-INF/application-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/META-INF/jboss-client.xml 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/META-INF/jboss-client.xml 2006-10-23 02:07:46 UTC (rev 1283) @@ -0,0 +1,15 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<!DOCTYPE jboss-client PUBLIC + "-//JBoss//DTD Application Client 4.0//EN" + "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> + +<jboss-client> + <jndi-name>jbossws-client</jndi-name> + + <service-ref> + <service-ref-name>service/TestService</service-ref-name> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws1303?wsdl</wsdl-override> + </service-ref> + +</jboss-client> Property changes on: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/META-INF/jboss-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/WEB-INF/jaxrpc-mapping.xml 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/WEB-INF/jaxrpc-mapping.xml 2006-10-23 02:07:46 UTC (rev 1283) @@ -0,0 +1,55 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1303</package-type> + <namespaceURI>http://netid.msu.edu:8080/lastmod.pl</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1303.Lastmod</java-type> + <anonymous-type-qname xmlns:typeNS='http://netid.msu.edu:8080/lastmod.pl'>typeNS:&gt;lastmod</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>lastmodRequest</java-variable-name> + <xml-element-name>lastmodRequest</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1303.LastmodResponse</java-type> + <anonymous-type-qname xmlns:typeNS='http://netid.msu.edu:8080/lastmod.pl'>typeNS:&gt;lastmodResponse</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>timeChanged</java-variable-name> + <xml-element-name>TimeChanged</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1303.LastMod</service-interface> + <wsdl-service-name xmlns:serviceNS='http://netid.msu.edu:8080/lastmod.pl'>serviceNS:LastMod</wsdl-service-name> + <port-mapping> + <port-name>LastModPort</port-name> + <java-port-name>LastModPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1303.LastModPortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://netid.msu.edu:8080/lastmod.pl'>portTypeNS:LastModPortType</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://netid.msu.edu:8080/lastmod.pl'>bindingNS:LastModBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lastmod</java-method-name> + <wsdl-operation>lastmod</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1303.Lastmod</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://netid.msu.edu:8080/lastmod.pl'>wsdlMsgNS:lastmodInput</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1303.LastmodResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://netid.msu.edu:8080/lastmod.pl'>wsdlMsgNS:lastmodOutput</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Property changes on: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/WEB-INF/jaxrpc-mapping.xml ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/WEB-INF/web.xml 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/WEB-INF/web.xml 2006-10-23 02:07:46 UTC (rev 1283) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>LastMod</servlet-name> + <servlet-class>org.jboss.test.ws.jbws1303.LastmodImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>LastMod</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> + Property changes on: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/WEB-INF/webservices.xml 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/WEB-INF/webservices.xml 2006-10-23 02:07:46 UTC (rev 1283) @@ -0,0 +1,19 @@ +<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://netid.msu.edu:8080/lastmod.pl' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> + <webservice-description> + <webservice-description-name>LastMod</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/lastmodified.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>LastModPort</port-component-name> + <wsdl-port>impl:LastModPort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jbws1303.LastMod_PortType</service-endpoint-interface> + <service-impl-bean> + <servlet-link>LastMod</servlet-link> + </service-impl-bean> + <handler> + <handler-name>ServerHandler</handler-name> + <handler-class>org.jboss.test.ws.jbws1303.ServerHandler</handler-class> + </handler> + </port-component> + </webservice-description> +</webservices> Property changes on: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/WEB-INF/webservices.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/WEB-INF/wsdl/lastmodified.wsdl =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/WEB-INF/wsdl/lastmodified.wsdl 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/WEB-INF/wsdl/lastmodified.wsdl 2006-10-23 02:07:46 UTC (rev 1283) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<definitions name="LastMod" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + targetNamespace="http://netid.msu.edu:8080/lastmod.pl" xmlns:tns="http://netid.msu.edu:8080/lastmod.pl" xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsdl="http://netid.msu.edu:8080/lastmodified.wsdl"> + + <types> + + <schema targetNamespace="http://netid.msu.edu:8080/lastmod.pl" xmlns="http://www.w3.org/2001/XMLSchema"> + <element name="lastmod"> + <complexType> + <sequence> + <element name="lastmodRequest" nillable="false" type="xsd:string" form="qualified"/> + </sequence> + </complexType> + </element> + + <element name="lastmodResponse"> + <complexType> + <sequence> + <element name="TimeChanged" nillable="false" type="xsd:string" form="qualified"/> + </sequence> + </complexType> + </element> + </schema> + </types> + + <message name="lastmodInput"> + <part element="tns:lastmod" name="parameters"/> + </message> + + <message name="lastmodOutput"> + <part element="tns:lastmodResponse" name="result"/> + </message> + + <portType name="LastModPortType"> + <operation name="lastmod"> + <input message="tns:lastmodInput"/> + <output message="tns:lastmodOutput"/> + </operation> + </portType> + + <binding name="LastModBinding" type="tns:LastModPortType"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <operation name="lastmod"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + + <output> + <soap:body use="literal"/> + </output> + </operation> + </binding> + + <service name="LastMod"> + <port name="LastModPort" binding="tns:LastModBinding"> + <soap:address location="REPLACE_WITH_ACTUAL_URL"/> + </port> + </service> + +</definitions> Property changes on: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/WEB-INF/wsdl/lastmodified.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/wstools-config.xml =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/wstools-config.xml 2006-10-22 19:00:38 UTC (rev 1282) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/wstools-config.xml 2006-10-23 02:07:46 UTC (rev 1283) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + wstools -config wstools-config.xml +--> + +<configuration xmlns="http://www.jboss.org/jbossws-tools" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools + http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + + <global> + <package-namespace package="org.jboss.test.ws.jbws1303" namespace="http://netid.msu.edu:8080/lastmod.pl"/> + </global> + + <wsdl-java file="WEB-INF/wsdl/lastmodified.wsdl"> + <mapping file="jaxrpc-mapping.xml" /> + </wsdl-java> + +</configuration> Property changes on: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/resources/jbws1303/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF