[jbossws-commits] JBossWS SVN: r3441 - in trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref: jaxws and 1 other directory.

Author: heiko.braun(a)jboss.com Date: 2007-06-05 05:29:59 -0400 (Tue, 05 Jun 2007) New Revision: 3441 Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpoint.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/jaxws/ParameterAnnotation.java Log: Extend swaref tests to verifxy mixed annotation styles Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java 2007-06-05 09:29:19 UTC (rev 3440) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java 2007-06-05 09:29:59 UTC (rev 3441) @@ -76,7 +76,7 @@ Service service = Service.create(new URL(wrappedEndpointURL+"?wsdl"), wrappedServiceQName); WrappedEndpoint port = service.getPort(WrappedEndpoint.class); - DataHandler response = port.parameterAnnotation(data, "Wrapped test"); + DataHandler response = port.parameterAnnotation(new DocumentPayload(data), "Wrapped test", data); assertNotNull("Response as null", response); assertTrue("Contents are not equal", response.getContent().equals("Server data")); } Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpoint.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpoint.java 2007-06-05 09:29:19 UTC (rev 3440) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpoint.java 2007-06-05 09:29:59 UTC (rev 3441) @@ -37,6 +37,6 @@ @WebMethod @XmlAttachmentRef - DataHandler parameterAnnotation(@XmlAttachmentRef DataHandler data, String test) throws RemoteException; + DataHandler parameterAnnotation(DocumentPayload payload, String test, @XmlAttachmentRef DataHandler data) throws RemoteException; } Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java 2007-06-05 09:29:19 UTC (rev 3440) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java 2007-06-05 09:29:59 UTC (rev 3441) @@ -79,7 +79,7 @@ @WebMethod @XmlAttachmentRef - public DataHandler parameterAnnotation(@XmlAttachmentRef DataHandler data, String test) throws RemoteException + public DataHandler parameterAnnotation(DocumentPayload payload, String test, @XmlAttachmentRef DataHandler data) throws RemoteException { try { Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/jaxws/ParameterAnnotation.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/jaxws/ParameterAnnotation.java 2007-06-05 09:29:19 UTC (rev 3440) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/jaxws/ParameterAnnotation.java 2007-06-05 09:29:59 UTC (rev 3441) @@ -1,6 +1,8 @@ package org.jboss.test.ws.jaxws.samples.swaref.jaxws; +import org.jboss.test.ws.jaxws.samples.swaref.DocumentPayload; + import javax.activation.DataHandler; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -12,51 +14,67 @@ @XmlRootElement(name = "parameterAnnotation", namespace = "http://swaref.samples.jaxws.ws.test.jboss.org/") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "parameterAnnotation", namespace = "http://swaref.samples.jaxws.ws.test.jboss.org/", propOrder = { - "arg0", - "arg1" -}) + "arg0", + "arg1", + "arg2" + }) public class ParameterAnnotation { - @XmlElement(name = "arg0", namespace = "") - @XmlAttachmentRef - private DataHandler arg0; - @XmlElement(name = "arg1", namespace = "") - private String arg1; + @XmlElement(name = "arg0", namespace = "") + private DocumentPayload arg0; - /** - * - * @return - * returns DataHandler - */ - public DataHandler getArg0() { - return this.arg0; - } + @XmlElement(name = "arg1", namespace = "") + private String arg1; - /** - * - * @param arg0 - * the value for the arg0 property - */ - public void setArg0(DataHandler arg0) { - this.arg0 = arg0; - } + @XmlElement(name = "arg2", namespace = "") + @XmlAttachmentRef + private DataHandler arg2; - /** - * - * @return - * returns String - */ - public String getArg1() { - return this.arg1; - } - /** - * - * @param arg1 - * the value for the arg1 property - */ - public void setArg1(String arg1) { - this.arg1 = arg1; - } + public DocumentPayload getArg0() + { + return arg0; + } + public void setArg0(DocumentPayload arg0) + { + this.arg0 = arg0; + } + + /** + * + * @return + * returns DataHandler + */ + public DataHandler getArg2() { + return this.arg2; + } + + /** + * + * @param arg2 + * the value for the arg0 property + */ + public void setArg2(DataHandler arg2) { + this.arg2 = arg2; + } + + /** + * + * @return + * returns String + */ + public String getArg1() { + return this.arg1; + } + + /** + * + * @param arg1 + * the value for the arg1 property + */ + public void setArg1(String arg1) { + this.arg1 = arg1; + } + }