JBossWS SVN: r8779 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-24 09:55:17 -0500 (Mon, 24 Nov 2008)
New Revision: 8779
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
Log:
[JBWS-2378] Using unmarshaller for one-way invocations too and setting the HttpClientInvoker.UNMARSHAL_NULL_STREAM property
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2008-11-21 17:50:21 UTC (rev 8778)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2008-11-24 14:55:17 UTC (rev 8779)
@@ -44,6 +44,7 @@
import org.jboss.remoting.marshal.MarshalFactory;
import org.jboss.remoting.marshal.Marshaller;
import org.jboss.remoting.marshal.UnMarshaller;
+import org.jboss.remoting.transport.http.HTTPClientInvoker;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.MessageAbstraction;
import org.jboss.ws.core.MessageTrace;
@@ -109,9 +110,10 @@
public HTTPRemotingConnection()
{
- // HTTPClientInvoker conect sends gratuitous POST
+ // HTTPClientInvoker connect sends gratuitous POST
// http://jira.jboss.com/jira/browse/JBWS-711
clientConfig.put(Client.ENABLE_LEASE, false);
+ clientConfig.put(HTTPClientInvoker.UNMARSHAL_NULL_STREAM, true);
}
public boolean isClosed()
@@ -222,8 +224,7 @@
client.setMarshaller(marshaller);
- if (oneway == false)
- client.setUnMarshaller(unmarshaller);
+ client.setUnMarshaller(unmarshaller);
if (log.isDebugEnabled())
log.debug("Remoting metadata: " + metadata);
16 years, 1 month
- 1
- 0
JBossWS SVN: r8778 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-21 12:50:21 -0500 (Fri, 21 Nov 2008)
New Revision: 8778
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2308] Updating excludes
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-11-21 17:30:06 UTC (rev 8777)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-11-21 17:50:21 UTC (rev 8778)
@@ -35,6 +35,9 @@
# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
org/jboss/test/ws/jaxws/jbws1190/**
+# [JBWS-2308] faultCode argument for createFault was passed NULL
+org/jboss/test/ws/jaxws/jbws2308/JBWS2308ServletTestCase.*
+
# [JBWS-2329] Failed to deploy service with multiple bindings
org/jboss/test/ws/jaxws/jbws2278/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-11-21 17:30:06 UTC (rev 8777)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-11-21 17:50:21 UTC (rev 8778)
@@ -29,6 +29,9 @@
# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
org/jboss/test/ws/jaxws/jbws1190/**
+# [JBWS-2308] faultCode argument for createFault was passed NULL
+org/jboss/test/ws/jaxws/jbws2308/JBWS2308ServletTestCase.*
+
# [JBWS-2329] Failed to deploy service with multiple bindings
org/jboss/test/ws/jaxws/jbws2278/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-11-21 17:30:06 UTC (rev 8777)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-11-21 17:50:21 UTC (rev 8778)
@@ -29,6 +29,9 @@
# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
org/jboss/test/ws/jaxws/jbws1190/**
+# [JBWS-2308] faultCode argument for createFault was passed NULL
+org/jboss/test/ws/jaxws/jbws2308/JBWS2308ServletTestCase.*
+
# [JBWS-2329] Failed to deploy service with multiple bindings
org/jboss/test/ws/jaxws/jbws2278/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-11-21 17:30:06 UTC (rev 8777)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-11-21 17:50:21 UTC (rev 8778)
@@ -28,6 +28,9 @@
# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
org/jboss/test/ws/jaxws/jbws1190/**
+# [JBWS-2308] faultCode argument for createFault was passed NULL
+org/jboss/test/ws/jaxws/jbws2308/JBWS2308ServletTestCase.*
+
# [JBWS-2329] Failed to deploy service with multiple bindings
org/jboss/test/ws/jaxws/jbws2278/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-11-21 17:30:06 UTC (rev 8777)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-11-21 17:50:21 UTC (rev 8778)
@@ -25,6 +25,9 @@
# [JBWS-2329] Failed to deploy service with multiple bindings
org/jboss/test/ws/jaxws/jbws2278/**
+# [JBWS-2308] faultCode argument for createFault was passed NULL
+org/jboss/test/ws/jaxws/jbws2308/JBWS2308ServletTestCase.*
+
# [JBWS-2347] Rewrite @WebFault related tests
org/jboss/test/ws/jaxws/jbws1904/**
org/jboss/test/ws/jaxws/webfault/**
16 years, 1 month
- 1
- 0
JBossWS SVN: r8777 - stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-21 12:30:06 -0500 (Fri, 21 Nov 2008)
New Revision: 8777
Modified:
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientServlet.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/JBWS2308TestCase.java
Log:
[JBWS-2308] Adding more specific tests
Modified: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientServlet.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientServlet.java 2008-11-21 12:29:43 UTC (rev 8776)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientServlet.java 2008-11-21 17:30:06 UTC (rev 8777)
@@ -1,5 +1,6 @@
package org.jboss.test.ws.jaxws.jbws2308;
+import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintStream;
@@ -12,10 +13,16 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.xml.namespace.QName;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.stream.StreamSource;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
import javax.xml.ws.handler.Handler;
+import org.jboss.wsf.common.DOMWriter;
+
public class ClientServlet extends HttpServlet
{
private String endpointURL = "http://127.0.0.1:8080/jaxws-jbws2308/EndpointImpl";
@@ -24,9 +31,11 @@
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
{
+ if (!testTransformer())
+ throw new ServletException("Transformer test failed!");
+
URL wsdlURL = new URL(endpointURL + "?wsdl");
QName serviceName = new QName(targetNS, "EndpointService");
-
Service service = Service.create(wsdlURL, serviceName);
Endpoint port = (Endpoint)service.getPort(Endpoint.class);
@@ -58,4 +67,33 @@
}
}
}
+
+ public boolean testTransformer()
+ {
+ try
+ {
+ TransformerFactory transformerFactory = TransformerFactory.newInstance();
+ Transformer transformer = transformerFactory.newTransformer();
+ DOMResult domResult = new DOMResult();
+ String s = "<ns2:Fault xmlns:ns2=\"http://schemas.xmlsoap.org/soap/envelope/\">" +
+ "<faultcode xmlns:tns=\"myNamespace\">tns:ItsASoapFault</faultcode>" +
+ "<faultstring>ClientLogicalHandler6.handleMessage throws SOAPFaultException for ClientLogicalOutboundHandleFaultFalseTest</faultstring>" +
+ "<faultactor>faultActor</faultactor>" +
+ "<detail>" +
+ "<somefaultentry/>" +
+ "</detail>" +
+ "</ns2:Fault>";
+ ByteArrayInputStream bais = new ByteArrayInputStream(s.getBytes());
+ StreamSource ss = new StreamSource(bais);
+
+ transformer.transform(ss, domResult);
+
+ return DOMWriter.printNode(domResult.getNode(), false).contains("myNamespace");
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+
+ }
}
Modified: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/JBWS2308TestCase.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/JBWS2308TestCase.java 2008-11-21 12:29:43 UTC (rev 8776)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/JBWS2308TestCase.java 2008-11-21 17:30:06 UTC (rev 8777)
@@ -21,6 +21,7 @@
*/
package org.jboss.test.ws.jaxws.jbws2308;
+import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.net.URL;
@@ -28,12 +29,17 @@
import java.util.List;
import javax.xml.namespace.QName;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.stream.StreamSource;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
import javax.xml.ws.handler.Handler;
import junit.framework.Test;
+import org.jboss.wsf.common.DOMWriter;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -84,6 +90,28 @@
}
}
-
+
+
+ public void testTransformer() throws Exception
+ {
+ TransformerFactory transformerFactory = TransformerFactory.newInstance();
+ Transformer transformer = transformerFactory.newTransformer();
+ DOMResult domResult = new DOMResult();
+ String s = "<ns2:Fault xmlns:ns2=\"http://schemas.xmlsoap.org/soap/envelope/\">" +
+ "<faultcode xmlns:tns=\"myNamespace\">tns:ItsASoapFault</faultcode>" +
+ "<faultstring>ClientLogicalHandler6.handleMessage throws SOAPFaultException for ClientLogicalOutboundHandleFaultFalseTest</faultstring>" +
+ "<faultactor>faultActor</faultactor>" +
+ "<detail>" +
+ "<somefaultentry/>" +
+ "</detail>" +
+ "</ns2:Fault>";
+ ByteArrayInputStream bais = new ByteArrayInputStream(s.getBytes());
+ StreamSource ss = new StreamSource(bais);
+
+ transformer.transform(ss, domResult);
+
+ assertTrue(DOMWriter.printNode(domResult.getNode(), false).contains("myNamespace"));
+ }
+
}
16 years, 1 month
- 1
- 0
JBossWS SVN: r8776 - in stack/metro/trunk/modules/testsuite: metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2403 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-21 07:29:43 -0500 (Fri, 21 Nov 2008)
New Revision: 8776
Modified:
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2403/JBWS2403TestCase.java
stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2403] enabling + fixing test
Modified: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2403/JBWS2403TestCase.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2403/JBWS2403TestCase.java 2008-11-21 12:17:20 UTC (rev 8775)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2403/JBWS2403TestCase.java 2008-11-21 12:29:43 UTC (rev 8776)
@@ -96,59 +96,34 @@
DataHandler dh1 = new DataHandler(url);
byte data1[] = new byte[4096];
byte data2[] = new byte[4096];
- int count1 = dh1.getInputStream().read(data1, 0, 4096);
- int count2 = ((StreamSource)attach.value).getInputStream().read(data2, 0, 4096);
- if(!validateAttachmentData(count1, data1, count2, data2))
+ dh1.getInputStream().read(data1, 0, 4096);
+ ((StreamSource)attach.value).getInputStream().read(data2, 0, 4096);
+ if(!validateAttachmentData(new String(data1), new String(data2)))
result=false;
return result;
}
- private boolean validateAttachmentData(int count1, byte[] data1, int count2, byte[] data2)
+ private boolean validateAttachmentData(String data1, String data2)
{
- int max=0;
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- PrintStream ps = new PrintStream(baos);
- if(count2 > count1) {
- System.err.println("Data counts are different so check for and remove any trailing CR's");
- System.err.println("Data count1="+count1+", Data count2="+count2);
- for(int i=count1; i<count2; i++) {
- if((char)data2[i] != '\r') break;
- }
- System.err.println("Removed "+(count2-count1)+" trailing CR's from data2");
- count2 = count1;
- }
- if(count1 != count2) {
- System.err.println("Attachment data count is not equal in request and response");
- System.err.println("Request data count = " + count1);
- System.err.println("Response data count = " + count2);
- if(count2 > count1) max = count1; else max = count2;
- ps.printf("data1[%d]=0x%x data2[%d]=0x%x", max-1, data1[max-1], max-1, data2[max-1]);
- System.err.println(baos.toString());
- baos.reset();
- if(count2 > count1) {
- for(int i=count1; i<count2; i++) {
- ps.printf("Extra data was: data2[%d]=0x%x|0%o", i, data2[i], data2[i]);
- System.err.println(baos.toString());
- baos.reset();
- }
- } else {
- for(int i=count2; i<count1; i++) {
- ps.printf("Extra data was: data1[%d]=0x%x|0%o", i, data1[i], data1[i]);
- System.err.println(baos.toString());
- baos.reset();
- }
- }
- return false;
- }
- for(int i=0; i<count1; i++) {
- if(data1[i] != data2[i]) {
- System.err.println("Attachment data content is not equal in attachment");
- System.err.println("Failed at byte "+i+", data1["+i+"]="+data1[i]+", data2["+i+"]="+data2[i]);
- return false;
- }
- }
- System.out.println("Attachment data and content equals");
+ // It's hard to compare XML messages that are XML compatible but not identical (see JBWS-2403 comments)
+ // Because of this issue we're testing for specific strings if they are present in both attachments.
+ assertTrue(data1.indexOf("Header1") != -1);
+ assertTrue(data1.indexOf("Header2") != -1);
+ assertTrue(data1.indexOf("Header3") != -1);
+ assertTrue(data1.indexOf("Child1") != -1);
+ assertTrue(data1.indexOf("Child2") != -1);
+ assertTrue(data1.indexOf("Child3") != -1);
+ assertTrue(data1.indexOf("</env:Envelope>") != -1);
+
+ assertTrue(data2.indexOf("Header1") != -1);
+ assertTrue(data2.indexOf("Header2") != -1);
+ assertTrue(data2.indexOf("Header3") != -1);
+ assertTrue(data2.indexOf("Child1") != -1);
+ assertTrue(data2.indexOf("Child2") != -1);
+ assertTrue(data2.indexOf("Child3") != -1);
+ assertTrue(data2.indexOf("</env:Envelope>") != -1);
+
return true;
}
}
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-11-21 12:17:20 UTC (rev 8775)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-11-21 12:29:43 UTC (rev 8776)
@@ -53,6 +53,3 @@
# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
-# [JBWS-2403] Attachments failure (WIP)
-org/jboss/test/ws/jaxws/jbws2403/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-11-21 12:17:20 UTC (rev 8775)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-11-21 12:29:43 UTC (rev 8776)
@@ -47,6 +47,3 @@
# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
-# [JBWS-2403] Attachments failure (WIP)
-org/jboss/test/ws/jaxws/jbws2403/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-11-21 12:17:20 UTC (rev 8775)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-11-21 12:29:43 UTC (rev 8776)
@@ -47,6 +47,3 @@
# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
-# [JBWS-2403] Attachments failure (WIP)
-org/jboss/test/ws/jaxws/jbws2403/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-11-21 12:17:20 UTC (rev 8775)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-11-21 12:29:43 UTC (rev 8776)
@@ -46,6 +46,3 @@
# [JBWS-2400] Rewrite large attachment testcase
org/jboss/test/ws/jaxws/jbws2000/**
-
-# [JBWS-2403] Attachments failure (WIP)
-org/jboss/test/ws/jaxws/jbws2403/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-11-21 12:17:20 UTC (rev 8775)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-11-21 12:29:43 UTC (rev 8776)
@@ -40,6 +40,3 @@
# [JBWS-2400] Rewrite large attachment testcase
org/jboss/test/ws/jaxws/jbws2000/**
-
-# [JBWS-2403] Attachments failure (WIP)
-org/jboss/test/ws/jaxws/jbws2403/**
16 years, 1 month
- 1
- 0
JBossWS SVN: r8775 - stack/native/branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-11-21 07:17:20 -0500 (Fri, 21 Nov 2008)
New Revision: 8775
Removed:
stack/native/branches/dlofthouse/JBWS-1862-Original/
Log:
Temporary branch no longer required.
16 years, 1 month
- 1
- 0
JBossWS SVN: r8774 - stack/native/branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-11-21 07:17:09 -0500 (Fri, 21 Nov 2008)
New Revision: 8774
Removed:
stack/native/branches/dlofthouse/JBWS-1862/
Log:
Temporary branch no longer required.
16 years, 1 month
- 1
- 0
JBossWS SVN: r8773 - in stack/native/trunk/modules: core/src/main/java/org/jboss/ws/core/jaxrpc/client and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-11-21 07:15:28 -0500 (Fri, 21 Nov 2008)
New Revision: 8773
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/JBWS1862TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/TestEndpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/TestEndpointImpl.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/jaxrpc-mapping.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/web.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/webservices.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/wsdl/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/wsdl/TestService.wsdl
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/wstools-config.xml
Removed:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/JBWS1862TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/TestEndpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/TestEndpointImpl.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/jaxrpc-mapping.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/web.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/webservices.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/wsdl/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/wsdl/TestService.wsdl
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/wstools-config.xml
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java
Log:
[JBWS-1862] RPC DII Calls Assume response parameter is called 'result' in the response message.
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2008-11-21 11:44:42 UTC (rev 8772)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2008-11-21 12:15:28 UTC (rev 8773)
@@ -150,7 +150,8 @@
// Disable MTOM for rpc/encoded
if (opMetaData.isRPCEncoded())
XOPContext.setMTOMEnabled(false);
- else XOPContext.setMTOMEnabled(isMTOMEnabled());
+ else
+ XOPContext.setMTOMEnabled(isMTOMEnabled());
// Associate current message with message context
SOAPMessageImpl reqMessage = (SOAPMessageImpl)createMessage(opMetaData);
@@ -168,7 +169,7 @@
if (style == Style.RPC)
{
boolean serialize = true;
-
+
if (opMetaData.getEndpointMetaData().getConfig().getRMMetaData() != null)
{
// RM hack to JAX-RPC serialization
@@ -177,7 +178,7 @@
serialize = false;
}
}
-
+
if (serialize)
{
QName opQName = opMetaData.getQName();
@@ -244,10 +245,10 @@
log.debug("Add unboundHeader element: " + soapName);
SOAPContentElement contentElement = new SOAPHeaderElementImpl(soapName);
contentElement.setParamMetaData(unboundHeader.toParameterMetaData(opMetaData));
-
+
if (soapHeader == null)
soapHeader = soapEnvelope.addHeader();
-
+
soapHeader.addChildElement(contentElement);
contentElement.setObjectValue(value);
}
@@ -316,7 +317,7 @@
payloadParent = (SOAPElement)childNode;
}
}
-
+
if (RMHelper.isRMOperation(opMetaData.getQName()) == false) // RM hack
{
if (payloadParent == null)
@@ -414,7 +415,8 @@
// Disable MTOM for rpc/encoded
if (opMetaData.isRPCEncoded())
XOPContext.setMTOMEnabled(false);
- else XOPContext.setMTOMEnabled(isMTOMEnabled());
+ else
+ XOPContext.setMTOMEnabled(isMTOMEnabled());
// Associate current message with message context
SOAPMessageImpl resMessage = (SOAPMessageImpl)createMessage(opMetaData);
@@ -848,7 +850,7 @@
SOAPContentElement aux = (SOAPContentElement)childElement;
Name elName = aux.getElementName();
- if (xmlName.equals(elName))
+ if (xmlName.getLocalName().equals("") || xmlName.equals(elName))
{
soapContentElement = aux;
soapContentElement.setParamMetaData(paramMetaData);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2008-11-21 11:44:42 UTC (rev 8772)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2008-11-21 12:15:28 UTC (rev 8773)
@@ -213,6 +213,7 @@
paramMetaData.setMode(mode);
paramMetaData.setInHeader(inHeader);
paramMetaData.setIndex(opMetaData.getParameters().size());
+
opMetaData.addParameter(paramMetaData);
registerParameterType(xmlType, javaType);
@@ -245,7 +246,7 @@
throw new IllegalArgumentException("Invalid null parameter");
OperationMetaData opMetaData = getOperationMetaData();
- QName xmlName = new QName(Constants.DEFAULT_RPC_RETURN_NAME);
+ QName xmlName = new QName("");
String javaTypeName = javaType.getName();
ParameterMetaData retMetaData = new ParameterMetaData(opMetaData, xmlName, xmlType, javaTypeName);
opMetaData.setReturnParameter(retMetaData);
@@ -473,7 +474,8 @@
ParameterMetaData paramMetaData = opMetaData.getParameter(new QName(paramName));
if (paramMetaData != null)
return paramMetaData.getXmlType();
- else return null;
+ else
+ return null;
}
protected CommonBindingProvider getCommonBindingProvider()
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2008-11-21 11:44:42 UTC (rev 8772)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2008-11-21 12:15:28 UTC (rev 8773)
@@ -2706,6 +2706,19 @@
</metainf>
</jar>
+ <!-- jaxrpc-jbws1862 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1862.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1862/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1862/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1862/TestEndpointImpl.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1862/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+
<!-- jaxrpc-jbws2234 -->
<war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws2234.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws2234/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2008-11-21 11:44:42 UTC (rev 8772)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2008-11-21 12:15:28 UTC (rev 8773)
@@ -158,11 +158,13 @@
call.setOperationName(new QName("http://org.jboss.ws/2004", opName));
call.addParameter("String_1", Constants.TYPE_LITERAL_STRING, String.class, ParameterMode.IN);
- call.setReturnType(Constants.TYPE_LITERAL_STRING, String.class);
opMetaData = call.getOperationMetaData();
opMetaData.getEndpointMetaData().setServiceEndpointInterfaceName(SOAPBindingTestService.class.getName());
+ ParameterMetaData returnParam = new ParameterMetaData(opMetaData, new QName(Constants.DEFAULT_RPC_RETURN_NAME), Constants.TYPE_LITERAL_STRING, "java.lang.String");
+ opMetaData.setReturnParameter(returnParam);
+
// Associate a message context with the current thread
SOAPMessageContextJAXRPC messageContext = new SOAPMessageContextJAXRPC();
MessageContextAssociation.pushMessageContext(messageContext);
@@ -355,7 +357,7 @@
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
msgContext.setSOAPMessage(resMessage);
- EndpointInvocation epInv = new EndpointInvocation(opMetaData);
+ EndpointInvocation epInv = new EndpointInvocation(opMetaData);
binding.unbindResponseMessage(opMetaData, resMessage, epInv, null);
assertEquals("Hello World!", epInv.getReturnValue());
}
Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862 (from rev 8099, stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862)
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/JBWS1862TestCase.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/JBWS1862TestCase.java 2008-08-13 15:16:36 UTC (rev 8099)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/JBWS1862TestCase.java 2008-11-21 12:15:28 UTC (rev 8773)
@@ -1,134 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, 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.jbws1862;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Call;
-import javax.xml.rpc.ParameterMode;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.ServiceFactory;
-import javax.xml.rpc.holders.StringHolder;
-
-import junit.framework.Test;
-
-import org.jboss.ws.Constants;
-import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * [JBWS-1862] http://jira.jboss.com/jira/browse/JBWS-1862
- *
- * @author darran.lofthouse(a)jboss.com
- * @since Oct 22, 2007
- */
-public class JBWS1862TestCase extends JBossWSTest
-{
-
- private final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-jbws1862/TestEndpoint";
- private static final String NAMESPACE = "http://org.jboss.test.ws/jbws1862";
-
- public static Test suite() throws Exception
- {
- return new JBossWSTestSetup(JBWS1862TestCase.class, "jaxrpc-jbws1862.war");
- }
-
- public void testUnconfiguredCall_SetReturnType() throws Exception
- {
- QName serviceName = new QName(NAMESPACE, "TestService");
- QName operationName = new QName(NAMESPACE, "echo");
-
- ServiceFactory factory = ServiceFactory.newInstance();
- Service service = factory.createService(serviceName);
-
- Call call = (Call)service.createCall();
- call.setOperationName(operationName);
- call.addParameter("String_1", Constants.TYPE_LITERAL_STRING, ParameterMode.IN);
- call.setTargetEndpointAddress(TARGET_ENDPOINT_ADDRESS);
- call.setReturnType(Constants.TYPE_LITERAL_STRING, String.class);
-
- String message = "Hello World!!";
- String response = (String)call.invoke(new Object[] { message });
- assertEquals(message, response);
- }
-
- public void testUnconfiguredCall_AddOutParam() throws Exception
- {
- QName serviceName = new QName(NAMESPACE, "TestService");
- QName operationName = new QName(NAMESPACE, "echo");
-
- ServiceFactory factory = ServiceFactory.newInstance();
- Service service = factory.createService(serviceName);
-
- Call call = (Call)service.createCall();
- call.setOperationName(operationName);
- call.addParameter("String_1", Constants.TYPE_LITERAL_STRING, ParameterMode.IN);
- call.addParameter("String_2", Constants.TYPE_LITERAL_STRING, ParameterMode.OUT);
- call.setTargetEndpointAddress(TARGET_ENDPOINT_ADDRESS);
-
- String message = "Hello World!!";
- StringHolder holder = new StringHolder();
- String response = (String)call.invoke(new Object[] { message, holder });
- assertNull(response);
- assertEquals(message, holder.value);
- }
-
- public void testConfiguredCall() throws Exception
- {
- QName serviceName = new QName(NAMESPACE, "TestService");
- QName operationName = new QName(NAMESPACE, "echo");
- URL jaxrpcMapping = getResourceURL("jaxrpc/jbws1862/WEB-INF/jaxrpc-mapping.xml");
- URL wsdlLocation = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
-
- ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactoryImpl.newInstance();
- Service service = factory.createService(wsdlLocation, serviceName, jaxrpcMapping);
-
- Call call = (Call)service.createCall();
- call.setOperationName(operationName);
- call.setTargetEndpointAddress(TARGET_ENDPOINT_ADDRESS);
-
- String message = "Hello World!!";
- String response = (String)call.invoke(new Object[] { message });
- assertEquals(message, response);
- }
-
- public void testPartlyConfiguredCall() throws Exception
- {
- QName serviceName = new QName(NAMESPACE, "TestService");
- QName operationName = new QName(NAMESPACE, "echo");
-
- URL wsdlLocation = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
-
- ServiceFactory factory = (ServiceFactory)ServiceFactory.newInstance();
- Service service = factory.createService(wsdlLocation, serviceName);
-
- Call call = (Call)service.createCall();
- call.setOperationName(operationName);
- call.setTargetEndpointAddress(TARGET_ENDPOINT_ADDRESS);
-
- String message = "Hello World!!";
- String response = (String)call.invoke(new Object[] { message });
- assertEquals(message, response);
- }
-}
Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/JBWS1862TestCase.java (from rev 8099, stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/JBWS1862TestCase.java)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/JBWS1862TestCase.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/JBWS1862TestCase.java 2008-11-21 12:15:28 UTC (rev 8773)
@@ -0,0 +1,134 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, 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.jbws1862;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.Call;
+import javax.xml.rpc.ParameterMode;
+import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
+import javax.xml.rpc.holders.StringHolder;
+
+import junit.framework.Test;
+
+import org.jboss.ws.Constants;
+import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-1862] http://jira.jboss.com/jira/browse/JBWS-1862
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Oct 22, 2007
+ */
+public class JBWS1862TestCase extends JBossWSTest
+{
+
+ private final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-jbws1862/TestEndpoint";
+ private static final String NAMESPACE = "http://org.jboss.test.ws/jbws1862";
+
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(JBWS1862TestCase.class, "jaxrpc-jbws1862.war");
+ }
+
+ public void testUnconfiguredCall_SetReturnType() throws Exception
+ {
+ QName serviceName = new QName(NAMESPACE, "TestService");
+ QName operationName = new QName(NAMESPACE, "echo");
+
+ ServiceFactory factory = ServiceFactory.newInstance();
+ Service service = factory.createService(serviceName);
+
+ Call call = (Call)service.createCall();
+ call.setOperationName(operationName);
+ call.addParameter("String_1", Constants.TYPE_LITERAL_STRING, ParameterMode.IN);
+ call.setTargetEndpointAddress(TARGET_ENDPOINT_ADDRESS);
+ call.setReturnType(Constants.TYPE_LITERAL_STRING, String.class);
+
+ String message = "Hello World!!";
+ String response = (String)call.invoke(new Object[] { message });
+ assertEquals(message, response);
+ }
+
+ public void testUnconfiguredCall_AddOutParam() throws Exception
+ {
+ QName serviceName = new QName(NAMESPACE, "TestService");
+ QName operationName = new QName(NAMESPACE, "echo");
+
+ ServiceFactory factory = ServiceFactory.newInstance();
+ Service service = factory.createService(serviceName);
+
+ Call call = (Call)service.createCall();
+ call.setOperationName(operationName);
+ call.addParameter("String_1", Constants.TYPE_LITERAL_STRING, ParameterMode.IN);
+ call.addParameter("String_2", Constants.TYPE_LITERAL_STRING, ParameterMode.OUT);
+ call.setTargetEndpointAddress(TARGET_ENDPOINT_ADDRESS);
+
+ String message = "Hello World!!";
+ StringHolder holder = new StringHolder();
+ String response = (String)call.invoke(new Object[] { message, holder });
+ assertNull(response);
+ assertEquals(message, holder.value);
+ }
+
+ public void testConfiguredCall() throws Exception
+ {
+ QName serviceName = new QName(NAMESPACE, "TestService");
+ QName operationName = new QName(NAMESPACE, "echo");
+ URL jaxrpcMapping = getResourceURL("jaxrpc/jbws1862/WEB-INF/jaxrpc-mapping.xml");
+ URL wsdlLocation = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+
+ ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactoryImpl.newInstance();
+ Service service = factory.createService(wsdlLocation, serviceName, jaxrpcMapping);
+
+ Call call = (Call)service.createCall();
+ call.setOperationName(operationName);
+ call.setTargetEndpointAddress(TARGET_ENDPOINT_ADDRESS);
+
+ String message = "Hello World!!";
+ String response = (String)call.invoke(new Object[] { message });
+ assertEquals(message, response);
+ }
+
+ public void testPartlyConfiguredCall() throws Exception
+ {
+ QName serviceName = new QName(NAMESPACE, "TestService");
+ QName operationName = new QName(NAMESPACE, "echo");
+
+ URL wsdlLocation = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+
+ ServiceFactory factory = (ServiceFactory)ServiceFactory.newInstance();
+ Service service = factory.createService(wsdlLocation, serviceName);
+
+ Call call = (Call)service.createCall();
+ call.setOperationName(operationName);
+ call.setTargetEndpointAddress(TARGET_ENDPOINT_ADDRESS);
+
+ String message = "Hello World!!";
+ String response = (String)call.invoke(new Object[] { message });
+ assertEquals(message, response);
+ }
+}
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/TestEndpoint.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/TestEndpoint.java 2008-08-13 15:16:36 UTC (rev 8099)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/TestEndpoint.java 2008-11-21 12:15:28 UTC (rev 8773)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, 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.jbws1862;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since Oct 22, 2007
- */
-public interface TestEndpoint extends Remote
-{
-
- public String echo(final String message) throws RemoteException;
-
-}
Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/TestEndpoint.java (from rev 8099, stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/TestEndpoint.java)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/TestEndpoint.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/TestEndpoint.java 2008-11-21 12:15:28 UTC (rev 8773)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, 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.jbws1862;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Oct 22, 2007
+ */
+public interface TestEndpoint extends Remote
+{
+
+ public String echo(final String message) throws RemoteException;
+
+}
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/TestEndpointImpl.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/TestEndpointImpl.java 2008-08-13 15:16:36 UTC (rev 8099)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/TestEndpointImpl.java 2008-11-21 12:15:28 UTC (rev 8773)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, 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.jbws1862;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since Oct 22, 2007
- */
-public class TestEndpointImpl implements TestEndpoint
-{
-
- /**
- * @see org.jboss.test.ws.jaxrpc.jbws1862.TestEndpoint#echo(java.lang.String)
- */
- public String echo(final String message)
- {
- return message;
- }
-
-}
Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/TestEndpointImpl.java (from rev 8099, stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/TestEndpointImpl.java)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/TestEndpointImpl.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/TestEndpointImpl.java 2008-11-21 12:15:28 UTC (rev 8773)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, 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.jbws1862;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Oct 22, 2007
+ */
+public class TestEndpointImpl implements TestEndpoint
+{
+
+ /**
+ * @see org.jboss.test.ws.jaxrpc.jbws1862.TestEndpoint#echo(java.lang.String)
+ */
+ public String echo(final String message)
+ {
+ return message;
+ }
+
+}
Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862 (from rev 8099, stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862)
Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF (from rev 8099, stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF)
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/jaxrpc-mapping.xml 2008-08-13 15:16:36 UTC (rev 8099)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/jaxrpc-mapping.xml 2008-11-21 12:15:28 UTC (rev 8773)
@@ -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.jbws1862</package-type>
- <namespaceURI>http://org.jboss.test.ws/jbws1862/types</namespaceURI>
- </package-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jaxrpc.jbws1862.TestService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1862'>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.jbws1862.TestEndpoint</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1862'>portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1862'>bindingNS:TestEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>echo</java-method-name>
- <wsdl-operation>echo</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/jbws1862'>wsdlMsgNS:TestEndpoint_echo</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/jbws1862'>wsdlMsgNS:TestEndpoint_echoResponse</wsdl-message>
- <wsdl-message-part-name>String_2</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: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/jaxrpc-mapping.xml (from rev 8099, stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/jaxrpc-mapping.xml)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/jaxrpc-mapping.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/jaxrpc-mapping.xml 2008-11-21 12:15:28 UTC (rev 8773)
@@ -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.jbws1862</package-type>
+ <namespaceURI>http://org.jboss.test.ws/jbws1862/types</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jaxrpc.jbws1862.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1862'>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.jbws1862.TestEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1862'>portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1862'>bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>echo</java-method-name>
+ <wsdl-operation>echo</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/jbws1862'>wsdlMsgNS:TestEndpoint_echo</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/jbws1862'>wsdlMsgNS:TestEndpoint_echoResponse</wsdl-message>
+ <wsdl-message-part-name>String_2</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: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/web.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/web.xml 2008-08-13 15:16:36 UTC (rev 8099)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/web.xml 2008-11-21 12:15:28 UTC (rev 8773)
@@ -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.jbws1862.TestEndpointImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/TestEndpoint</url-pattern>
- </servlet-mapping>
-
-</web-app>
-
Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/web.xml (from rev 8099, stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/web.xml)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/web.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/web.xml 2008-11-21 12:15:28 UTC (rev 8773)
@@ -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.jbws1862.TestEndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/TestEndpoint</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/webservices.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/webservices.xml 2008-08-13 15:16:36 UTC (rev 8099)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/webservices.xml 2008-11-21 12:15:28 UTC (rev 8773)
@@ -1,15 +0,0 @@
-<webservices 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_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 xmlns:portNS='http://org.jboss.test.ws/jbws1862'>portNS:TestEndpointPort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1862.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: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/webservices.xml (from rev 8099, stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/webservices.xml)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/webservices.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/webservices.xml 2008-11-21 12:15:28 UTC (rev 8773)
@@ -0,0 +1,15 @@
+<webservices 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_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 xmlns:portNS='http://org.jboss.test.ws/jbws1862'>portNS:TestEndpointPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1862.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: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/wsdl (from rev 8099, stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/wsdl)
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/wsdl/TestService.wsdl 2008-08-13 15:16:36 UTC (rev 8099)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/wsdl/TestService.wsdl 2008-11-21 12:15:28 UTC (rev 8773)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1862' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1862' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types/>
- <message name='TestEndpoint_echo'>
- <part name='String_1' type='xsd:string'/>
- </message>
- <message name='TestEndpoint_echoResponse'>
- <part name='String_2' type='xsd:string'/>
- </message>
- <portType name='TestEndpoint'>
- <operation name='echo' parameterOrder='String_1'>
- <input message='tns:TestEndpoint_echo'/>
- <output message='tns:TestEndpoint_echoResponse'/>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='echo'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.test.ws/jbws1862' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.test.ws/jbws1862' 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: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/wsdl/TestService.wsdl (from rev 8099, stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/wsdl/TestService.wsdl)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/wsdl/TestService.wsdl (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/WEB-INF/wsdl/TestService.wsdl 2008-11-21 12:15:28 UTC (rev 8773)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1862' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1862' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types/>
+ <message name='TestEndpoint_echo'>
+ <part name='String_1' type='xsd:string'/>
+ </message>
+ <message name='TestEndpoint_echoResponse'>
+ <part name='String_2' type='xsd:string'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='echo' parameterOrder='String_1'>
+ <input message='tns:TestEndpoint_echo'/>
+ <output message='tns:TestEndpoint_echoResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1862' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1862' 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: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/wstools-config.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/wstools-config.xml 2008-08-13 15:16:36 UTC (rev 8099)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/wstools-config.xml 2008-11-21 12:15:28 UTC (rev 8773)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools.sh -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.jbws1862.TestEndpoint" style="rpc">
- </service>
- <namespaces target-namespace="http://org.jboss.test.ws/jbws1862" type-namespace="http://org.jboss.test.ws/jbws1862/types"/>
- <mapping file="jaxrpc-mapping.xml"/>
- <webservices servlet-link="TestEndpoint"/>
- </java-wsdl>
-
-</configuration>
Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/wstools-config.xml (from rev 8099, stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/wstools-config.xml)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/wstools-config.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1862/wstools-config.xml 2008-11-21 12:15:28 UTC (rev 8773)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools.sh -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.jbws1862.TestEndpoint" style="rpc">
+ </service>
+ <namespaces target-namespace="http://org.jboss.test.ws/jbws1862" type-namespace="http://org.jboss.test.ws/jbws1862/types"/>
+ <mapping file="jaxrpc-mapping.xml"/>
+ <webservices servlet-link="TestEndpoint"/>
+ </java-wsdl>
+
+</configuration>
16 years, 1 month
- 1
- 0
JBossWS SVN: r8772 - stack/metro/trunk/modules/testsuite/metro-tests/scripts.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-21 06:44:42 -0500 (Fri, 21 Nov 2008)
New Revision: 8772
Modified:
stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml
Log:
[JBWS-2403] fixing marhalling issue
Modified: stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml 2008-11-21 06:23:18 UTC (rev 8771)
+++ stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml 2008-11-21 11:44:42 UTC (rev 8772)
@@ -95,10 +95,8 @@
<!-- jbws2403 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2403.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2403/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws2403/EndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws2403/TestPort.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws2403/Request.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws2403/Response.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2403/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws2403/*TestCase.class"/>
</classes>
<fileset dir="${tests.output.dir}/test-resources/jaxws/jbws2403">
<include name="file.xml"/>
16 years, 1 month
- 1
- 0
JBossWS SVN: r8771 - in stack/metro/trunk/modules/testsuite: metro-tests/scripts and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-21 01:23:18 -0500 (Fri, 21 Nov 2008)
New Revision: 8771
Added:
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2403/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2403/EndpointImpl.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2403/JBWS2403TestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2403/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2403/WEB-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2403/WEB-INF/web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2403/WEB-INF/wsdl/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2403/WEB-INF/wsdl/TestService.wsdl
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2403/WEB-INF/wsdl/mapping.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2403/file.xml
Modified:
stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml
stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml
stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2403] adding test case
Modified: stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml 2008-11-20 19:07:07 UTC (rev 8770)
+++ stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml 2008-11-21 06:23:18 UTC (rev 8771)
@@ -20,8 +20,9 @@
<pathelement path="${maven.test.classpath}"/>
</classpath>
</taskdef>
-
+
<wsconsume wsdl="${tests.resources.dir}/wsit/rm/WEB-INF/wsdl/Calc.wsdl" package="org.jboss.test.ws.wsit.rm" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/jaxws/jbws2403/WEB-INF/wsdl/TestService.wsdl" binding="${tests.resources.dir}/jaxws/jbws2403/WEB-INF/wsdl/mapping.xml" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/>
</target>
</project>
\ No newline at end of file
Modified: stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml 2008-11-20 19:07:07 UTC (rev 8770)
+++ stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml 2008-11-21 06:23:18 UTC (rev 8771)
@@ -74,24 +74,40 @@
<include name="*.xml"/>
</webinf>
</war>
-
+
<!-- jbws2308 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2308.jar" >
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws2308/**/Endpoint*"/>
- </fileset>
+ </fileset>
</jar>
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2308-client.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2308/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws2308/**/Endpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws2308/**/Client*"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2308/**/Endpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2308/**/Client*"/>
</classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2308/WEB-INF">
<include name="wsdl/**"/>
- <include name="*.xml"/>
+ <include name="*.xml"/>
</webinf>
</war>
-
+
+ <!-- jbws2403 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2403.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2403/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2403/EndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2403/TestPort.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2403/Request.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2403/Response.class"/>
+ </classes>
+ <fileset dir="${tests.output.dir}/test-resources/jaxws/jbws2403">
+ <include name="file.xml"/>
+ </fileset>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2403/WEB-INF">
+ <include name="wsdl/TestService.wsdl"/>
+ </webinf>
+ </war>
+
<!-- wsit-rm -->
<war warfile="${tests.output.dir}/test-libs/wsit-rm.war" webxml="${tests.output.dir}/test-resources/wsit/rm/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -105,7 +121,7 @@
<include name="wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml"/>
</webinf>
</war>
-
+
</target>
-
+
</project>
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2403/EndpointImpl.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2403/EndpointImpl.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2403/EndpointImpl.java 2008-11-21 06:23:18 UTC (rev 8771)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws2403;
+
+import java.net.URL;
+
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.Holder;
+import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
+import javax.activation.DataHandler;
+import javax.jws.WebService;
+
+/**
+ * Endpoint implementation
+ * @author richard.opalka(a)jboss.com
+ */
+@WebService
+(
+ portName="TestPort",
+ serviceName="TestService",
+ targetNamespace="http://TestService.org/wsdl",
+ wsdlLocation="WEB-INF/wsdl/TestService.wsdl",
+ endpointInterface="org.jboss.test.ws.jaxws.jbws2403.TestPort"
+)
+public class EndpointImpl implements TestPort
+{
+ public void echo(Request request, javax.xml.ws.Holder<Response> response, Holder<Source> attach)
+ {
+ try
+ {
+ Response theResponse = new Response();
+ theResponse.setMimeType(request.getMimeType());
+ DataHandler dh = new DataHandler(new URL(request.getUrl()));
+ attach.value = new StreamSource(dh.getInputStream());
+ response.value = theResponse;
+ }
+ catch (Exception e)
+ {
+ throw new WebServiceException(e.getMessage());
+ }
+ }
+}
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2403/JBWS2403TestCase.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2403/JBWS2403TestCase.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2403/JBWS2403TestCase.java 2008-11-21 06:23:18 UTC (rev 8771)
@@ -0,0 +1,154 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws2403;
+
+import junit.framework.Assert;
+import junit.framework.Test;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.net.URL;
+
+import javax.activation.DataHandler;
+import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.ws.Holder;
+import javax.xml.ws.Service;
+
+/**
+ * Test client
+ * @author richard.opalka(a)jboss.com
+ */
+public class JBWS2403TestCase extends JBossWSTest
+{
+ private TestPort port;
+ private URL url;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2403TestCase.class, "jaxws-jbws2403.war");
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2403/Endpoint?wsdl");
+ Service service = Service.create(wsdlURL, new QName("http://TestService.org/wsdl", "TestService"));
+ port = service.getPort(TestPort.class);
+ url = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2403/file.xml");
+ }
+
+ protected void tearDown() throws Exception
+ {
+ port = null;
+ url = null;
+ super.tearDown();
+ }
+
+ public void test() throws Exception
+ {
+ Request request = new Request();
+ request.setMimeType("text/xml");
+ request.setUrl(url.toString());
+ Holder<Source> attach = new Holder<Source>();
+ Holder<Response> response = new Holder<Response>();
+ port.echo(request, response, attach);
+ if(!validateAttachment(request, response.value, attach))
+ Assert.fail("Attachments differ");
+ }
+
+ private boolean validateAttachment(Request request, Response response, Holder<Source> attach) throws Exception
+ {
+ boolean result=true;
+
+ System.out.println("Check if the attachment mime types are correct");
+ if(!response.getMimeType().equals(request.getMimeType()))
+ {
+ System.err.println("MimeType is not equal in request and response");
+ System.err.println("Request MimeType = " + request.getMimeType());
+ System.err.println("Response MimeType = " + response.getMimeType());
+ result=false;
+ }
+
+ System.out.println("Check if the attachment contents are correct");
+ DataHandler dh1 = new DataHandler(url);
+ byte data1[] = new byte[4096];
+ byte data2[] = new byte[4096];
+ int count1 = dh1.getInputStream().read(data1, 0, 4096);
+ int count2 = ((StreamSource)attach.value).getInputStream().read(data2, 0, 4096);
+ if(!validateAttachmentData(count1, data1, count2, data2))
+ result=false;
+
+ return result;
+ }
+
+ private boolean validateAttachmentData(int count1, byte[] data1, int count2, byte[] data2)
+ {
+ int max=0;
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ PrintStream ps = new PrintStream(baos);
+ if(count2 > count1) {
+ System.err.println("Data counts are different so check for and remove any trailing CR's");
+ System.err.println("Data count1="+count1+", Data count2="+count2);
+ for(int i=count1; i<count2; i++) {
+ if((char)data2[i] != '\r') break;
+ }
+ System.err.println("Removed "+(count2-count1)+" trailing CR's from data2");
+ count2 = count1;
+ }
+ if(count1 != count2) {
+ System.err.println("Attachment data count is not equal in request and response");
+ System.err.println("Request data count = " + count1);
+ System.err.println("Response data count = " + count2);
+ if(count2 > count1) max = count1; else max = count2;
+ ps.printf("data1[%d]=0x%x data2[%d]=0x%x", max-1, data1[max-1], max-1, data2[max-1]);
+ System.err.println(baos.toString());
+ baos.reset();
+ if(count2 > count1) {
+ for(int i=count1; i<count2; i++) {
+ ps.printf("Extra data was: data2[%d]=0x%x|0%o", i, data2[i], data2[i]);
+ System.err.println(baos.toString());
+ baos.reset();
+ }
+ } else {
+ for(int i=count2; i<count1; i++) {
+ ps.printf("Extra data was: data1[%d]=0x%x|0%o", i, data1[i], data1[i]);
+ System.err.println(baos.toString());
+ baos.reset();
+ }
+ }
+ return false;
+ }
+ for(int i=0; i<count1; i++) {
+ if(data1[i] != data2[i]) {
+ System.err.println("Attachment data content is not equal in attachment");
+ System.err.println("Failed at byte "+i+", data1["+i+"]="+data1[i]+", data2["+i+"]="+data2[i]);
+ return false;
+ }
+ }
+ System.out.println("Attachment data and content equals");
+ return true;
+ }
+}
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2403/WEB-INF/web.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2403/WEB-INF/web.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2403/WEB-INF/web.xml 2008-11-21 06:23:18 UTC (rev 8771)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <servlet>
+ <servlet-name>EndpointImpl</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2403.EndpointImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>EndpointImpl</servlet-name>
+ <url-pattern>/Endpoint</url-pattern>
+ </servlet-mapping>
+</web-app>
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2403/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2403/WEB-INF/wsdl/TestService.wsdl (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2403/WEB-INF/wsdl/TestService.wsdl 2008-11-21 06:23:18 UTC (rev 8771)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name="TestService"
+ targetNamespace="http://TestService.org/wsdl"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://TestService.org/wsdl"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
+ xmlns:s="http://TestService.org/xsd"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+
+ <types>
+ <schema targetNamespace="http://TestService.org/xsd"
+ xmlns:tns="http://TestService.org/xsd"
+ xmlns="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified">
+ <complexType name="Request">
+ <sequence>
+ <element name="mimeType" type="string"/>
+ <element name="url" type="string"/>
+ </sequence>
+ </complexType>
+ <complexType name="Response">
+ <sequence>
+ <element name="mimeType" type="string"/>
+ </sequence>
+ </complexType>
+ </schema>
+ </types>
+
+ <message name="inputMessage">
+ <part name="request" type="s:Request"/>
+ </message>
+
+ <message name="outputMessage">
+ <part name="response" type="s:Response"/>
+ <part name="attach" type="xsd:string"/>
+ </message>
+
+ <portType name="TestPort">
+ <operation name="echo">
+ <input message="tns:inputMessage"/>
+ <output message="tns:outputMessage"/>
+ </operation>
+ </portType>
+
+ <binding name="TestSoapBinding" type="tns:TestPort">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
+ <operation name="echo">
+ <soap:operation/>
+ <input>
+ <soap:body parts="request" use="literal" namespace="http://TestService.org/wsdl"/>
+ </input>
+ <output>
+ <mime:multipartRelated>
+ <mime:part>
+ <soap:body parts="response" use="literal" namespace="http://TestService.org/wsdl"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach" type="text/xml"/>
+ </mime:part>
+ </mime:multipartRelated>
+ </output>
+ </operation>
+ </binding>
+
+ <service name="TestService">
+ <port name="TestPort" binding="tns:TestSoapBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+
+</definitions>
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2403/WEB-INF/wsdl/mapping.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2403/WEB-INF/wsdl/mapping.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2403/WEB-INF/wsdl/mapping.xml 2008-11-21 06:23:18 UTC (rev 8771)
@@ -0,0 +1,20 @@
+<jaxws:bindings wsdlLocation="TestService.wsdl" version="2.0"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:jxb="http://java.sun.com/xml/ns/jaxb">
+
+ <jaxws:bindings node="wsdl:definitions">
+ <jaxws:package name="org.jboss.test.ws.jaxws.jbws2403"/>
+ <jaxws:enableMIMEContent>true</jaxws:enableMIMEContent>
+ </jaxws:bindings>
+
+ <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://TestService.org/xsd']"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <jxb:schemaBindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb">
+ <jxb:package name="org.jboss.test.ws.jaxws.jbws2403"/>
+ </jxb:schemaBindings>
+ </jaxws:bindings>
+
+</jaxws:bindings>
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2403/file.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2403/file.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2403/file.xml 2008-11-21 06:23:18 UTC (rev 8771)
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/">
+ <env:Header>
+ <our:Header1 env:mustUnderstand="1" xmlns:our="http://ourcompany.org/">Header1</our:Header1>
+ <our:Header2 env:mustUnderstand="0" xmlns:our="http://ourcompany.org/">Header2</our:Header2>
+ <our:Header3 env:mustUnderstand="1" xmlns:our="http://ourcompany.org/">Header3</our:Header3>
+ </env:Header>
+ <env:Body>
+ <our:Body1 xmlns:our="http://ourcompany.org/">
+ <our:Child1>Child1</our:Child1>
+ <our:Child2>Child2</our:Child2>
+ <our:Child2>Child3</our:Child2>
+ </our:Body1>
+ </env:Body>
+</env:Envelope>
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-11-20 19:07:07 UTC (rev 8770)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-11-21 06:23:18 UTC (rev 8771)
@@ -53,3 +53,6 @@
# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
+# [JBWS-2403] Attachments failure (WIP)
+org/jboss/test/ws/jaxws/jbws2403/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-11-20 19:07:07 UTC (rev 8770)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-11-21 06:23:18 UTC (rev 8771)
@@ -47,3 +47,6 @@
# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
+# [JBWS-2403] Attachments failure (WIP)
+org/jboss/test/ws/jaxws/jbws2403/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-11-20 19:07:07 UTC (rev 8770)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-11-21 06:23:18 UTC (rev 8771)
@@ -47,3 +47,6 @@
# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
+# [JBWS-2403] Attachments failure (WIP)
+org/jboss/test/ws/jaxws/jbws2403/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-11-20 19:07:07 UTC (rev 8770)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-11-21 06:23:18 UTC (rev 8771)
@@ -46,3 +46,6 @@
# [JBWS-2400] Rewrite large attachment testcase
org/jboss/test/ws/jaxws/jbws2000/**
+
+# [JBWS-2403] Attachments failure (WIP)
+org/jboss/test/ws/jaxws/jbws2403/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-11-20 19:07:07 UTC (rev 8770)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-11-21 06:23:18 UTC (rev 8771)
@@ -40,3 +40,6 @@
# [JBWS-2400] Rewrite large attachment testcase
org/jboss/test/ws/jaxws/jbws2000/**
+
+# [JBWS-2403] Attachments failure (WIP)
+org/jboss/test/ws/jaxws/jbws2403/**
16 years, 1 month
- 1
- 0
JBossWS SVN: r8770 - in stack/metro/trunk/modules/testsuite/metro-tests: src/test/java/org/jboss/test/ws/jaxws and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-20 14:07:07 -0500 (Thu, 20 Nov 2008)
New Revision: 8770
Added:
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientHandler2.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientHandler3.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientHandler4.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientServlet.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/Endpoint.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/EndpointImpl.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/JBWS2308ServletTestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/JBWS2308TestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2308/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2308/WEB-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2308/WEB-INF/web.xml
Modified:
stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml
Log:
[JBWS-2308] Adding testcase
Modified: stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml 2008-11-20 16:35:11 UTC (rev 8769)
+++ stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml 2008-11-20 19:07:07 UTC (rev 8770)
@@ -75,6 +75,23 @@
</webinf>
</war>
+ <!-- jbws2308 -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2308.jar" >
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2308/**/Endpoint*"/>
+ </fileset>
+ </jar>
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2308-client.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2308/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2308/**/Endpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2308/**/Client*"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2308/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="*.xml"/>
+ </webinf>
+ </war>
+
<!-- wsit-rm -->
<war warfile="${tests.output.dir}/test-libs/wsit-rm.war" webxml="${tests.output.dir}/test-resources/wsit/rm/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientHandler2.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientHandler2.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientHandler2.java 2008-11-20 19:07:07 UTC (rev 8770)
@@ -0,0 +1,37 @@
+package org.jboss.test.ws.jaxws.jbws2308;
+
+import javax.xml.ws.handler.LogicalHandler;
+import javax.xml.ws.handler.LogicalMessageContext;
+import javax.xml.ws.handler.MessageContext;
+
+import org.jboss.logging.Logger;
+
+public class ClientHandler2 implements LogicalHandler<LogicalMessageContext>
+{
+ private static Logger log = Logger.getLogger(ClientHandler2.class);
+
+ public void close(MessageContext arg0)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public boolean handleFault(LogicalMessageContext arg0)
+ {
+ System.out.println("HANDLE FAULT 2");
+
+ arg0.getMessage().getPayload();
+
+ return true;
+ }
+
+ public boolean handleMessage(LogicalMessageContext arg0)
+ {
+ System.out.println("HANDLE MESSAGE 2");
+
+ arg0.getMessage().getPayload();
+
+ return true;
+ }
+
+}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientHandler2.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientHandler3.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientHandler3.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientHandler3.java 2008-11-20 19:07:07 UTC (rev 8770)
@@ -0,0 +1,110 @@
+package org.jboss.test.ws.jaxws.jbws2308;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.Detail;
+import javax.xml.soap.DetailEntry;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.Name;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPFactory;
+import javax.xml.soap.SOAPFault;
+import javax.xml.soap.SOAPHeader;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.soap.SOAPPart;
+import javax.xml.ws.handler.LogicalHandler;
+import javax.xml.ws.handler.LogicalMessageContext;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.soap.SOAPFaultException;
+
+import org.jboss.logging.Logger;
+
+public class ClientHandler3 implements LogicalHandler<LogicalMessageContext>
+{
+ private static Logger log = Logger.getLogger(ClientHandler3.class);
+ private final QName FAULTCODE = new QName("http://dlhandlerservice.org/wsdl", "ItsASoapFault", "tns");
+ private static MessageFactory mfactorySOAP11;
+ private static MessageFactory mfactorySOAP12;
+
+ public void close(MessageContext arg0)
+ {
+
+ }
+
+ public boolean handleFault(LogicalMessageContext arg0)
+ {
+ System.out.println("HANDLE FAULT 3");
+ return true;
+ }
+
+ public boolean handleMessage(LogicalMessageContext arg0)
+ {
+ System.out.println("HANDLE MESSAGE 3");
+ String faultString = "ClientLogicalHandler6.handleMessage throws SOAPFaultException for ClientLogicalOutboundHandleFaultFalseTest";
+ SOAPFault sf = null;
+ try
+ {
+ Name name = SOAPFactory.newInstance().createName("somefaultentry");
+ sf = createSOAPFault("soap11", this.FAULTCODE, "faultActor", faultString, name);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Unexpected error occurred in handleMessage for an outbound message" + e);
+ }
+ throw new SOAPFaultException(sf);
+ }
+
+ private static SOAPFault createSOAPFault(String soapVer, QName faultCode, String faultActor, String faultString, Name name) throws Exception
+ {
+ DetailEntry detailentry;
+ SOAPFault soapFault = null;
+ try
+ {
+ log.info("Create a SOAP MessageFactory instance - " + soapVer);
+ MessageFactory mfactory = getMessageFactory(soapVer);
+
+ log.info("Create a SOAPMessage");
+ SOAPMessage soapmsg = mfactory.createMessage();
+
+ log.info("Get SOAP Part");
+ SOAPPart sp = soapmsg.getSOAPPart();
+
+ log.info("Get SOAP Envelope");
+ SOAPEnvelope envelope = sp.getEnvelope();
+
+ log.info("Get SOAP Header");
+ SOAPHeader hdr = envelope.getHeader();
+
+ log.info("Get SOAP Body");
+ SOAPBody body = envelope.getBody();
+
+ soapFault = body.addFault();
+ soapFault.setFaultCode(faultCode);
+ soapFault.setFaultActor(faultActor);
+ soapFault.setFaultString(faultString);
+ Detail detail = soapFault.addDetail();
+ detailentry = detail.addDetailEntry(name);
+ }
+ catch (Exception e)
+ {
+ log.info("Exception caught: " + e);
+ return null;
+ }
+ return soapFault;
+ }
+
+ public static MessageFactory getMessageFactory(String soapVer) throws Exception
+ {
+ System.out.println("JAXWS_Util:getMessageFactory");
+ if (soapVer.equals("soap11"))
+ {
+ if (mfactorySOAP11 == null)
+ mfactorySOAP11 = MessageFactory.newInstance();
+ return mfactorySOAP11;
+ }
+ if (mfactorySOAP12 == null)
+ mfactorySOAP12 = MessageFactory.newInstance("SOAP 1.2 Protocol");
+ return mfactorySOAP12;
+ }
+
+}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientHandler3.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientHandler4.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientHandler4.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientHandler4.java 2008-11-20 19:07:07 UTC (rev 8770)
@@ -0,0 +1,30 @@
+package org.jboss.test.ws.jaxws.jbws2308;
+
+import javax.xml.ws.handler.LogicalHandler;
+import javax.xml.ws.handler.LogicalMessageContext;
+import javax.xml.ws.handler.MessageContext;
+
+import org.jboss.logging.Logger;
+
+public class ClientHandler4 implements LogicalHandler<LogicalMessageContext>
+{
+ private static Logger log = Logger.getLogger(ClientHandler4.class);
+
+ public void close(MessageContext arg0)
+ {
+
+ }
+
+ public boolean handleFault(LogicalMessageContext arg0)
+ {
+ System.out.println("HANDLE FAULT 4");
+ return true;
+ }
+
+ public boolean handleMessage(LogicalMessageContext arg0)
+ {
+ System.out.println("HANDLE MESSAGE 4");
+ return true;
+ }
+
+}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientHandler4.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientServlet.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientServlet.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientServlet.java 2008-11-20 19:07:07 UTC (rev 8770)
@@ -0,0 +1,61 @@
+package org.jboss.test.ws.jaxws.jbws2308;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.handler.Handler;
+
+public class ClientServlet extends HttpServlet
+{
+ private String endpointURL = "http://127.0.0.1:8080/jaxws-jbws2308/EndpointImpl";
+ private String targetNS = "http://jbws2308.jaxws.ws.test.jboss.org/";
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ URL wsdlURL = new URL(endpointURL + "?wsdl");
+ QName serviceName = new QName(targetNS, "EndpointService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ Endpoint port = (Endpoint)service.getPort(Endpoint.class);
+
+ BindingProvider bindingProvider = (BindingProvider)port;
+ List<Handler> handlerChain = new ArrayList<Handler>();
+ handlerChain.add(new ClientHandler2());
+ handlerChain.add(new ClientHandler3());
+ handlerChain.add(new ClientHandler4());
+ bindingProvider.getBinding().setHandlerChain(handlerChain);
+
+ try
+ {
+ Object retObj = port.echo("Hello");
+ throw new ServletException("A RuntimeException was expected");
+ }
+ catch (RuntimeException e)
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ PrintStream ps = new PrintStream(baos, true);
+ e.printStackTrace(ps);
+ String tmp = "ClientLogicalHandler6.handleMessage throws SOAPFaultException for ClientLogicalOutboundHandleFaultFalseTest";
+ if (baos.toString().indexOf(tmp) > -1) {
+ res.getOutputStream().println("Did get expected RuntimeException text");
+ }
+ else
+ {
+ System.out.println("Obtained this exception: " + baos.toString());
+ throw new ServletException("Did not get expected RuntimeException text");
+ }
+ }
+ }
+}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/ClientServlet.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/Endpoint.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/Endpoint.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/Endpoint.java 2008-11-20 19:07:07 UTC (rev 8770)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws2308;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService (name="Endpoint")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface Endpoint
+{
+ @WebMethod(operationName = "echoString", action = "urn:EchoString")
+ String echo(String input);
+}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/Endpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/EndpointImpl.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/EndpointImpl.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/EndpointImpl.java 2008-11-20 19:07:07 UTC (rev 8770)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws2308;
+
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+import javax.xml.ws.soap.SOAPFaultException;
+
+import org.jboss.logging.Logger;
+
+@Stateless
+@WebService(serviceName="EndpointService", portName="EndpointPort", endpointInterface = "org.jboss.test.ws.jaxws.jbws2308.Endpoint")
+public class EndpointImpl
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(EndpointImpl.class);
+
+ public String echo(String input) throws SOAPFaultException
+ {
+ log.info("echo: " + input);
+ return input;
+ }
+}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/EndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/JBWS2308ServletTestCase.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/JBWS2308ServletTestCase.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/JBWS2308ServletTestCase.java 2008-11-20 19:07:07 UTC (rev 8770)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws2308;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+public class JBWS2308ServletTestCase extends JBossWSTest
+{
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2308ServletTestCase.class, "jaxws-jbws2308.jar, jaxws-jbws2308-client.war");
+ }
+
+ public void testInvocationThroughServlet() throws Exception
+ {
+ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2308-client/jbws2308");
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ String retStr = br.readLine();
+ assertEquals("Did get expected RuntimeException text", retStr);
+ }
+
+}
+
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/JBWS2308ServletTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/JBWS2308TestCase.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/JBWS2308TestCase.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/JBWS2308TestCase.java 2008-11-20 19:07:07 UTC (rev 8770)
@@ -0,0 +1,89 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws2308;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.handler.Handler;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+public class JBWS2308TestCase extends JBossWSTest
+{
+
+ private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-jbws2308/EndpointImpl";
+ private String targetNS = "http://jbws2308.jaxws.ws.test.jboss.org/";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2308TestCase.class, "jaxws-jbws2308.jar");
+ }
+
+ public void testInvocation() throws Exception
+ {
+ URL wsdlURL = new URL(endpointURL + "?wsdl");
+ QName serviceName = new QName(targetNS, "EndpointService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ Endpoint port = (Endpoint)service.getPort(Endpoint.class);
+
+ BindingProvider bindingProvider = (BindingProvider)port;
+ List<Handler> handlerChain = new ArrayList<Handler>();
+ handlerChain.add(new ClientHandler2());
+ handlerChain.add(new ClientHandler3());
+ handlerChain.add(new ClientHandler4());
+ bindingProvider.getBinding().setHandlerChain(handlerChain);
+
+ try
+ {
+ Object retObj = port.echo("Hello");
+ fail("A RuntimeException was expected");
+ }
+ catch (RuntimeException e)
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ PrintStream ps = new PrintStream(baos, true);
+ e.printStackTrace(ps);
+ String tmp = "ClientLogicalHandler6.handleMessage throws SOAPFaultException for ClientLogicalOutboundHandleFaultFalseTest";
+ if (baos.toString().indexOf(tmp) > -1) {
+ System.out.println("Did get expected RuntimeException text");
+ }
+ else
+ {
+ fail("Did not get expected RuntimeException text");
+ }
+ }
+
+ }
+
+}
+
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2308/JBWS2308TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2308/WEB-INF/web.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2308/WEB-INF/web.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2308/WEB-INF/web.xml 2008-11-20 19:07:07 UTC (rev 8770)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <display-name>jbws2307_testcase_client</display-name>
+ <servlet>
+ <servlet-name>ClientServlet</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2308.ClientServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>ClientServlet</servlet-name>
+ <url-pattern>/jbws2308</url-pattern>
+ </servlet-mapping>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
+</web-app>
\ No newline at end of file
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2308/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 1 month
- 1
- 0