Author: richard.opalka(a)jboss.com Date: 2008-01-09 09:38:50 -0500 (Wed, 09 Jan 2008) New Revision: 5437 Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamResult.java Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt Log: [JBWS-1845] test Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-01-09 12:54:39 UTC (rev 5436) +++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-01-09 14:38:50 UTC (rev 5437) @@ -554,6 +554,14 @@ <include name="wsdl/**"/> </webinf> </war> + + <!-- jaxws-jbws1845 --> + <jar destfile="${tests.output.dir}/libs/jaxws-jbws1845.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1845/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws1845/*TestCase.class"/> + </fileset> + </jar> <!-- jaxws-jbws1854 --> <war destfile="${tests.output.dir}/libs/jaxws-jbws1854.war" webxml="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF/web.xml"> Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java 2008-01-09 14:38:50 UTC (rev 5437) @@ -0,0 +1,64 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1845; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1854] Use of @ResponseWrapper annotation cause generation of incorrect wsdl upon deployment + * + * @author richard.opalka(a)jboss.com + * + * @since Jan 9, 2008 + */ +public final class JBWS1845TestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS1845TestCase.class, "jaxws-jbws1845.jar"); + } + + public void testIssue() throws Exception + { + QName serviceName = new QName("http://service.responsys.com/rsystools/ws/SpamComplaintWS/1.0...;, "SpamService"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1845/SpamService?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + SpamComplaintWSIface proxy = (SpamComplaintWSIface)service.getPort(SpamComplaintWSIface.class); + + String[] orig = { "email", "fromAddress", "mailDate", "complaintDate", "mailbox", "complainer", "xRext", "accountName"}; + String[] returned = proxy.processSpamComplaints(orig[0], orig[1], orig[2], orig[3], orig[4], orig[5], orig[6], orig[7]).get(); + for (int i = 0; i < orig.length; i++) + { + assertEquals(orig[i], returned[i]); + } + } + +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java 2008-01-09 14:38:50 UTC (rev 5437) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1845; + +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.ws.ResponseWrapper; + +import org.jboss.wsf.spi.annotation.WebContext; + +/** + * Webservice impl + * + * @author richard.opalka(a)jboss.com + * + * @since Jan 9, 2008 + */ +@Stateless +@WebService +( + targetNamespace="http://service.responsys.com/rsystools/ws/SpamCompl...;, + serviceName="SpamService" +) +@WebContext +( + transportGuarantee="NONE", + contextRoot="/jaxws-jbws1845", + urlPattern="/SpamService" +) +public final class SpamComplaintWS implements SpamComplaintWSIface +{ + @WebMethod(operationName="processSpamComplaints") + @WebResult(name="SpamResult") + @ResponseWrapper(className="com.rsys.rsystools.ws.jaxws.ProcessSpamComplaintsResponse") + public SpamResult processSpamComplaints( + @WebParam(name = "email") String email, + @WebParam(name = "fromAddress") String fromAddress, + @WebParam(name = "mailDate") String mailDate, + @WebParam(name = "complaintDate") String complaintDate, + @WebParam(name = "mailbox") String mailbox, + @WebParam(name = "complainer") String complainer, + @WebParam(name = "xRext") String xRext, + @WebParam(name = "accountName") String accountName) + { + return new SpamResult(email, fromAddress, mailDate, complaintDate, mailbox, complainer, xRext, accountName); + } +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java 2008-01-09 14:38:50 UTC (rev 5437) @@ -0,0 +1,55 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1845; + +import javax.ejb.Remote; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.ws.ResponseWrapper; + +/** + * Webservice iface + * + * @author richard.opalka(a)jboss.com + * + * @since Jan 9, 2008 + */ +@Remote +@WebService +public interface SpamComplaintWSIface +{ + @WebMethod(operationName="processSpamComplaints") + @WebResult(name="SpamResult") + @ResponseWrapper(className="com.rsys.rsystools.ws.jaxws.ProcessSpamComplaintsResponse") + public SpamResult processSpamComplaints( + @WebParam(name = "email") String email, + @WebParam(name = "fromAddress") String fromAddress, + @WebParam(name = "mailDate") String mailDate, + @WebParam(name = "complaintDate") String complaintDate, + @WebParam(name = "mailbox") String mailbox, + @WebParam(name = "complainer") String complainer, + @WebParam(name = "xRext") String xRext, + @WebParam(name = "accountName") String accountName + ); +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamResult.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamResult.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamResult.java 2008-01-09 14:38:50 UTC (rev 5437) @@ -0,0 +1,86 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1845; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +/** + * Custom response object + * + * @author richard.opalka(a)jboss.com + * + * @since Jan 9, 2008 + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "SpamResult", propOrder = { + "email", + "fromAddress", + "mailDate", + "complaintDate", + "mailbox", + "complainer", + "xRext", + "accountName" +}) +public final class SpamResult +{ + @XmlElement(required = true, nillable = true) + protected String email; + @XmlElement(required = true, nillable = true) + protected String fromAddress; + @XmlElement(required = true, nillable = true) + protected String mailDate; + @XmlElement(required = true, nillable = true) + protected String complaintDate; + @XmlElement(required = true, nillable = true) + protected String mailbox; + @XmlElement(required = true, nillable = true) + protected String complainer; + @XmlElement(required = true, nillable = true) + protected String xRext; + @XmlElement(required = true, nillable = true) + protected String accountName; + + public SpamResult() + { + } + + public SpamResult(String email, String fromAddress, String mailDate, String complaintDate, String mailbox, String complainer, String xRext, String accountName) + { + this.email = email; + this.fromAddress = fromAddress; + this.mailDate = mailDate; + this.complaintDate = complaintDate; + this.mailbox = mailbox; + this.complainer = complainer; + this.xRext = xRext; + this.accountName = accountName; + } + + public String[] get() + { + return new String[] { email, fromAddress, mailDate, complaintDate, mailbox, complainer, xRext, accountName }; + } +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamResult.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt 2008-01-09 12:54:39 UTC (rev 5436) +++ stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt 2008-01-09 14:38:50 UTC (rev 5437) @@ -3,7 +3,7 @@ # JBossAS-4.0 excludes org/jboss/test/ws/jaxrpc/jbws723/** -# EJB3 compilation excludes +# EJB3 excludes org/jboss/test/ws/jaxws/binding/** org/jboss/test/ws/jaxws/jbws771/** org/jboss/test/ws/jaxws/jbws944/** @@ -26,6 +26,7 @@ org/jboss/test/ws/jaxws/jbws1815/** org/jboss/test/ws/jaxws/jbws1822/** org/jboss/test/ws/jaxws/jbws1840/** +org/jboss/test/ws/jaxws/jbws1845/** org/jboss/test/ws/jaxws/jbws1904/** org/jboss/test/ws/jaxws/namespace/** org/jboss/test/ws/jaxws/handlerlifecycle/**