[jboss-cvs] JBossAS SVN: r59936 - in trunk/ejb3/src/test/org/jboss/ejb3/test: jaxws/unit and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 23 09:21:31 EST 2007
Author: heiko.braun at jboss.com
Date: 2007-01-23 09:21:31 -0500 (Tue, 23 Jan 2007)
New Revision: 59936
Modified:
trunk/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointEJB.java
trunk/ejb3/src/test/org/jboss/ejb3/test/jaxws/unit/ContextEJBTestCase.java
trunk/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EndpointInterface.java
trunk/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/JSR181TestCase.java
Log:
Remove dependencies on proprietary JBossWS API
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointEJB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointEJB.java 2007-01-23 13:22:02 UTC (rev 59935)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointEJB.java 2007-01-23 14:21:31 UTC (rev 59936)
@@ -33,10 +33,7 @@
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.WebServiceException;
-import org.jboss.ws.annotation.PortComponent;
-
@WebService(endpointInterface = "org.jboss.ejb3.test.jaxws.EndpointInterface", serviceName = "TestService", targetNamespace = "http://org.jboss.ws/jaxws/context")
- at PortComponent(contextRoot = "/jaxws-context", urlPattern = "/*")
@Stateless
public class EndpointEJB
{
@@ -45,7 +42,7 @@
@Resource
SessionContext ejbCtx;
-
+
public String echo(String input)
{
try
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/jaxws/unit/ContextEJBTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/jaxws/unit/ContextEJBTestCase.java 2007-01-23 13:22:02 UTC (rev 59935)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/jaxws/unit/ContextEJBTestCase.java 2007-01-23 14:21:31 UTC (rev 59936)
@@ -23,20 +23,15 @@
// $Id: ContextEJBTestCase.java 1874 2007-01-09 14:28:41Z thomas.diesler at jboss.com $
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
import junit.framework.Test;
-
import org.jboss.ejb3.test.jaxws.EndpointInterface;
import org.jboss.test.JBossTestCase;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import java.io.File;
+import java.net.URL;
+
/**
* Test JAXWS WebServiceContext
*
@@ -55,15 +50,6 @@
{
return getDeploySetup(ContextEJBTestCase.class, "jaxws-context.jar");
}
-
- public void testWSDLAccess() throws MalformedURLException
- {
-
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-context?wsdl");
- WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
- WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
- assertNotNull(wsdlDefinitions);
- }
public void testClientAccess() throws Exception
{
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java 2007-01-23 13:22:02 UTC (rev 59935)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java 2007-01-23 14:21:31 UTC (rev 59936)
@@ -22,20 +22,18 @@
package org.jboss.ejb3.test.webservices.jsr181;
import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.ws.annotation.PortComponent;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
* @version $Revision$
*/
@WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService")
- at PortComponent(contextRoot="/jsr181", urlPattern="/*")
@SOAPBinding(style = SOAPBinding.Style.RPC)
@Remote(EJB3RemoteInterface.class)
@RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface")
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EndpointInterface.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EndpointInterface.java 2007-01-23 13:22:02 UTC (rev 59935)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EndpointInterface.java 2007-01-23 14:21:31 UTC (rev 59936)
@@ -21,11 +21,7 @@
*/
package org.jboss.ejb3.test.webservices.jsr181;
-import org.jboss.ws.annotation.PortComponent;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
import java.rmi.Remote;
import java.rmi.RemoteException;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/JSR181TestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/JSR181TestCase.java 2007-01-23 13:22:02 UTC (rev 59935)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/JSR181TestCase.java 2007-01-23 14:21:31 UTC (rev 59936)
@@ -21,26 +21,18 @@
*/
package org.jboss.ejb3.test.webservices.unit;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Hashtable;
+import junit.framework.Test;
+import org.jboss.ejb3.test.webservices.jsr181.EJB3RemoteInterface;
+import org.jboss.ejb3.test.webservices.jsr181.EndpointInterface;
+import org.jboss.ejb3.test.webservices.jsr181.StatelessRemote;
+import org.jboss.test.JBossTestCase;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.rmi.PortableRemoteObject;
import javax.xml.rpc.Service;
+import java.util.Hashtable;
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
-
-import org.jboss.ejb3.test.webservices.jsr181.EndpointInterface;
-import org.jboss.ejb3.test.webservices.jsr181.EJB3RemoteInterface;
-import org.jboss.ejb3.test.webservices.jsr181.StatelessRemote;
-
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
* @version $Revision$
@@ -64,8 +56,6 @@
public void testWebService() throws Exception
{
- assertWSDLAccess();
-
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class);
@@ -100,14 +90,6 @@
assertEquals("Hello", stateless.echo9("Hello"));
}
- private void assertWSDLAccess() throws MalformedURLException
- {
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jsr181?wsdl");
- WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
- WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
- assertNotNull(wsdlDefinitions);
- }
-
public static Test suite() throws Exception
{
return getDeploySetup(JSR181TestCase.class, "jsr181-client.jar, jsr181.jar");
More information about the jboss-cvs-commits
mailing list