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

[jbossws-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2007-06-20 06:04:09 -0400 (Wed, 20 Jun 2007)
New Revision: 3645

Modified:
   branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java
   branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpoint.java
   branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java
   branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/jaxws/ParameterAnnotation.java
Log:
Extend wsaRef testcase. Merged from trunk

Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java
===================================================================
--- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java	2007-06-20 08:55:46 UTC (rev 3644)
+++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java	2007-06-20 10:04:09 UTC (rev 3645)
@@ -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: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpoint.java
===================================================================
--- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpoint.java	2007-06-20 08:55:46 UTC (rev 3644)
+++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpoint.java	2007-06-20 10:04:09 UTC (rev 3645)
@@ -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: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java
===================================================================
--- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java	2007-06-20 08:55:46 UTC (rev 3644)
+++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java	2007-06-20 10:04:09 UTC (rev 3645)
@@ -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: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/jaxws/ParameterAnnotation.java
===================================================================
--- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/jaxws/ParameterAnnotation.java	2007-06-20 08:55:46 UTC (rev 3644)
+++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/jaxws/ParameterAnnotation.java	2007-06-20 10:04:09 UTC (rev 3645)
@@ -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;
@@ -13,32 +15,48 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "parameterAnnotation", namespace = "http://swaref.samples.jaxws.ws.test.jboss.org/", propOrder = {
     "arg0",
-    "arg1"
+		"arg1",
+		"arg2"
 })
 public class ParameterAnnotation {
 
     @XmlElement(name = "arg0", namespace = "")
-    @XmlAttachmentRef
-    private DataHandler arg0;
+	private DocumentPayload arg0;
+
     @XmlElement(name = "arg1", namespace = "")
     private String arg1;
 
+	@XmlElement(name = "arg2", namespace = "")
+	@XmlAttachmentRef
+	private DataHandler arg2;
+
+
+	public DocumentPayload getArg0()
+	{
+		return arg0;
+	}
+
+	public void setArg0(DocumentPayload arg0)
+	{
+		this.arg0 = arg0;
+	}
+
     /**
      * 
      * @return
      *     returns DataHandler
      */
-    public DataHandler getArg0() {
-        return this.arg0;
+	public DataHandler getArg2() {
+		return this.arg2;
     }
 
     /**
      * 
-     * @param arg0
+	 * @param arg2
      *     the value for the arg0 property
      */
-    public void setArg0(DataHandler arg0) {
-        this.arg0 = arg0;
+	public void setArg2(DataHandler arg2) {
+		this.arg2 = arg2;
     }
 
     /**