JBossWS SVN: r1286 - branches/tdiesler
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-23 11:00:40 -0400 (Mon, 23 Oct 2006)
New Revision: 1286
Removed:
branches/tdiesler/trunk/
Log:
recreate userbranch
17 years, 6 months
- 1
- 0
JBossWS SVN: r1285 - branches/tdiesler/trunk
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-23 10:59:14 -0400 (Mon, 23 Oct 2006)
New Revision: 1285
Added:
branches/tdiesler/trunk/trunk/
Log:
recreate userbranch
Copied: branches/tdiesler/trunk/trunk (from rev 1284, trunk)
17 years, 6 months
- 1
- 0
JBossWS SVN: r1284 - trunk
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-23 07:08:28 -0400 (Mon, 23 Oct 2006)
New Revision: 1284
Modified:
trunk/version.properties
Log:
jaxb-2.0.3
Modified: trunk/version.properties
===================================================================
--- trunk/version.properties 2006-10-23 02:07:46 UTC (rev 1283)
+++ trunk/version.properties 2006-10-23 11:08:28 UTC (rev 1284)
@@ -36,7 +36,7 @@
stax-api=1.0
sun-jaf=1.0.2
sun-javamail=1.3.1
-sun-jaxb=2.0
+sun-jaxb=2.0.3
sun-servlet=2.4
woodstox=2.0.6
wscommons-policy=1.0
17 years, 6 months
- 1
- 0
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
by jbossws-commits＠lists.jboss.org
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("<");
+ 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.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:>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:>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
17 years, 6 months
- 1
- 0
JBossWS SVN: r1282 - branches/dlofthouse
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2006-10-22 15:00:38 -0400 (Sun, 22 Oct 2006)
New Revision: 1282
Removed:
branches/dlofthouse/JBWS-1190/
Log:
Branch for JBWS-1190 no longer required.
17 years, 6 months
- 1
- 0
JBossWS SVN: r1281 - in branches/jbossws-1.0/src: main/java/org/jboss/ws/deployment main/java/org/jboss/ws/integration/jboss main/java/org/jboss/ws/integration/tomcat main/java/org/jboss/ws/metadata/j2ee test/ant test/java/org/jboss/test/ws/jaxrpc test/java/org/jboss/test/ws/jaxrpc/jbws1190 test/java/org/jboss/test/ws/jaxws test/java/org/jboss/test/ws/jaxws/jbws1190 test/resources/jaxrpc test/resources/jaxrpc/jbws1190 test/resources/jaxrpc/jbws1190/META-INF test/resources/jaxrpc/jbws1190/W
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2006-10-22 14:57:24 -0400 (Sun, 22 Oct 2006)
New Revision: 1281
Added:
branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebSecurityMetaData.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/confidential-config.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/test-config.xml
branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/
branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/WEB-INF/
branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml
Removed:
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java
branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/WEB-INF/
branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml
Modified:
branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.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/MetaDataBuilder.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/WebMetaDataAdaptor.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java
branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml
branches/jbossws-1.0/src/test/ant/build-jars-jaxws.xml
Log:
JBWS-1190 - Respect transport-guarantee as specified in web.xml for POJO deployments.
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java 2006-10-22 18:57:24 UTC (rev 1281)
@@ -27,7 +27,6 @@
import java.io.IOException;
import java.io.Writer;
-import javax.xml.namespace.QName;
import javax.xml.ws.BindingType;
import org.jboss.logging.Logger;
@@ -104,10 +103,10 @@
Writer writer = IOUtils.getCharsetFileWriter(wsdlTmpFile, Constants.DEFAULT_XML_CHARSET);
wsdlDefinitions.write(writer, Constants.DEFAULT_XML_CHARSET);
writer.close();
-
+
wsdlLocation = wsdlTmpFile.toURL().toExternalForm();
serviceMetaData.setWsdlFile(wsdlLocation);
-
+
JavaWsdlMapping jaxrpcMapping = javaToWSDL.getJavaWsdlMapping();
File mappingTmpFile = File.createTempFile(serviceName, ".xml", tmpdir);
mappingTmpFile.deleteOnExit();
@@ -115,7 +114,7 @@
writer = IOUtils.getCharsetFileWriter(mappingTmpFile, Constants.DEFAULT_XML_CHARSET);
writer.write(jaxrpcMapping.serialize());
writer.close();
-
+
String mappingLocation = mappingTmpFile.toURL().toExternalForm();
serviceMetaData.setJaxrpcMappingFile(mappingLocation);
}
@@ -146,6 +145,8 @@
UnifiedWebMetaData webMetaData = (UnifiedWebMetaData)udi.metaData;
contextRoot = webMetaData.getContextRoot();
urlPattern = webMetaData.getServletMappings().get(linkName);
+
+ epMetaData.setTransportGuarantee(getTransportGuarantee(webMetaData, linkName));
}
// Process @PortComponent
@@ -177,10 +178,15 @@
if (authMethod.length() > 0)
epMetaData.setAuthMethod(authMethod);
- // setup transport guarantee
- String transportGuarantee = anPortComponent.transportGuarantee();
- if (transportGuarantee.length() > 0)
- epMetaData.setTransportGuarantee(transportGuarantee);
+ if (epMetaData.getTransportGuarantee() == null || epMetaData.getTransportGuarantee().length() == 0)
+ {
+ // setup transport guarantee
+ String transportGuarantee = anPortComponent.transportGuarantee();
+ if (transportGuarantee.length() > 0)
+ {
+ epMetaData.setTransportGuarantee(transportGuarantee);
+ }
+ }
}
epMetaData.setContextRoot(contextRoot);
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java 2006-10-22 18:57:24 UTC (rev 1281)
@@ -29,13 +29,11 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
import javax.xml.rpc.encoding.TypeMappingRegistry;
-import javax.xml.ws.addressing.AddressingConstants;
import org.apache.xerces.xs.XSTypeDefinition;
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.addressing.AddressingConstantsImpl;
import org.jboss.ws.jaxrpc.LiteralTypeMapping;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.jaxrpc.TypeMappingImpl;
@@ -81,10 +79,8 @@
public abstract class JSR109MetaDataBuilder extends MetaDataBuilder
{
// provide logging
- final Logger log = Logger.getLogger(JSR109MetaDataBuilder.class);
+ final Logger log = Logger.getLogger(JSR109MetaDataBuilder.class);
- private AddressingConstants ADDR = new AddressingConstantsImpl();
-
protected void setupTypesMetaData(ServiceMetaData serviceMetaData)
{
WSDLDefinitions wsdlDefinitions = serviceMetaData.getWsdlDefinitions();
@@ -345,7 +341,6 @@
private void setupAttachmentParameter(WSDLInterfaceOperationPart wsdlOperationPart, ParameterMetaData paramMetaData)
{
QName xmlType = paramMetaData.getXmlType();
- QName xmlName = paramMetaData.getXmlName();
WSDLProperty mimeTypeProp = wsdlOperationPart.getProperty(Constants.WSDL_PROPERTY_WSDL11_MIME_TYPE);
if (mimeTypeProp != null)
@@ -617,35 +612,4 @@
}
}
- /**
- * Build default action according to the pattern described in
- * http://www.w3.org/Submission/2004/SUBM-ws-addressing-20040810/
- * Section 3.3.2 'Default Action Pattern'<br>
- * [target namespace]/[port type name]/[input|output name]
- *
- * @param wsdlOperation
- * @return action value
- */
- private String buildWsaActionValue(WSDLInterfaceOperation wsdlOperation)
- {
- WSDLProperty wsaAction = wsdlOperation.getProperty(Constants.WSDL_ATTRIBUTE_WSA_ACTION.toString());
- String actionValue = null;
-
- if (null == wsaAction)
- {
-
- String tns = wsdlOperation.getQName().getNamespaceURI();
- String portTypeName = wsdlOperation.getQName().getLocalPart();
- WSDLProperty messageName = wsdlOperation.getProperty("http://www.jboss.org/jbossws/messagename/in");
-
- actionValue = new String(tns + "/" + portTypeName + "/" + messageName.getValue());
- }
- else
- {
- actionValue = wsaAction.getValue();
- }
-
- return actionValue;
- }
-
}
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-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java 2006-10-22 18:57:24 UTC (rev 1281)
@@ -22,12 +22,7 @@
// $Id: JSR109ServerMetaDataBuilder.java 906 2006-09-06 18:57:40Z thomas.diesler(a)jboss.com $
package org.jboss.ws.deployment;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -49,6 +44,8 @@
import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.ServiceEndpointInterfaceMapping;
import org.jboss.ws.metadata.jsr109.PortComponentMetaData;
@@ -57,9 +54,6 @@
import org.jboss.ws.metadata.wsdl.WSDLEndpoint;
import org.jboss.ws.metadata.wsdl.WSDLService;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
-import org.jboss.ws.metadata.wsse.WSSecurityConfigurationFactory;
-import org.jboss.ws.utils.DOMUtils;
-import org.w3c.dom.Element;
/**
* A server side meta data builder that is based on webservices.xml.
@@ -100,8 +94,8 @@
JavaWsdlMapping javaWsdlMapping = serviceMetaData.getJavaWsdlMapping();
// JBWS-1114: Check for missing javaWsdlMapping
- if (javaWsdlMapping==null)
- throw new WSException("jaxrpc-mapping-file not configured from webservices.xml");
+ if (javaWsdlMapping == null)
+ throw new WSException("jaxrpc-mapping-file not configured from webservices.xml");
// Build type mapping meta data
setupTypesMetaData(serviceMetaData);
@@ -191,7 +185,7 @@
String targetBean = webMetaData.getServletClassMap().get(servletLink);
sepMetaData.setServiceEndpointImplName(targetBean);
-
+
// Copy the wsdl publish location from jboss-web.xml
String wsdName = serviceMetaData.getWebserviceDescriptionName();
String wsdlPublishLocation = webMetaData.getWsdlPublishLocationByName(wsdName);
@@ -212,7 +206,7 @@
// init service endpoint id
ObjectName sepID = getServiceEndpointID(udi, sepMetaData);
sepMetaData.setServiceEndpointID(sepID);
-
+
replaceAddressLocation(sepMetaData);
String seiName = pcMetaData.getServiceEndpointInterface();
@@ -231,7 +225,7 @@
// Add pre handlers
WSEndpointConfigJAXRPC jaxrpcConfig = (WSEndpointConfigJAXRPC)sepMetaData.getEndpointConfig();
sepMetaData.addHandlers(jaxrpcConfig.getHandlers(sepMetaData, HandlerType.PRE));
-
+
// Setup the endpoint handlers
for (UnifiedHandlerMetaData uhmd : pcMetaData.getHandlers())
{
@@ -241,7 +235,7 @@
sepMetaData.addHandler(uhmd.getHandlerMetaDataJAXRPC(sepMetaData, HandlerType.ENDPOINT));
}
}
-
+
// Add post handlers
sepMetaData.addHandlers(jaxrpcConfig.getHandlers(sepMetaData, HandlerType.POST));
}
@@ -334,56 +328,13 @@
epMetaData.setURLPattern(urlPattern);
}
- /** Read the transport guarantee from web.xml
+ /**
+ * Check the transport guarantee using the UnifiedWebMetaData.
*/
protected void initTransportGuaranteeJSE(UnifiedDeploymentInfo udi, EndpointMetaData epMetaData, String servletLink) throws IOException
{
- File warFile = new File(udi.localUrl.getFile());
- if (warFile.isDirectory() == false)
- throw new WSException("Expected a war directory: " + udi.localUrl);
+ UnifiedWebMetaData webMetaData = (UnifiedWebMetaData)udi.metaData;
- File webXML = new File(udi.localUrl.getFile() + "/WEB-INF/web.xml");
- if (webXML.isFile() == false)
- throw new WSException("Cannot find web.xml: " + webXML);
-
- Element rootElement = DOMUtils.parse(new FileInputStream(webXML));
-
- Element elServletMapping = null;
- Iterator itServlet = DOMUtils.getChildElements(rootElement, "servlet-mapping");
- while (itServlet.hasNext() && elServletMapping == null)
- {
- Element elAux = (Element)itServlet.next();
- String servletName = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(elAux, "servlet-name"));
- if (servletLink.equals(servletName))
- elServletMapping = elAux;
- }
- if (elServletMapping != null)
- {
- // find servlet-mapping/url-pattern
- String urlPattern = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(elServletMapping, "url-pattern"));
- if (urlPattern == null)
- throw new WSException("Cannot find <url-pattern> for servlet-name: " + servletLink);
-
- Iterator itSecConstraint = DOMUtils.getChildElements(rootElement, "security-constraint");
- while (itSecConstraint.hasNext())
- {
- Element elSecurityConstraint = (Element)itSecConstraint.next();
- Iterator itWebResourceCollection = DOMUtils.getChildElements(elSecurityConstraint, "web-resource-collection");
- while (itWebResourceCollection.hasNext())
- {
- Element elWebResourceCollection = (Element)itWebResourceCollection.next();
- String wrcurlPattern = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(elWebResourceCollection, "url-pattern"));
- if (urlPattern.equals(wrcurlPattern))
- {
- Element elUserDataConstraint = DOMUtils.getFirstChildElement(elSecurityConstraint, "user-data-constraint");
- if (elUserDataConstraint != null)
- {
- String transportGuarantee = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(elUserDataConstraint, "transport-guarantee"));
- epMetaData.setTransportGuarantee(transportGuarantee);
- }
- }
- }
- }
- }
+ epMetaData.setTransportGuarantee(getTransportGuarantee(webMetaData, servletLink));
}
}
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java 2006-10-22 18:57:24 UTC (rev 1281)
@@ -65,6 +65,8 @@
import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedMessageDrivenMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection;
import org.jboss.ws.metadata.wsdl.NCName;
import org.jboss.ws.metadata.wsdl.WSDLBinding;
import org.jboss.ws.metadata.wsdl.WSDLBindingOperation;
@@ -259,7 +261,7 @@
log.warn("Cannot obtain fault type for element: " + xmlName);
xmlType = xmlName;
}
-
+
if (typesMetaData.getTypeMappingByXMLType(xmlType) != null)
javaTypeName = typesMetaData.getTypeMappingByXMLType(xmlType).getJavaTypeName();
@@ -342,6 +344,37 @@
}
}
+ protected String getTransportGuarantee(final UnifiedWebMetaData webMetaData, final String servletLink)
+ {
+ String transportGuarantee = "";
+
+ Map<String, String> servletMappings = webMetaData.getServletMappings();
+ String urlPattern = servletMappings.get(servletLink);
+
+ if (urlPattern == null)
+ throw new WSException("Cannot find <url-pattern> for servlet-name: " + servletLink);
+
+ List<UnifiedWebSecurityMetaData> securityList = webMetaData.getSecurityMetaData();
+ for (UnifiedWebSecurityMetaData currentSecurity : securityList)
+ {
+ if (currentSecurity.getTransportGuarantee() != null && currentSecurity.getTransportGuarantee().length() > 0)
+ {
+ for (UnifiedWebResourceCollection currentCollection : currentSecurity.getWebResources())
+ {
+ for (String currentUrlPattern : currentCollection.getUrlPatterns())
+ {
+ if (urlPattern.equals(currentUrlPattern))
+ {
+ transportGuarantee = currentSecurity.getTransportGuarantee();
+ }
+ }
+ }
+ }
+ }
+
+ return transportGuarantee;
+ }
+
/** Replace the address locations for a given port component.
*/
protected void replaceAddressLocation(ServerEndpointMetaData epMetaData)
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/WebMetaDataAdaptor.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/WebMetaDataAdaptor.java 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/WebMetaDataAdaptor.java 2006-10-22 18:57:24 UTC (rev 1281)
@@ -23,8 +23,18 @@
// $Id: WebMetaDataAdaptor.java 354 2006-05-16 13:46:47Z thomas.diesler(a)jboss.com $
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
import org.jboss.metadata.WebMetaData;
+import org.jboss.metadata.WebSecurityMetaData;
+import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection;
+import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection;
/**
* Build container independent web meta data
@@ -45,6 +55,38 @@
umd.setContextLoader(wmd.getContextLoader());
umd.setSecurityDomain(wmd.getSecurityDomain());
//umd.setWsdlPublishLocationMap(wmd.getWsdlPublishLocationMap());
+ umd.setSecurityMetaData(buildUnifiedWebSecurityMetaData(wmd.getSecurityContraints()));
+
return umd;
}
+
+ protected static List<UnifiedWebSecurityMetaData> buildUnifiedWebSecurityMetaData(final Iterator securityConstraints)
+ {
+ ArrayList<UnifiedWebSecurityMetaData> unifiedsecurityMetaData = new ArrayList<UnifiedWebSecurityMetaData>();
+
+ while (securityConstraints.hasNext())
+ {
+ WebSecurityMetaData securityMetaData = (WebSecurityMetaData)securityConstraints.next();
+
+ UnifiedWebSecurityMetaData current = new UnifiedWebSecurityMetaData();
+ unifiedsecurityMetaData.add(current);
+
+ current.setTransportGuarantee(securityMetaData.getTransportGuarantee());
+
+ HashMap resources = securityMetaData.getWebResources();
+ for (Object webResourceObj : resources.values())
+ {
+ WebResourceCollection webResource = (WebResourceCollection)webResourceObj;
+ UnifiedWebResourceCollection currentResource = current.addWebResource(webResource.getName());
+ for (String currentPattern : webResource.getUrlPatterns())
+ {
+ currentResource.addPattern(currentPattern);
+ }
+ }
+
+ }
+
+ return unifiedsecurityMetaData;
+ }
+
}
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2006-10-22 18:57:24 UTC (rev 1281)
@@ -28,8 +28,10 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import javax.servlet.ServletContext;
@@ -39,6 +41,8 @@
import org.jboss.ws.deployment.UnifiedDeploymentInfo;
import org.jboss.ws.deployment.ServiceEndpointPublisher;
import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection;
import org.w3c.dom.Element;
/**
@@ -87,6 +91,7 @@
wmd.setConfigName(ctx.getInitParameter("jbossws-config-name"));
wmd.setConfigFile(ctx.getInitParameter("jbossws-config-file"));
wmd.setContextLoader(udi.ucl);
+ wmd.setSecurityMetaData(getSecurityMetaData(webXML));
return wmd;
}
@@ -148,6 +153,45 @@
return servletClassMap;
}
+ private static List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Element root)
+ {
+ ArrayList<UnifiedWebSecurityMetaData> securityMetaData = new ArrayList<UnifiedWebSecurityMetaData>();
+
+ Iterator itSecurityConstraint = DOMUtils.getChildElements(root, "security-constraint");
+ while (itSecurityConstraint.hasNext())
+ {
+ UnifiedWebSecurityMetaData uwsmd = new UnifiedWebSecurityMetaData();
+ securityMetaData.add(uwsmd);
+
+ Element securityConstraint = (Element)itSecurityConstraint.next();
+
+ Iterator itWebResCol = DOMUtils.getChildElements(securityConstraint, "web-resource-collection");
+ while (itWebResCol.hasNext())
+ {
+ Element webResCol = (Element)itWebResCol.next();
+ String webResName = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(webResCol, "web-resource-name"));
+ UnifiedWebResourceCollection uwrc = uwsmd.addWebResource(webResName);
+
+ Iterator itUrlPatters = DOMUtils.getChildElements(webResCol, "url-pattern");
+ while (itUrlPatters.hasNext())
+ {
+ Element urlPattern = (Element)itUrlPatters.next();
+ uwrc.addPattern(DOMUtils.getTextContent(urlPattern));
+ }
+ }
+
+ Element userData = DOMUtils.getFirstChildElement(securityConstraint, "user-data-constraint");
+ if (userData != null)
+ {
+ String transportGuarantee = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(userData, "transport-guarantee"));
+ uwsmd.setTransportGuarantee(transportGuarantee);
+ }
+
+ }
+
+ return securityMetaData;
+ }
+
private static Element getWebXMLDocument(ServletContext ctx)
{
URL webXML = null;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java 2006-10-22 18:57:24 UTC (rev 1281)
@@ -24,6 +24,7 @@
//$Id: UnifiedWebMetaData.java 316 2006-05-12 17:09:42Z thomas.diesler(a)jboss.com $
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -50,7 +51,9 @@
private String securityDomain;
/** A HashMap<String, String> for webservice description publish locations */
private Map<String, String> wsdlPublishLocationMap = new HashMap<String, String>();
-
+ /** web.xml security-constraints */
+ private List<UnifiedWebSecurityMetaData> securityMetaData;
+
public String getContextRoot()
{
return contextRoot;
@@ -121,6 +124,16 @@
this.securityDomain = securityDomain;
}
+ public List<UnifiedWebSecurityMetaData> getSecurityMetaData()
+ {
+ return securityMetaData;
+ }
+
+ public void setSecurityMetaData(List<UnifiedWebSecurityMetaData> securityMetaData)
+ {
+ this.securityMetaData = securityMetaData;
+ }
+
public void setWsdlPublishLocationMap(Map<String, String> wsdlPublishLocationMap)
{
this.wsdlPublishLocationMap = wsdlPublishLocationMap;
@@ -130,5 +143,6 @@
{
// if not found, the we will use default
return wsdlPublishLocationMap.get(name);
- }
+ }
+
}
Added: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebSecurityMetaData.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebSecurityMetaData.java 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebSecurityMetaData.java 2006-10-22 18:57:24 UTC (rev 1281)
@@ -0,0 +1,95 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.metadata.j2ee;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Oct 22, 2006
+ */
+public class UnifiedWebSecurityMetaData
+{
+
+ /** The optional security-constraint/user-data-constraint/transport-guarantee */
+ private String transportGuarantee;
+
+ /**
+ * The HashMap for the security-constraint/web-resource-collection
+ * elements.
+ */
+ private HashMap<String, UnifiedWebResourceCollection> webResources = new HashMap<String, UnifiedWebResourceCollection>();
+
+ public UnifiedWebResourceCollection addWebResource(final String name)
+ {
+ UnifiedWebResourceCollection wrc = new UnifiedWebResourceCollection(name);
+ webResources.put(name, wrc);
+
+ return wrc;
+ }
+
+ public Collection<UnifiedWebResourceCollection> getWebResources()
+ {
+ return webResources.values();
+ }
+
+ public String getTransportGuarantee()
+ {
+ return transportGuarantee;
+ }
+
+ public void setTransportGuarantee(String transportGuarantee)
+ {
+ this.transportGuarantee = transportGuarantee;
+ }
+
+ public static class UnifiedWebResourceCollection
+ {
+ private String name;
+ /** The required url-pattern element(s) */
+ private HashSet<String> urlPatterns = new HashSet<String>();
+
+ public UnifiedWebResourceCollection(final String name)
+ {
+ this.name = name;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void addPattern(String pattern)
+ {
+ urlPatterns.add(pattern);
+ }
+
+ public HashSet<String> getUrlPatterns()
+ {
+ return urlPatterns;
+ }
+ }
+
+}
Property changes on: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebSecurityMetaData.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml
===================================================================
--- branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml 2006-10-22 18:57:24 UTC (rev 1281)
@@ -783,6 +783,36 @@
<include name="wsdl/**"/>
</webinf>
</war>
+
+ <!-- jaxrpc-jbws1190 -->
+ <war warfile="${build.test.dir}/libs/jaxrpc-jbws1190.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1190/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl$1.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1190/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="test-mapping.xml"/>
+ <include name="confidential-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-jbws1190-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1190/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1190/WEB-INF">
+ <include name="test-mapping.xml"/>
+ </metainf>
+ </jar>
<!-- jaxrpcws-jbws1205 -->
<war warfile="${build.test.dir}/libs/jaxrpc-jbws1205-simple.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml">
Modified: branches/jbossws-1.0/src/test/ant/build-jars-jaxws.xml
===================================================================
--- branches/jbossws-1.0/src/test/ant/build-jars-jaxws.xml 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/test/ant/build-jars-jaxws.xml 2006-10-22 18:57:24 UTC (rev 1281)
@@ -82,6 +82,16 @@
</classes>
</war>
+ <!-- jaxws-jbws1190 -->
+ <war destfile="${build.test.dir}/libs/jaxws-jbws1190.war" webxml="${build.test.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl*.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.class"/>
+ </classes>
+ </war>
+
<!-- jaxws-jsr181-complex -->
<war warfile="${build.test.dir}/libs/jaxws-jsr181-complex.war" webxml="${build.test.dir}/resources/jaxws/jsr181/complex/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java 2006-10-22 18:57:24 UTC (rev 1281)
@@ -0,0 +1,37 @@
+/*
+ * 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.jaxrpc.jbws1190;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 19-October-2006
+ */
+public interface ConfidentialEndpoint extends Remote
+{
+
+ public String helloWorld(final String message) throws RemoteException;
+
+}
Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java 2006-10-22 18:57:24 UTC (rev 1281)
@@ -0,0 +1,42 @@
+/*
+ * 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.jaxrpc.jbws1190;
+
+import java.rmi.RemoteException;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Oct 22, 2006
+ */
+public class ConfidentialEndpointImpl implements ConfidentialEndpoint
+{
+
+ /**
+ * @see org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpoint#helloWorld(java.lang.String)
+ */
+ public String helloWorld(final String message) throws RemoteException
+ {
+ return message;
+ }
+
+}
Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java 2006-10-22 18:57:24 UTC (rev 1281)
@@ -0,0 +1,55 @@
+/*
+ * 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.jaxrpc.jbws1190;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 19-October-2006
+ */
+public class JBWS1190Exception extends RuntimeException
+{
+
+ /** */
+ private static final long serialVersionUID = 5957186382787505270L;
+
+ public JBWS1190Exception()
+ {
+ super();
+ }
+
+ public JBWS1190Exception(final String message, final Throwable cause)
+ {
+ super(message, cause);
+ }
+
+ public JBWS1190Exception(final String message)
+ {
+ super(message);
+ }
+
+ public JBWS1190Exception(final Throwable cause)
+ {
+ super(cause);
+ }
+
+}
Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2006-10-22 18:57:24 UTC (rev 1281)
@@ -0,0 +1,67 @@
+/*
+ * 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.jaxrpc.jbws1190;
+
+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;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Oct 22, 2006
+ */
+public class JBWS1190TestCase extends JBossWSTest
+{
+ private static final String ARCHIVE_NAME = "jaxrpc-jbws1190.war";
+
+ private static TestEndpoint port;
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME+", jaxrpc-jbws1190-client.jar");
+ }
+
+ protected void setUp() throws Exception
+ {
+ if (port == null)
+ {
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+ port = (TestEndpoint)service.getPort(TestEndpoint.class);
+ }
+ }
+
+ public void testTestEndpoint() throws Exception
+ {
+ port.testAddress(ARCHIVE_NAME, "TestService", "http", "8080");
+ }
+
+ public void testConfidentialEndpoint() throws Exception
+ {
+ port.testAddress(ARCHIVE_NAME, "ConfidentialService", "https", "8443");
+ }
+}
Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java 2006-10-22 18:57:24 UTC (rev 1281)
@@ -0,0 +1,37 @@
+/*
+ * 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.jaxrpc.jbws1190;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 19-October-2006
+ */
+public interface TestEndpoint extends Remote
+{
+
+ public void testAddress(final String archive, final String service, final String scheme, final String port) throws RemoteException;
+
+}
Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2006-10-22 18:57:24 UTC (rev 1281)
@@ -0,0 +1,102 @@
+/*
+ * 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.jaxrpc.jbws1190;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.net.MalformedURLException;
+
+import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory;
+import org.jboss.ws.metadata.wsdl.WSDLEndpoint;
+import org.jboss.ws.metadata.wsdl.WSDLService;
+import org.jboss.ws.server.ServerConfig;
+import org.jboss.ws.server.ServerConfigFactory;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 19-October-2006
+ */
+public class TestEndpointImpl implements TestEndpoint
+{
+
+ public void testAddress(final String archive, final String service, final String scheme, final String port)
+ {
+ ServerConfigFactory serverConfigFactory = ServerConfigFactory.getInstance();
+ ServerConfig serverConfig = serverConfigFactory.getServerConfig();
+
+ File dataDir = serverConfig.getServerDataDir();
+ File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive);
+
+ if (wsdlDir.exists() == false)
+ {
+ throw new JBWS1190Exception(wsdlDir.getAbsolutePath() + " does not exist.");
+ }
+
+ File[] wsdls = wsdlDir.listFiles(new FilenameFilter() {
+ public boolean accept(File dir, String name)
+ {
+ return name.startsWith(service);
+ }
+ });
+
+ assertEquals("WSDL files found", 1, wsdls.length);
+
+ WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
+ WSDLDefinitions wsdl;
+ try
+ {
+ wsdl = factory.parse(wsdls[0].toURL());
+ }
+ catch (MalformedURLException e)
+ {
+ throw new JBWS1190Exception("Error readin WSDL", e);
+ }
+
+ WSDLService[] services = wsdl.getServices();
+ assertEquals("No of services", 1, services.length);
+
+ WSDLEndpoint[] endpoints = services[0].getEndpoints();
+ assertEquals("No of endpoints", 1, endpoints.length);
+
+ String address = endpoints[0].getAddress();
+ assertTrue("Expected Scheme '" + scheme + "'", address.startsWith(scheme + "://"));
+ assertTrue("Expected Port '" + port + "'", address.contains(":" + port + "/"));
+ }
+
+ private void assertEquals(final String message, final int expected, final int actual)
+ {
+ if (expected != actual)
+ {
+ throw new JBWS1190Exception(message + " expected=" + expected + " actual=" + actual);
+ }
+ }
+
+ private void assertTrue(final String message, final boolean value)
+ {
+ if (value == false)
+ {
+ throw new JBWS1190Exception(message);
+ }
+ }
+}
Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190 (from rev 1273, branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190)
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java
===================================================================
--- branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java 2006-10-19 15:10:32 UTC (rev 1273)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java 2006-10-22 18:57:24 UTC (rev 1281)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws1190;
-
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 19-October-2006
- */
-@WebService(targetNamespace = "http://org.jboss/test/ws/jbws1190")
-@SOAPBinding(style = SOAPBinding.Style.RPC)
-public class ConfidentialEndpoint
-{
-
- public String helloWorld(final String message)
- {
- return message;
- }
-
-}
Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java (from rev 1273, branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java)
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java
===================================================================
--- branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java 2006-10-19 15:10:32 UTC (rev 1273)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java 2006-10-22 18:57:24 UTC (rev 1281)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws1190;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 19-October-2006
- */
-public class JBWS1190Exception extends RuntimeException
-{
-
- public JBWS1190Exception()
- {
- super();
- }
-
- public JBWS1190Exception(final String message, final Throwable cause)
- {
- super(message, cause);
- }
-
- public JBWS1190Exception(final String message)
- {
- super(message);
- }
-
- public JBWS1190Exception(final Throwable cause)
- {
- super(cause);
- }
-
-}
Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java (from rev 1273, branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java)
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2006-10-19 15:10:32 UTC (rev 1273)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2006-10-22 18:57:24 UTC (rev 1281)
@@ -1,85 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws1190;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Call;
-import javax.xml.rpc.Service;
-
-import junit.framework.Test;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.jaxrpc.ServiceFactoryImpl;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 19-October-2006
- */
-public class JBWS1190TestCase extends JBossWSTest
-{
-
- private static final String ARCHIVE_NAME = "jaxws-jbws1190.war";
-
- private static Service service;
-
- public static Test suite()
- {
- return JBossWSTestSetup.newTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME);
- }
-
- protected void setUp() throws Exception
- {
- if (service == null)
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1190/TestEndpoint?wsdl");
-
- QName qname = new QName("http://org.jboss/test/ws/jbws1190", "TestEndpointService");
- service = factory.createService(wsdlURL, qname);
- }
- }
-
- public void testTestEndpoint() throws Exception
- {
- QName portName = new QName("http://org.jboss/test/ws/jbws1190", "TestEndpointPort");
- QName methodName = new QName("http://org.jboss/test/ws/jbws1190", "testAddress");
-
- Call call = service.createCall(portName);
- call.setOperationName(methodName);
- call.invoke(new Object[] { ARCHIVE_NAME, "TestEndpointService", "http", "8080" });
- }
-
- public void testConfidentialEndpoint() throws Exception
- {
- QName portName = new QName("http://org.jboss/test/ws/jbws1190", "TestEndpointPort");
- QName methodName = new QName("http://org.jboss/test/ws/jbws1190", "testAddress");
-
- Call call = service.createCall(portName);
- call.setOperationName(methodName);
- call.invoke(new Object[] { ARCHIVE_NAME, "TestEndpointService", "https", "8484" });
- }
-
-}
Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java (from rev 1273, branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java)
===================================================================
--- branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2006-10-19 15:10:32 UTC (rev 1273)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2006-10-22 18:57:24 UTC (rev 1281)
@@ -0,0 +1,85 @@
+/*
+ * 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.jaxws.jbws1190;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.Call;
+import javax.xml.rpc.Service;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.ws.jaxrpc.ServiceFactoryImpl;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 19-October-2006
+ */
+public class JBWS1190TestCase extends JBossWSTest
+{
+
+ private static final String ARCHIVE_NAME = "jaxws-jbws1190.war";
+
+ private static Service service;
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME);
+ }
+
+ protected void setUp() throws Exception
+ {
+ if (service == null)
+ {
+ ServiceFactoryImpl factory = new ServiceFactoryImpl();
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1190/TestEndpoint?wsdl");
+
+ QName qname = new QName("http://org.jboss/test/ws/jbws1190", "TestEndpointService");
+ service = factory.createService(wsdlURL, qname);
+ }
+ }
+
+ public void testTestEndpoint() throws Exception
+ {
+ QName portName = new QName("http://org.jboss/test/ws/jbws1190", "TestEndpointPort");
+ QName methodName = new QName("http://org.jboss/test/ws/jbws1190", "testAddress");
+
+ Call call = service.createCall(portName);
+ call.setOperationName(methodName);
+ call.invoke(new Object[] { ARCHIVE_NAME, "TestEndpointService", "http", "8080" });
+ }
+
+ public void testConfidentialEndpoint() throws Exception
+ {
+ QName portName = new QName("http://org.jboss/test/ws/jbws1190", "TestEndpointPort");
+ QName methodName = new QName("http://org.jboss/test/ws/jbws1190", "testAddress");
+
+ Call call = service.createCall(portName);
+ call.setOperationName(methodName);
+ call.invoke(new Object[] { ARCHIVE_NAME, "ConfidentialEndpointService", "https", "8443" });
+ }
+
+}
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java
===================================================================
--- branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java 2006-10-19 15:10:32 UTC (rev 1273)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java 2006-10-22 18:57:24 UTC (rev 1281)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws1190;
-
-import java.rmi.Remote;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 19-October-2006
- */
-@WebService(targetNamespace = "http://org.jboss/test/ws/jbws1190")
-@SOAPBinding(style = SOAPBinding.Style.RPC)
-public interface TestEndpoint extends Remote
-{
-
- @WebMethod
- public void testAddress(final String archive, final String service, final String scheme, final String port);
-
-}
Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java (from rev 1273, branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java)
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java
===================================================================
--- branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2006-10-19 15:10:32 UTC (rev 1273)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2006-10-22 18:57:24 UTC (rev 1281)
@@ -1,105 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws1190;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.net.MalformedURLException;
-
-import javax.jws.WebService;
-
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory;
-import org.jboss.ws.metadata.wsdl.WSDLEndpoint;
-import org.jboss.ws.metadata.wsdl.WSDLService;
-import org.jboss.ws.server.ServerConfig;
-import org.jboss.ws.server.ServerConfigFactory;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 19-October-2006
- */
-@WebService(name = "TestEndpoint", endpointInterface = "org.jboss.test.ws.jaxws.jbws1190.TestEndpoint")
-public class TestEndpointImpl implements TestEndpoint
-{
-
- public void testAddress(final String archive, final String service, final String scheme, final String port)
- {
- ServerConfigFactory serverConfigFactory = ServerConfigFactory.getInstance();
- ServerConfig serverConfig = serverConfigFactory.getServerConfig();
-
- File dataDir = serverConfig.getServerDataDir();
- File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive);
-
- if (wsdlDir.exists() == false)
- {
- throw new JBWS1190Exception(wsdlDir.getAbsolutePath() + " does not exist.");
- }
-
- File[] wsdls = wsdlDir.listFiles(new FilenameFilter() {
- public boolean accept(File dir, String name)
- {
- return name.startsWith(service);
- }
- });
-
- assertEquals("WSDL files found", 1, wsdls.length);
-
- WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
- WSDLDefinitions wsdl;
- try
- {
- wsdl = factory.parse(wsdls[0].toURL());
- }
- catch (MalformedURLException e)
- {
- throw new JBWS1190Exception("Error readin WSDL", e);
- }
-
- WSDLService[] services = wsdl.getServices();
- assertEquals("No of services", 1, services.length);
-
- WSDLEndpoint[] endpoints = services[0].getEndpoints();
- assertEquals("No of endpoints", 1, endpoints.length);
-
- String address = endpoints[0].getAddress();
- assertTrue("Expected Scheme '" + scheme + "'", address.startsWith(scheme + "://"));
- assertTrue("Expected Port '" + port + "'", address.contains(":" + port + "/"));
- }
-
- private void assertEquals(final String message, final int expected, final int actual)
- {
- if (expected != actual)
- {
- throw new JBWS1190Exception(message + " expected=" + expected + " actual=" + actual);
- }
- }
-
- private void assertTrue(final String message, final boolean value)
- {
- if (value == false)
- {
- throw new JBWS1190Exception(message);
- }
- }
-}
Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java (from rev 1273, branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java)
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml 2006-10-22 18:57:24 UTC (rev 1281)
@@ -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>TestService</display-name>
+
+ <service-ref>
+ <service-ref-name>service/TestService</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>META-INF/test-mapping.xml</jaxrpc-mapping-file>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1190.TestEndpoint</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+
+</application-client>
+
Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml 2006-10-22 18:57:24 UTC (rev 1281)
@@ -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-jbws1190/TestEndpoint?wsdl</wsdl-override>
+ </service-ref>
+
+</jboss-client>
Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml 2006-10-22 18:57:24 UTC (rev 1281)
@@ -0,0 +1,37 @@
+<?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.jaxrpc.jbws1190</package-type>
+ <namespaceURI>http://org.jboss.test.ws/jbws1190/types</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1190'>serviceNS:ConfidentialService</wsdl-service-name>
+ <port-mapping>
+ <port-name>ConfidentialEndpointPort</port-name>
+ <java-port-name>ConfidentialEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1190'>portTypeNS:ConfidentialEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1190'>bindingNS:ConfidentialEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>helloWorld</java-method-name>
+ <wsdl-operation>helloWorld</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1190'>wsdlMsgNS:ConfidentialEndpoint_helloWorld</wsdl-message>
+ <wsdl-message-part-name>String_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.String</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1190'>wsdlMsgNS:ConfidentialEndpoint_helloWorldResponse</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/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml 2006-10-22 18:57:24 UTC (rev 1281)
@@ -0,0 +1,59 @@
+<?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.jaxrpc.jbws1190</package-type>
+ <namespaceURI>http://org.jboss.test.ws/jbws1190/types</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jaxrpc.jbws1190.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1190'>serviceNS:TestService</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1190.TestEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1190'>portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1190'>bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>testAddress</java-method-name>
+ <wsdl-operation>testAddress</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1190'>wsdlMsgNS:TestEndpoint_testAddress</wsdl-message>
+ <wsdl-message-part-name>String_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1190'>wsdlMsgNS:TestEndpoint_testAddress</wsdl-message>
+ <wsdl-message-part-name>String_2</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>2</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1190'>wsdlMsgNS:TestEndpoint_testAddress</wsdl-message>
+ <wsdl-message-part-name>String_3</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>3</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1190'>wsdlMsgNS:TestEndpoint_testAddress</wsdl-message>
+ <wsdl-message-part-name>String_4</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-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/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml 2006-10-22 18:57:24 UTC (rev 1281)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.4" 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">
+
+ <servlet>
+ <servlet-name>ConfidentialEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpoint</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.jbws1190.TestEndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>ConfidentialEndpoint</servlet-name>
+ <url-pattern>/ConfidentialEndpoint</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/TestEndpoint</url-pattern>
+ </servlet-mapping>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>ConfidentialEndpoint</web-resource-name>
+ <url-pattern>/ConfidentialEndpoint</url-pattern>
+ </web-resource-collection>
+ <user-data-constraint>
+ <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+</web-app>
\ No newline at end of file
Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml 2006-10-22 18:57:24 UTC (rev 1281)
@@ -0,0 +1,28 @@
+<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1190' 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>TestService</webservice-description-name>
+ <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/test-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>TestEndpointPort</port-component-name>
+ <wsdl-port>impl:TestEndpointPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1190.TestEndpoint</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>TestEndpoint</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+ <webservice-description>
+ <webservice-description-name>ConfidentialService</webservice-description-name>
+ <wsdl-file>WEB-INF/wsdl/ConfidentialService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/confidential-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>ConfidentialEndpointPort</port-component-name>
+ <wsdl-port>impl:ConfidentialEndpointPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpoint</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>ConfidentialEndpoint</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
\ No newline at end of file
Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl 2006-10-22 18:57:24 UTC (rev 1281)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='ConfidentialService' targetNamespace='http://org.jboss.test.ws/jbws1190' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1190' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types/>
+ <message name='ConfidentialEndpoint_helloWorld'>
+ <part name='String_1' type='xsd:string'/>
+ </message>
+ <message name='ConfidentialEndpoint_helloWorldResponse'>
+ <part name='result' type='xsd:string'/>
+ </message>
+ <portType name='ConfidentialEndpoint'>
+ <operation name='helloWorld' parameterOrder='String_1'>
+ <input message='tns:ConfidentialEndpoint_helloWorld'/>
+ <output message='tns:ConfidentialEndpoint_helloWorldResponse'/>
+ </operation>
+ </portType>
+ <binding name='ConfidentialEndpointBinding' type='tns:ConfidentialEndpoint'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='helloWorld'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='ConfidentialService'>
+ <port binding='tns:ConfidentialEndpointBinding' name='ConfidentialEndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl 2006-10-22 18:57:24 UTC (rev 1281)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1190' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1190' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types/>
+ <message name='TestEndpoint_testAddress'>
+ <part name='String_1' type='xsd:string'/>
+ <part name='String_2' type='xsd:string'/>
+ <part name='String_3' type='xsd:string'/>
+ <part name='String_4' type='xsd:string'/>
+ </message>
+ <message name='TestEndpoint_testAddressResponse'/>
+ <portType name='TestEndpoint'>
+ <operation name='testAddress' parameterOrder='String_1 String_2 String_3 String_4'>
+ <input message='tns:TestEndpoint_testAddress'/>
+ <output message='tns:TestEndpoint_testAddressResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='testAddress'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestService'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/confidential-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/confidential-config.xml 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/confidential-config.xml 2006-10-22 18:57:24 UTC (rev 1281)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config confidential-config.xml
+-->
+
+<!-- Run wstools for test config first, then follow with confidential-config -->
+
+<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">
+ <java-wsdl>
+ <service name="ConfidentialService" endpoint="org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpoint" style="rpc">
+ </service>
+ <namespaces target-namespace="http://org.jboss.test.ws/jbws1190" type-namespace="http://org.jboss.test.ws/jbws1190/types"/>
+ <mapping file="confidential-mapping.xml"/>
+ <webservices servlet-link="ConfidentialEndpoint" append="true"/>
+ </java-wsdl>
+</configuration>
Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/confidential-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/test-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/test-config.xml 2006-10-22 13:22:00 UTC (rev 1280)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/test-config.xml 2006-10-22 18:57:24 UTC (rev 1281)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config test-config.xml
+-->
+
+<!-- Run wstools for test config first, then follow with confidential-config -->
+
+<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">
+ <java-wsdl>
+ <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1190.TestEndpoint" style="rpc">
+ </service>
+ <namespaces target-namespace="http://org.jboss.test.ws/jbws1190" type-namespace="http://org.jboss.test.ws/jbws1190/types"/>
+ <mapping file="test-mapping.xml"/>
+ <webservices servlet-link="TestEndpoint"/>
+ </java-wsdl>
+</configuration>
Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/test-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: branches/jbossws-1.0/src/test/resources/jaxws/jbws1190 (from rev 1273, branches/dlofthouse/JBWS-1190/src/test/resources/jaxws/jbws1190)
Copied: branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/WEB-INF (from rev 1273, branches/dlofthouse/JBWS-1190/src/test/resources/jaxws/jbws1190/WEB-INF)
Deleted: branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml
===================================================================
--- branches/dlofthouse/JBWS-1190/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml 2006-10-19 15:10:32 UTC (rev 1273)
+++ branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml 2006-10-22 18:57:24 UTC (rev 1281)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app version="2.4" 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">
-
- <servlet>
- <servlet-name>ConfidentialEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.jbws1190.ConfidentialEndpoint</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>TestEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.jbws1190.TestEndpointImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>ConfidentialEndpoint</servlet-name>
- <url-pattern>/ConfidentialEndpoint</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/TestEndpoint</url-pattern>
- </servlet-mapping>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>ConfidentialEndpoint</web-resource-name>
- <url-pattern>/ConfidentialEndpoint</url-pattern>
- </web-resource-collection>
- <user-data-constraint>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-</web-app>
\ No newline at end of file
Copied: branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml (from rev 1273, branches/dlofthouse/JBWS-1190/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml)
17 years, 6 months
- 1
- 0
JBossWS SVN: r1280 - branches/dlofthouse
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2006-10-22 09:22:00 -0400 (Sun, 22 Oct 2006)
New Revision: 1280
Removed:
branches/dlofthouse/JBWS-1179/
Log:
Branch for JBWS-1179 no longer required.
17 years, 6 months
- 1
- 0
JBossWS SVN: r1279 - in branches/jbossws-1.0/src: main/java/org/jboss/ws/common main/java/org/jboss/ws/server test/ant test/java/org/jboss/test/ws/jaxrpc test/java/org/jboss/test/ws/jaxrpc/jbws1179 test/resources/jaxrpc test/resources/jaxrpc/jbws1179 test/resources/jaxrpc/jbws1179/META-INF test/resources/jaxrpc/jbws1179/WEB-INF test/resources/jaxrpc/jbws1179/WEB-INF/wsdl
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2006-10-22 09:20:45 -0400 (Sun, 22 Oct 2006)
New Revision: 1279
Added:
branches/jbossws-1.0/src/main/java/org/jboss/ws/common/MessageContextPropertyHelper.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/wstools-config.xml
Removed:
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/wstools-config.xml
Modified:
branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonMessageContext.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java
branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml
Log:
JBWS-1179 - Delay creation of HttpSession until it is actually used.
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonMessageContext.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonMessageContext.java 2006-10-22 12:01:19 UTC (rev 1278)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonMessageContext.java 2006-10-22 13:20:45 UTC (rev 1279)
@@ -119,7 +119,14 @@
*/
public Object getProperty(String name)
{
- return props.get(name);
+ Object value = props.get(name);
+
+ if (value instanceof MessageContextPropertyHelper)
+ {
+ return ((MessageContextPropertyHelper)value).get();
+ }
+
+ return value;
}
/**
Added: branches/jbossws-1.0/src/main/java/org/jboss/ws/common/MessageContextPropertyHelper.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/common/MessageContextPropertyHelper.java 2006-10-22 12:01:19 UTC (rev 1278)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/common/MessageContextPropertyHelper.java 2006-10-22 13:20:45 UTC (rev 1279)
@@ -0,0 +1,41 @@
+/*
+ * 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.common;
+
+/**
+ * Interface to be implemented by property helpers to assist the retrieval
+ * of objects added to the property context.
+ *
+ * If an instance of MessageContextPropertyHelper is added to the
+ * CommonMessageContext a call to get for the same property will return
+ * the result of callig get on the helper instead of returning the helper
+ * itself.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Oct 22, 2006
+ */
+public interface MessageContextPropertyHelper
+{
+
+ public Object get();
+
+}
Property changes on: branches/jbossws-1.0/src/main/java/org/jboss/ws/common/MessageContextPropertyHelper.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java 2006-10-22 12:01:19 UTC (rev 1278)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java 2006-10-22 13:20:45 UTC (rev 1279)
@@ -46,7 +46,6 @@
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
@@ -58,6 +57,7 @@
import org.jboss.ws.WSException;
import org.jboss.ws.addressing.AddressingConstantsImpl;
import org.jboss.ws.common.CommonMessageContext;
+import org.jboss.ws.common.MessageContextPropertyHelper;
import org.jboss.ws.jaxrpc.handler.MessageContextJAXRPC;
import org.jboss.ws.jaxrpc.handler.SOAPMessageContextJAXRPC;
import org.jboss.ws.metadata.HandlerMetaData;
@@ -353,7 +353,7 @@
// Get the type of the endpoint
ServerEndpointMetaData sepMetaData = wsEndpoint.getServiceEndpointInfo().getServerEndpointMetaData();
- HttpSession httpSession = context.getHttpSession();
+ MessageContextPropertyHelper httpSession = new HttpSessionPropertyHelper(context);
ServletContext servletContext = context.getServletContext();
HttpServletRequest httpRequest = context.getHttpServletRequest();
HttpServletResponse httpResponse = context.getHttpServletResponse();
@@ -628,4 +628,21 @@
}
return server;
}
+
+ public static class HttpSessionPropertyHelper implements MessageContextPropertyHelper
+ {
+
+ private EndpointContext context;
+
+ public HttpSessionPropertyHelper(final EndpointContext context)
+ {
+ this.context = context;
+ }
+
+ public Object get()
+ {
+ return context.getHttpSession();
+ }
+
+ }
}
Modified: branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml
===================================================================
--- branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml 2006-10-22 12:01:19 UTC (rev 1278)
+++ branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml 2006-10-22 13:20:45 UTC (rev 1279)
@@ -743,6 +743,32 @@
</metainf>
</jar>
+ <!-- jbossws-jbws1179 -->
+ <war warfile="${build.test.dir}/libs/jaxrpc-jbws1179.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1179/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1179/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1179-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1179/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1179/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
<!-- jbossws-jbws1186 -->
<war warfile="${build.test.dir}/libs/jaxrpc-jbws1186.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1186/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179 (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179)
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1179/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2006-10-18 10:02:48 UTC (rev 1252)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2006-10-22 13:20:45 UTC (rev 1279)
@@ -1,78 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.jbws1179;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-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;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 18-October-2006
- */
-public class JBWS1179TestCase extends JBossWSTest
-{
-
- public static TestEndpoint port;
-
- public static Test suite() throws Exception
- {
- return JBossWSTestSetup.newTestSetup(JBWS1179TestCase.class, "jaxrpc-jbws1179.war, jaxrpc-jbws1179-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 = (TestEndpoint)service.getPort(TestEndpoint.class);
- }
- }
-
- protected int getActiveSessions() throws Exception
- {
- MBeanServerConnection server = getServer();
- ObjectName objectName = new ObjectName("jboss.web:host=localhost,path=/jaxrpc-jbws1179,type=Manager");
-
- return ((Integer)server.getAttribute(objectName, "activeSessions")).intValue();
- }
-
- public void testCallCreateNoSession() throws Exception
- {
- int originalSessions = getActiveSessions();
-
- port.echoMessage("Hello");
-
- int finalSessions = getActiveSessions();
-
- assertEquals("activeSessions after call", originalSessions, finalSessions);
- }
-}
Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java)
===================================================================
--- branches/dlofthouse/JBWS-1179/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2006-10-18 10:02:48 UTC (rev 1252)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2006-10-22 13:20:45 UTC (rev 1279)
@@ -0,0 +1,89 @@
+/*
+ * 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.jaxrpc.jbws1179;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+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;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 18-October-2006
+ */
+public class JBWS1179TestCase extends JBossWSTest
+{
+
+ public static TestEndpoint port;
+
+ public static Test suite() throws Exception
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1179TestCase.class, "jaxrpc-jbws1179.war, jaxrpc-jbws1179-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 = (TestEndpoint)service.getPort(TestEndpoint.class);
+ }
+ }
+
+ protected int getActiveSessions() throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ ObjectName objectName = new ObjectName("jboss.web:host=localhost,path=/jaxrpc-jbws1179,type=Manager");
+
+ return ((Integer)server.getAttribute(objectName, "activeSessions")).intValue();
+ }
+
+ public void testCallCreateNoSession() throws Exception
+ {
+ int originalSessions = getActiveSessions();
+
+ port.echoMessage("Hello");
+
+ int finalSessions = getActiveSessions();
+
+ assertEquals("activeSessions after call", originalSessions, finalSessions);
+ }
+
+ public void testAccessSession() throws Exception
+ {
+ int originalSessions = getActiveSessions();
+
+ assertTrue("Can access session", port.canAccessSession());
+
+ int finalSessions = getActiveSessions();
+
+ assertEquals("activeSessions after call", originalSessions + 1, finalSessions);
+ }
+}
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java
===================================================================
--- branches/dlofthouse/JBWS-1179/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java 2006-10-18 10:02:48 UTC (rev 1252)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java 2006-10-22 13:20:45 UTC (rev 1279)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.jbws1179;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 18-October-2006
- */
-public interface TestEndpoint extends Remote
-{
-
- public String echoMessage(final String message) throws RemoteException;
-
-}
Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java)
===================================================================
--- branches/dlofthouse/JBWS-1179/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java 2006-10-18 10:02:48 UTC (rev 1252)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java 2006-10-22 13:20:45 UTC (rev 1279)
@@ -0,0 +1,51 @@
+/*
+ * 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.jaxrpc.jbws1179;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 18-October-2006
+ */
+public interface TestEndpoint extends Remote
+{
+
+ /**
+ * Simple call to test if a session is created.
+ *
+ * @param message
+ * @return
+ * @throws RemoteException
+ */
+ public String echoMessage(final String message) throws RemoteException;
+
+ /**
+ * Call to test if the session can be accessed.
+ *
+ * @return
+ * @throws RemoteException
+ */
+ public boolean canAccessSession() throws RemoteException;
+}
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java
===================================================================
--- branches/dlofthouse/JBWS-1179/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java 2006-10-18 10:02:48 UTC (rev 1252)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java 2006-10-22 13:20:45 UTC (rev 1279)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.jbws1179;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 18-October-2006
- */
-public class TestEndpointImpl implements TestEndpoint
-{
-
- public String echoMessage(String message)
- {
- return message;
- }
-
-}
Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java)
===================================================================
--- branches/dlofthouse/JBWS-1179/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java 2006-10-18 10:02:48 UTC (rev 1252)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java 2006-10-22 13:20:45 UTC (rev 1279)
@@ -0,0 +1,60 @@
+/*
+ * 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.jaxrpc.jbws1179;
+
+import java.rmi.RemoteException;
+
+import javax.servlet.http.HttpSession;
+
+import org.jboss.ws.common.CommonMessageContext;
+import org.jboss.ws.jaxrpc.handler.MessageContextJAXRPC;
+import org.jboss.ws.soap.MessageContextAssociation;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 18-October-2006
+ */
+public class TestEndpointImpl implements TestEndpoint
+{
+
+ public String echoMessage(String message)
+ {
+ return message;
+ }
+
+ public boolean canAccessSession() throws RemoteException
+ {
+ CommonMessageContext context = MessageContextAssociation.peekMessageContext();
+ HttpSession session = (HttpSession)context.getProperty(MessageContextJAXRPC.SERVLET_SESSION);
+
+ session.setAttribute("Test", "Test String");
+ String testString = (String)session.getAttribute("Test");
+ if ("Test String".equals(testString) == false)
+ {
+ throw new RuntimeException("Invalid attribute returned.");
+ }
+
+ return true;
+ }
+
+}
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179 (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179)
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/META-INF)
Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml
===================================================================
--- branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml 2006-10-18 10:02:48 UTC (rev 1252)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml 2006-10-22 13:20:45 UTC (rev 1279)
@@ -1,21 +0,0 @@
-<?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>TestService</display-name>
-
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1179.TestEndpoint</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml)
Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml
===================================================================
--- branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml 2006-10-18 10:02:48 UTC (rev 1252)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml 2006-10-22 13:20:45 UTC (rev 1279)
@@ -1,15 +0,0 @@
-<?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-jbws1179/TestEndpoint?wsdl</wsdl-override>
- </service-ref>
-
-</jboss-client>
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml)
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF)
Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml 2006-10-18 10:02:48 UTC (rev 1252)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml 2006-10-22 13:20:45 UTC (rev 1279)
@@ -1,37 +0,0 @@
-<?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.jaxrpc.jbws1179</package-type>
- <namespaceURI>http://org.jboss.test.ws/jbws1179/types</namespaceURI>
- </package-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jaxrpc.jbws1179.TestService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1179'>serviceNS:TestService</wsdl-service-name>
- <port-mapping>
- <port-name>TestEndpointPort</port-name>
- <java-port-name>TestEndpointPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1179.TestEndpoint</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1179'>portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1179'>bindingNS:TestEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>echoMessage</java-method-name>
- <wsdl-operation>echoMessage</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1179'>wsdlMsgNS:TestEndpoint_echoMessage</wsdl-message>
- <wsdl-message-part-name>String_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.String</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1179'>wsdlMsgNS:TestEndpoint_echoMessageResponse</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
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml)
===================================================================
--- branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml 2006-10-18 10:02:48 UTC (rev 1252)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml 2006-10-22 13:20:45 UTC (rev 1279)
@@ -0,0 +1,46 @@
+<?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.jaxrpc.jbws1179</package-type>
+ <namespaceURI>http://org.jboss.test.ws/jbws1179/types</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jaxrpc.jbws1179.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1179'>serviceNS:TestService</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1179.TestEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1179'>portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1179'>bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>echoMessage</java-method-name>
+ <wsdl-operation>echoMessage</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1179'>wsdlMsgNS:TestEndpoint_echoMessage</wsdl-message>
+ <wsdl-message-part-name>String_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.String</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1179'>wsdlMsgNS:TestEndpoint_echoMessageResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>canAccessSession</java-method-name>
+ <wsdl-operation>canAccessSession</wsdl-operation>
+ <wsdl-return-value-mapping>
+ <method-return-value>boolean</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1179'>wsdlMsgNS:TestEndpoint_canAccessSessionResponse</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
Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml
===================================================================
--- branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml 2006-10-18 10:02:48 UTC (rev 1252)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml 2006-10-22 13:20:45 UTC (rev 1279)
@@ -1,19 +0,0 @@
-<?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>TestEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxrpc.jbws1179.TestEndpointImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/TestEndpoint</url-pattern>
- </servlet-mapping>
-
-</web-app>
-
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml)
Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml
===================================================================
--- branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml 2006-10-18 10:02:48 UTC (rev 1252)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml 2006-10-22 13:20:45 UTC (rev 1279)
@@ -1,15 +0,0 @@
-<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1179' 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>TestService</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>TestEndpointPort</port-component-name>
- <wsdl-port>impl:TestEndpointPort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1179.TestEndpoint</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>TestEndpoint</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
\ No newline at end of file
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml)
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl)
Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl 2006-10-18 10:02:48 UTC (rev 1252)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl 2006-10-22 13:20:45 UTC (rev 1279)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1179' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1179' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types/>
- <message name='TestEndpoint_echoMessage'>
- <part name='String_1' type='xsd:string'/>
- </message>
- <message name='TestEndpoint_echoMessageResponse'>
- <part name='result' type='xsd:string'/>
- </message>
- <portType name='TestEndpoint'>
- <operation name='echoMessage' parameterOrder='String_1'>
- <input message='tns:TestEndpoint_echoMessage'/>
- <output message='tns:TestEndpoint_echoMessageResponse'/>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='echoMessage'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.test.ws/jbws1179' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.test.ws/jbws1179' use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='TestService'>
- <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl)
===================================================================
--- branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl 2006-10-18 10:02:48 UTC (rev 1252)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl 2006-10-22 13:20:45 UTC (rev 1279)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1179' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1179' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types/>
+ <message name='TestEndpoint_canAccessSession'/>
+ <message name='TestEndpoint_canAccessSessionResponse'>
+ <part name='result' type='xsd:boolean'/>
+ </message>
+ <message name='TestEndpoint_echoMessage'>
+ <part name='String_1' type='xsd:string'/>
+ </message>
+ <message name='TestEndpoint_echoMessageResponse'>
+ <part name='result' type='xsd:string'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='canAccessSession'>
+ <input message='tns:TestEndpoint_canAccessSession'/>
+ <output message='tns:TestEndpoint_canAccessSessionResponse'/>
+ </operation>
+ <operation name='echoMessage' parameterOrder='String_1'>
+ <input message='tns:TestEndpoint_echoMessage'/>
+ <output message='tns:TestEndpoint_echoMessageResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='canAccessSession'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1179' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1179' use='literal'/>
+ </output>
+ </operation>
+ <operation name='echoMessage'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1179' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1179' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestService'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/wstools-config.xml 2006-10-18 10:02:48 UTC (rev 1252)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/wstools-config.xml 2006-10-22 13:20:45 UTC (rev 1279)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -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">
- <java-wsdl>
- <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1179.TestEndpoint" style="rpc">
- </service>
- <namespaces target-namespace="http://org.jboss.test.ws/jbws1179" type-namespace="http://org.jboss.test.ws/jbws1179/types"/>
- <mapping file="jaxrpc-mapping.xml"/>
- <webservices servlet-link="TestEndpoint"/>
- </java-wsdl>
-</configuration>
Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/wstools-config.xml (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/wstools-config.xml)
17 years, 6 months
- 1
- 0
JBossWS SVN: r1278 - in branches/jbossws-1.0/src/test: ant java/org/jboss/test/ws/jaxrpc java/org/jboss/test/ws/jaxrpc/jbws1148 resources/jaxrpc resources/jaxrpc/jbws1148 resources/jaxrpc/jbws1148/META-INF resources/jaxrpc/jbws1148/WEB-INF resources/jaxrpc/jbws1148/WEB-INF/wsdl
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2006-10-22 08:01:19 -0400 (Sun, 22 Oct 2006)
New Revision: 1278
Added:
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.java
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/META-INF/
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/jaxrpc-mapping.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/web.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/webservices.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/TestService.wsdl
branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/wstools-config.xml
Modified:
branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml
Log:
JBWS-1148 - Test Case for anonymous simple types with restrictions.
Modified: branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml
===================================================================
--- branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml 2006-10-21 22:56:47 UTC (rev 1277)
+++ branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml 2006-10-22 12:01:19 UTC (rev 1278)
@@ -716,6 +716,33 @@
</metainf>
</jar>
+ <!-- jaxrpc-jbws1148 -->
+ <war warfile="${build.test.dir}/libs/jaxrpc-jbws1148.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1148/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1148/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-jbws1148-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1148/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1148/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ </metainf>
+ </jar>
+
<!-- jbossws-jbws1186 -->
<war warfile="${build.test.dir}/libs/jaxrpc-jbws1186.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1186/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2006-10-21 22:56:47 UTC (rev 1277)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2006-10-22 12:01:19 UTC (rev 1278)
@@ -0,0 +1,67 @@
+/*
+ * 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.jaxrpc.jbws1148;
+
+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;
+
+/**
+ * Test a call to an endpoint that uses an anonymous simple
+ * type with restriction.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Oct 22, 2006
+ */
+public class JBWS1148TestCase extends JBossWSTest
+{
+
+ private static TestEndpoint port;
+
+ public static Test suite() throws Exception
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1148TestCase.class, "jaxrpc-jbws1148.war, jaxrpc-jbws1148-client.jar");
+ }
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ if (port == null)
+ {
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+ port = (TestEndpoint)service.getPort(TestEndpoint.class);
+ }
+ }
+
+ public void testCall() throws Exception
+ {
+ TelephoneNumber number = port.lookup("SomeName");
+ assertEquals("areaCode", "12345", number.getAreaCode());
+ assertEquals("number", "678901", number.getNumber());
+ }
+
+}
Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.java 2006-10-21 22:56:47 UTC (rev 1277)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.java 2006-10-22 12:01:19 UTC (rev 1278)
@@ -0,0 +1,56 @@
+/*
+ * 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.jaxrpc.jbws1148;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Oct 22, 2006
+ */
+public class TelephoneNumber
+{
+
+ private String areaCode;
+
+ private String number;
+
+ public String getAreaCode()
+ {
+ return areaCode;
+ }
+
+ public void setAreaCode(String areaCode)
+ {
+ this.areaCode = areaCode;
+ }
+
+ public String getNumber()
+ {
+ return number;
+ }
+
+ public void setNumber(String number)
+ {
+ this.number = number;
+ }
+
+}
Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.java 2006-10-21 22:56:47 UTC (rev 1277)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.java 2006-10-22 12:01:19 UTC (rev 1278)
@@ -0,0 +1,37 @@
+/*
+ * 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.jaxrpc.jbws1148;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Oct 22, 2006
+ */
+public interface TestEndpoint extends Remote
+{
+
+ public TelephoneNumber lookup(final String surname) throws RemoteException;
+
+}
Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.java 2006-10-21 22:56:47 UTC (rev 1277)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.java 2006-10-22 12:01:19 UTC (rev 1278)
@@ -0,0 +1,45 @@
+/*
+ * 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.jaxrpc.jbws1148;
+
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Oct 22, 2006
+ */
+public class TestEndpointImpl implements TestEndpoint
+{
+
+ /**
+ * @see org.jboss.test.ws.jaxrpc.jbws1148.TestEndpoint#lookup(java.lang.String)
+ */
+ public TelephoneNumber lookup(final String surname)
+ {
+ TelephoneNumber number = new TelephoneNumber();
+ number.setAreaCode("12345");
+ number.setNumber("678901");
+
+ return number;
+ }
+
+}
Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml 2006-10-21 22:56:47 UTC (rev 1277)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml 2006-10-22 12:01:19 UTC (rev 1278)
@@ -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>Test Service</display-name>
+
+ <service-ref>
+ <service-ref-name>service/TestService</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1148.TestEndpoint</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+
+</application-client>
+
Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml 2006-10-21 22:56:47 UTC (rev 1277)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml 2006-10-22 12:01:19 UTC (rev 1278)
@@ -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-jbws1148?wsdl</wsdl-override>
+ </service-ref>
+
+</jboss-client>
Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/jaxrpc-mapping.xml 2006-10-21 22:56:47 UTC (rev 1277)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/jaxrpc-mapping.xml 2006-10-22 12:01:19 UTC (rev 1278)
@@ -0,0 +1,50 @@
+<?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.jaxrpc.jbws1148</package-type>
+ <namespaceURI>http://org.jboss.test.ws/jbws1148/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.jbws1148.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1148/types'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>areaCode</java-variable-name>
+ <xml-element-name>areaCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jaxrpc.jbws1148.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1148'>serviceNS:TestService</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1148.TestEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1148'>portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1148'>bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1148'>wsdlMsgNS:TestEndpoint_lookup</wsdl-message>
+ <wsdl-message-part-name>String_1</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.jaxrpc.jbws1148.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1148'>wsdlMsgNS:TestEndpoint_lookupResponse</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/src/test/resources/jaxrpc/jbws1148/WEB-INF/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/web.xml 2006-10-21 22:56:47 UTC (rev 1277)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/web.xml 2006-10-22 12:01:19 UTC (rev 1278)
@@ -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>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.jbws1148.TestEndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/webservices.xml 2006-10-21 22:56:47 UTC (rev 1277)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/webservices.xml 2006-10-22 12:01:19 UTC (rev 1278)
@@ -0,0 +1,15 @@
+<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1148' 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>TestService</webservice-description-name>
+ <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>TestEndpointPort</port-component-name>
+ <wsdl-port>impl:TestEndpointPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1148.TestEndpoint</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>TestEndpoint</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
\ No newline at end of file
Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/webservices.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/TestService.wsdl 2006-10-21 22:56:47 UTC (rev 1277)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/TestService.wsdl 2006-10-22 12:01:19 UTC (rev 1278)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1148' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1148/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1148' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://org.jboss.test.ws/jbws1148/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1148/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='areaCode' nillable='true'>
+ <simpleType>
+ <restriction base='string'>
+ <pattern value='[0-9]{5}'/>
+ </restriction>
+ </simpleType>
+ </element>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ </schema>
+ </types>
+ <message name='TestEndpoint_lookup'>
+ <part name='String_1' type='xsd:string'/>
+ </message>
+ <message name='TestEndpoint_lookupResponse'>
+ <part name='result' type='ns1:TelephoneNumber'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='lookup' parameterOrder='String_1'>
+ <input message='tns:TestEndpoint_lookup'/>
+ <output message='tns:TestEndpoint_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1148' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1148' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestService'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/TestService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/wstools-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/wstools-config.xml 2006-10-21 22:56:47 UTC (rev 1277)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/wstools-config.xml 2006-10-22 12:01:19 UTC (rev 1278)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -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">
+ <java-wsdl>
+ <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1148.TestEndpoint" style="rpc">
+ </service>
+ <namespaces target-namespace="http://org.jboss.test.ws/jbws1148" type-namespace="http://org.jboss.test.ws/jbws1148/types"/>
+ <mapping file="jaxrpc-mapping.xml"/>
+ <webservices servlet-link="TestEndpoint"/>
+ </java-wsdl>
+</configuration>
+
+<!-- Replace areaCode element with
+
+ <element name='areaCode' nillable='true'>
+ <simpleType>
+ <restriction base='string'>
+ <pattern value='[0-9]{5}'/>
+ </restriction>
+ </simpleType>
+ </element>
+
+-->
Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 6 months
- 1
- 0
JBossWS SVN: r1277 - branches/jbossws-1.0/src/test
by jbossws-commits＠lists.jboss.org
Author: alex.guizar(a)jboss.com
Date: 2006-10-21 18:56:47 -0400 (Sat, 21 Oct 2006)
New Revision: 1277
Modified:
branches/jbossws-1.0/src/test/build.xml
Log:
JBWS-868
Modified: branches/jbossws-1.0/src/test/build.xml
===================================================================
--- branches/jbossws-1.0/src/test/build.xml 2006-10-20 21:06:39 UTC (rev 1276)
+++ branches/jbossws-1.0/src/test/build.xml 2006-10-21 22:56:47 UTC (rev 1277)
@@ -295,6 +295,7 @@
Generate samples sources
-->
<target name="generate-sources" depends="compile" description="Generate the deployment resources.">
+ <mkdir dir="${build.test.dir}/libs"/>
<zip destfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
<fileset dir="${build.test.dir}/resources/jaxrpc/samples/wsbpel/hello/bpel" />
</zip>
17 years, 6 months
- 1
- 0