[jboss-cvs] JBossAS SVN: r73202 - in projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices: unit and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2008-05-09 06:10:43 -0400 (Fri, 09 May 2008)
New Revision: 73202

Modified:
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/HandlerContextEndpoint.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/SimpleEndpoint.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/WebServiceContextEndpoint.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/WebServiceRefBean.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/unit/WebServiceTestCase.java
Log:
Fix ws tests: use @RemoteBinding and remove mappedName from @Resource

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/HandlerContextEndpoint.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/HandlerContextEndpoint.java	2008-05-09 09:03:58 UTC (rev 73201)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/HandlerContextEndpoint.java	2008-05-09 10:10:43 UTC (rev 73202)
@@ -37,7 +37,7 @@
 @HandlerChain(file = "handlerchain.xml")
 public class HandlerContextEndpoint implements Ejb3WSEndpoint
 {
-   @Resource(mappedName = "webservice-context")
+   @Resource
    WebServiceContext wsCtx;
 
    public String echo(String msg)

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/SimpleEndpoint.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/SimpleEndpoint.java	2008-05-09 09:03:58 UTC (rev 73201)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/SimpleEndpoint.java	2008-05-09 10:10:43 UTC (rev 73202)
@@ -31,6 +31,7 @@
  */
 @Stateless
 @WebService(endpointInterface = "org.jboss.ejb3.test.webservices.Ejb3WSEndpoint")
+ at RemoteBinding(jndiBinding = "/test-webservices/SimpleEndpoint")
 public class SimpleEndpoint implements Ejb3WSEndpoint
 {
    

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/WebServiceContextEndpoint.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/WebServiceContextEndpoint.java	2008-05-09 09:03:58 UTC (rev 73201)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/WebServiceContextEndpoint.java	2008-05-09 10:10:43 UTC (rev 73202)
@@ -39,7 +39,7 @@
 public class WebServiceContextEndpoint implements Ejb3WSEndpoint
 {
 
-   @Resource(mappedName = "webservice-context")
+   @Resource
    WebServiceContext wsCtx;
 
    @PostConstruct

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/WebServiceRefBean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/WebServiceRefBean.java	2008-05-09 09:03:58 UTC (rev 73201)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/WebServiceRefBean.java	2008-05-09 10:10:43 UTC (rev 73202)
@@ -21,6 +21,8 @@
  */
 package org.jboss.ejb3.test.webservices;
 
+import org.jboss.ejb3.annotation.RemoteBinding;
+
 import javax.ejb.Stateless;
 import javax.xml.ws.WebServiceRef;
 
@@ -30,6 +32,7 @@
  * @author Heiko.Braun <heiko.braun at jboss.com>
  */
 @Stateless
+ at RemoteBinding(jndiBinding = "/test-webservices/WebServiceRefBean")
 public class WebServiceRefBean implements BusinessInterface
 {
    @WebServiceRef(wsdlLocation = "http://localhost:8080/webservices-ejb3/SimpleEndpoint?wsdl")

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/unit/WebServiceTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/unit/WebServiceTestCase.java	2008-05-09 09:03:58 UTC (rev 73201)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/unit/WebServiceTestCase.java	2008-05-09 10:10:43 UTC (rev 73202)
@@ -48,7 +48,7 @@
    public void testRemoteAccess() throws Exception
    {
       InitialContext iniCtx = getInitialContext();
-      Ejb3WSEndpoint ejb3Remote = (Ejb3WSEndpoint)iniCtx.lookup("/webservices-ejb3/SimpleEndpoint/remote");
+      Ejb3WSEndpoint ejb3Remote = (Ejb3WSEndpoint)iniCtx.lookup("/test-webservices/SimpleEndpoint");
 
       String helloWorld = "Hello world!";
       Object retObj = ejb3Remote.echo(helloWorld);
@@ -92,7 +92,7 @@
    public void testWebServiceRef() throws Exception
    {
       InitialContext iniCtx = getInitialContext();
-      BusinessInterface ejb3Remote = (BusinessInterface)iniCtx.lookup("/webservices-ejb3/WebServiceRefBean/remote");
+      BusinessInterface ejb3Remote = (BusinessInterface)iniCtx.lookup("/test-webservices/WebServiceRefBean");
 
       String msg = "testWebServiceRef";
       Object retObj = ejb3Remote.echo(msg);