[jbossws-commits] JBossWS SVN: r3481 - in trunk/jbossws-core: src/test/java/org/jboss/test/ws/jaxws and 4 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Jun 6 12:17:23 EDT 2007
Author: heiko.braun at jboss.com
Date: 2007-06-06 12:17:23 -0400 (Wed, 06 Jun 2007)
New Revision: 3481
Added:
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AClass.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AException.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/TestEnumeration.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/package-info.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BClass.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BException.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/package-info.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestWSInterface.java
Modified:
trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
Log:
Fix JBWS-1566
Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-06 16:16:33 UTC (rev 3480)
+++ trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-06 16:17:23 UTC (rev 3481)
@@ -206,7 +206,14 @@
</classes>
</war>
- <!-- jaxws-jbws1581 -->
+ <!-- jaxws-samples-jbws1566-->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1566.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1566/**/*.class"/>
+ </fileset>
+ </jar>
+
+ <!-- jaxws-jbws1581 -->
<war warfile="${tests.output.dir}/libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class"/>
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AClass.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AClass.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AClass.java 2007-06-06 16:17:23 UTC (rev 3481)
@@ -0,0 +1,12 @@
+package org.jboss.test.ws.jaxws.jbws1566.a;
+
+public class AClass {
+ int a;
+
+ public int getA() {
+ return a;
+ }
+ public void setA(int testInt) {
+ this.a = testInt;
+ }
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AClass.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AException.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AException.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AException.java 2007-06-06 16:17:23 UTC (rev 3481)
@@ -0,0 +1,17 @@
+package org.jboss.test.ws.jaxws.jbws1566.a;
+
+public class AException extends Exception {
+ int ae;
+
+ public AException() {
+ super();
+ }
+ public int getAe() {
+ return ae;
+ }
+
+ public void setAe(int parentInt) {
+ this.ae = parentInt;
+ }
+
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/AException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/TestEnumeration.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/TestEnumeration.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/TestEnumeration.java 2007-06-06 16:17:23 UTC (rev 3481)
@@ -0,0 +1,5 @@
+package org.jboss.test.ws.jaxws.jbws1566.a;
+
+public enum TestEnumeration {
+ A,B,C;
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/TestEnumeration.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/package-info.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/package-info.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/package-info.java 2007-06-06 16:17:23 UTC (rev 3481)
@@ -0,0 +1,3 @@
+ at javax.xml.bind.annotation.XmlSchema(
+ namespace = "http://test.org/wsclient/a" )
+package org.jboss.test.ws.jaxws.jbws1566.a;
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BClass.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BClass.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BClass.java 2007-06-06 16:17:23 UTC (rev 3481)
@@ -0,0 +1,12 @@
+package org.jboss.test.ws.jaxws.jbws1566.b;
+
+public class BClass extends org.jboss.test.ws.jaxws.jbws1566.a.AClass {
+ String b;
+
+ public String getB() {
+ return b;
+ }
+ public void setB(String testString) {
+ this.b = testString;
+ }
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BClass.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BException.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BException.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BException.java 2007-06-06 16:17:23 UTC (rev 3481)
@@ -0,0 +1,14 @@
+package org.jboss.test.ws.jaxws.jbws1566.b;
+
+import org.jboss.test.ws.jaxws.jbws1566.a.AException;
+
+public class BException extends AException {
+ int be;
+
+ public int getBe() {
+ return be;
+ }
+ public void setBe(int testInt) {
+ this.be = testInt;
+ }
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/BException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/package-info.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/package-info.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/package-info.java 2007-06-06 16:17:23 UTC (rev 3481)
@@ -0,0 +1,2 @@
+ at javax.xml.bind.annotation.XmlSchema(namespace = "http://test.org/wsclient/b" )
+package org.jboss.test.ws.jaxws.jbws1566.b;
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java 2007-06-06 16:17:23 UTC (rev 3481)
@@ -0,0 +1,38 @@
+package org.jboss.test.ws.jaxws.jbws1566.c;
+
+import java.rmi.RemoteException;
+
+import org.jboss.test.ws.jaxws.jbws1566.b.BClass;
+import org.jboss.test.ws.jaxws.jbws1566.b.BException;
+
+import org.jboss.test.ws.jaxws.jbws1566.a.TestEnumeration;
+import org.jboss.wsf.spi.annotation.WebContext;
+
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+
+ at Stateless
+ at WebService(
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws1566.c.Jaxb20TestWSInterface",
+ targetNamespace = "http://org.jboss.ws/samples/c",
+ serviceName = "WebServiceTestService",
+ portName = "WebServiceTestPort"
+)
+ at WebContext(
+ contextRoot = "/jaxwstest"
+ , urlPattern="/Jaxb20StatelessTestBean/*"
+ , secureWSDLAccess=false
+)
+public class Jaxb20StatelessTestBean implements Jaxb20TestWSInterface {
+
+ public TestEnumeration testMethod(BClass input) throws BException, RemoteException {
+ System.out.println("Got input: "+input +": a="+input.getA()+", b="+input.getB());
+ if (input.getA()==0) {
+ BException ex = new BException();
+ ex.setAe(11);
+ ex.setBe(13);
+ throw ex;
+ }
+ return TestEnumeration.A;
+ }
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java 2007-06-06 16:17:23 UTC (rev 3481)
@@ -0,0 +1,55 @@
+package org.jboss.test.ws.jaxws.jbws1566.c;
+
+import java.net.URL;
+import java.rmi.RemoteException;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+
+import org.jboss.test.ws.jaxws.jbws1566.a.*;
+import org.jboss.test.ws.jaxws.jbws1566.b.*;
+
+public class Jaxb20TestCase extends JBossWSTest
+{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxwstest/Jaxb20StatelessTestBean";
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(Jaxb20TestCase.class, "jaxws-jbws1566.jar");
+ }
+
+ public void testWebService() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS+"?wsdl");
+ System.out.println("wsdl URL:"+wsdlURL);
+
+ QName serviceName = new QName("http://org.jboss.ws/samples/c", "WebServiceTestService");
+ Service service = Service.create(wsdlURL, serviceName);
+ Jaxb20TestWSInterface port = service.getPort(Jaxb20TestWSInterface.class);
+
+ BindingProvider bindingProvider = (BindingProvider)port;
+ Map<String, Object> reqContext = bindingProvider.getRequestContext();
+ reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, TARGET_ENDPOINT_ADDRESS);
+
+ TestEnumeration res=null;
+ BClass input = new BClass();
+ input.setA(1);
+ input.setB("hello service");
+ try {
+ res = port.testMethod(input);
+ assertEquals(res, TestEnumeration.A);
+ } catch (BException e) {
+ fail("Caught unexpeced TestException: "+e);
+ } catch (RemoteException e) {
+ fail("Caught unexpeced RemoteException: "+e);
+ }
+ assertNotNull(res);
+ }
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestWSInterface.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestWSInterface.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestWSInterface.java 2007-06-06 16:17:23 UTC (rev 3481)
@@ -0,0 +1,25 @@
+package org.jboss.test.ws.jaxws.jbws1566.c;
+
+import java.rmi.RemoteException;
+
+import org.jboss.test.ws.jaxws.jbws1566.b.BClass;
+import org.jboss.test.ws.jaxws.jbws1566.b.BException;
+
+import org.jboss.test.ws.jaxws.jbws1566.a.TestEnumeration;
+
+ at javax.jws.WebService(
+ targetNamespace = "http://org.jboss.ws/samples/c"
+)
+ at javax.jws.soap.SOAPBinding(
+ style = javax.jws.soap.SOAPBinding.Style.DOCUMENT,
+ use = javax.jws.soap.SOAPBinding.Use.LITERAL,
+ parameterStyle = javax.jws.soap.SOAPBinding.ParameterStyle.WRAPPED)
+public interface Jaxb20TestWSInterface extends java.rmi.Remote {
+
+ @javax.jws.WebMethod(operationName = "TestMethod")
+ public @javax.jws.WebResult(name="result") TestEnumeration testMethod(
+ @javax.jws.WebParam(name="input", mode=javax.jws.WebParam.Mode.IN)
+ BClass input
+ ) throws BException, RemoteException;
+
+}
\ No newline at end of file
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestWSInterface.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
More information about the jbossws-commits
mailing list