[jbossws-commits] JBossWS SVN: r8440 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2008-10-11 07:35:07 -0400 (Sat, 11 Oct 2008)
New Revision: 8440

Modified:
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountService.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountService.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountServiceExt.java
Log:
[JBWS-2135] Fixing usage of annotations


Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountService.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountService.java	2008-10-11 11:15:44 UTC (rev 8439)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountService.java	2008-10-11 11:35:07 UTC (rev 8440)
@@ -22,8 +22,10 @@
 package org.jboss.test.ws.jaxws.jbws1799;
 
 import javax.ejb.Remote;
+import javax.jws.WebMethod;
 import javax.jws.WebParam;
 import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
 
 /**
  * First service interface
@@ -34,8 +36,14 @@
  */
 @Remote
 @WebService
+ at SOAPBinding
+(
+      style=SOAPBinding.Style.DOCUMENT,
+      use=SOAPBinding.Use.LITERAL
+)
 public interface IUserAccountService
 {
+   @WebMethod
    public boolean authenticate
    (
          @WebParam(name="username") String username

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java	2008-10-11 11:15:44 UTC (rev 8439)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java	2008-10-11 11:35:07 UTC (rev 8440)
@@ -22,8 +22,10 @@
 package org.jboss.test.ws.jaxws.jbws1799;
 
 import javax.ejb.Remote;
+import javax.jws.WebMethod;
 import javax.jws.WebParam;
 import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
 import javax.xml.ws.RequestWrapper;
 import javax.xml.ws.ResponseWrapper;
 
@@ -36,8 +38,14 @@
  */
 @Remote
 @WebService
+ at SOAPBinding
+(
+      style=SOAPBinding.Style.DOCUMENT,
+      use=SOAPBinding.Use.LITERAL
+)
 public interface IUserAccountServiceExt
 {
+   @WebMethod
    @RequestWrapper(className="org.jboss.test.ws.jaxws.jbws1799.jaxws.Authenticate1")
    @ResponseWrapper(className="org.jboss.test.ws.jaxws.jbws1799.jaxws.Authenticate1Response")
    public boolean authenticate

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountService.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountService.java	2008-10-11 11:15:44 UTC (rev 8439)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountService.java	2008-10-11 11:35:07 UTC (rev 8440)
@@ -23,10 +23,7 @@
 
 import javax.ejb.Stateless;
 import javax.ejb.TransactionAttribute;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
 import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
 
 import org.jboss.wsf.spi.annotation.WebContext;
 
@@ -40,15 +37,10 @@
 @Stateless
 @WebService
 (
-      name="UserAccountServiceEndPoint",
       targetNamespace="namespace1",
-      serviceName="UserAccountService1.0"
+      serviceName="UserAccountService1.0",
+      endpointInterface="org.jboss.test.ws.jaxws.jbws1799.IUserAccountService"
 )
- at SOAPBinding
-(
-      style=SOAPBinding.Style.DOCUMENT,
-      use=SOAPBinding.Use.LITERAL
-)
 @WebContext
 (
       transportGuarantee="NONE",
@@ -57,12 +49,8 @@
 )
 public class UserAccountService implements IUserAccountService
 {
-   @WebMethod
    @TransactionAttribute(javax.ejb.TransactionAttributeType.SUPPORTS)
-   public boolean authenticate
-   (
-         @WebParam(name="username") String username
-   )
+   public boolean authenticate(String username)
    {
        return "authorized".equals(username);
    }

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountServiceExt.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountServiceExt.java	2008-10-11 11:15:44 UTC (rev 8439)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountServiceExt.java	2008-10-11 11:35:07 UTC (rev 8440)
@@ -23,10 +23,7 @@
 
 import javax.ejb.Stateless;
 import javax.ejb.TransactionAttribute;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
 import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
 import javax.xml.ws.RequestWrapper;
 import javax.xml.ws.ResponseWrapper;
 
@@ -42,15 +39,10 @@
 @Stateless
 @WebService
 (
-      name="UserAccountServiceExtEndPoint",
       targetNamespace="namespaceExt",
-      serviceName="UserAccountServiceExt1.0"
+      serviceName="UserAccountServiceExt1.0",
+      endpointInterface="org.jboss.test.ws.jaxws.jbws1799.IUserAccountServiceExt"
 )
- at SOAPBinding
-(
-      style=SOAPBinding.Style.DOCUMENT,
-      use=SOAPBinding.Use.LITERAL
-)
 @WebContext
 (
       transportGuarantee="NONE",
@@ -59,15 +51,10 @@
 )
 public class UserAccountServiceExt implements IUserAccountServiceExt 
 {
-   @WebMethod
    @TransactionAttribute(javax.ejb.TransactionAttributeType.SUPPORTS)
    @RequestWrapper(className="org.jboss.test.ws.jaxws.jbws1799.jaxws.Authenticate1")
    @ResponseWrapper(className="org.jboss.test.ws.jaxws.jbws1799.jaxws.Authenticate1Response")
-   public boolean authenticate
-   (
-         @WebParam(name="username") String username, 
-         @WebParam(name="password") String password
-   )
+   public boolean authenticate(String username, String password)
    {
       return "authorized".equals(username) && "password".equals(password);
    }