[jboss-cvs] JBossAS SVN: r81281 - in projects/ejb3/trunk/testsuite: src/test/java/org/jboss/ejb3/test/webservices and 1 other directories.

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

Author: wolfc
Date: 2008-11-19 06:50:05 -0500 (Wed, 19 Nov 2008)
New Revision: 81281

Modified:
   projects/ejb3/trunk/testsuite/build-test.xml
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/webservices/WebServiceContextEndpoint.java
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/webservices/unit/WebServiceTestCase.java
Log:
EJBTHREE-1241: fixed client class path for webservices test, removed JNDI binding (overlap) and deploying only one archive

Modified: projects/ejb3/trunk/testsuite/build-test.xml
===================================================================
--- projects/ejb3/trunk/testsuite/build-test.xml	2008-11-19 11:38:25 UTC (rev 81280)
+++ projects/ejb3/trunk/testsuite/build-test.xml	2008-11-19 11:50:05 UTC (rev 81281)
@@ -385,8 +385,8 @@
     
     <!-- webservice tests -->
 
-    <pathelement location="${env.JBOSS_HOME}/client/jbossws-client.jar"/>
-    <pathelement location="${env.JBOSS_HOME}/client/jboss-jaxws.jar"/>
+    <pathelement location="${env.JBOSS_HOME}/client/jbossws-native-client.jar"/>
+    <pathelement location="${env.JBOSS_HOME}/client/jbossws-native-jaxws.jar"/>
     <pathelement location="${env.JBOSS_HOME}/client/jaxb-api.jar"/>
     <pathelement location="${env.JBOSS_HOME}/lib/endorsed/xercesImpl.jar"/>
     <pathelement location="${env.JBOSS_HOME}/lib/endorsed/jboss-appclient.jar"/>

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/webservices/WebServiceContextEndpoint.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/webservices/WebServiceContextEndpoint.java	2008-11-19 11:38:25 UTC (rev 81280)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/webservices/WebServiceContextEndpoint.java	2008-11-19 11:50:05 UTC (rev 81281)
@@ -21,12 +21,10 @@
  */
 package org.jboss.ejb3.test.webservices;
 
-import org.jboss.ejb3.annotation.RemoteBinding;
-
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
 import javax.ejb.Stateless;
 import javax.jws.WebService;
-import javax.annotation.Resource;
-import javax.annotation.PostConstruct;
 import javax.xml.ws.WebServiceContext;
 import javax.xml.ws.WebServiceException;
 
@@ -34,7 +32,6 @@
  * @author Heiko.Braun <heiko.braun at jboss.com>
  */
 @Stateless
- at RemoteBinding(jndiBinding = "WebServiceContextEndpoint")
 @WebService(endpointInterface = "org.jboss.ejb3.test.webservices.Ejb3WSEndpoint")
 public class WebServiceContextEndpoint implements Ejb3WSEndpoint
 {

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/webservices/unit/WebServiceTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/webservices/unit/WebServiceTestCase.java	2008-11-19 11:38:25 UTC (rev 81280)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/webservices/unit/WebServiceTestCase.java	2008-11-19 11:50:05 UTC (rev 81281)
@@ -21,19 +21,21 @@
  */
 package org.jboss.ejb3.test.webservices.unit;
 
-import junit.framework.Test;
-import org.jboss.ejb3.test.webservices.BusinessInterface;
-import org.jboss.ejb3.test.webservices.Ejb3WSEndpoint;
-import org.jboss.test.JBossTestCase;
+import java.net.URL;
+import java.util.Hashtable;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.xml.namespace.QName;
 import javax.xml.ws.Service;
-import java.net.URL;
-import java.util.Hashtable;
 
+import junit.framework.Test;
+
+import org.jboss.ejb3.test.webservices.BusinessInterface;
+import org.jboss.ejb3.test.webservices.Ejb3WSEndpoint;
+import org.jboss.test.JBossTestCase;
+
 /**
  * @author Heiko.Braun at jboss.com
  * @version $Revision$
@@ -129,7 +131,7 @@
 
    public static Test suite() throws Exception
    {
-      return getDeploySetup(WebServiceTestCase.class, "webservices-ejb3.jar, webservices-ejb3-client.jar");
+      return getDeploySetup(WebServiceTestCase.class, "webservices-ejb3.jar");
    }
 
    protected InitialContext getInitialContext(String clientName) throws NamingException