[jbossws-commits] JBossWS SVN: r9836 - in framework/trunk: testsuite/test/ant-import and 6 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Mon Apr 20 03:33:37 EDT 2009


Author: richard.opalka at jboss.com
Date: 2009-04-20 03:33:37 -0400 (Mon, 20 Apr 2009)
New Revision: 9836

Removed:
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.java
   framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF_4/
   framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/META-INF/application.xml
Modified:
   framework/trunk/pom.xml
   framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
   framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java
Log:
[JBWS-2612] removing AS 4x support

Modified: framework/trunk/pom.xml
===================================================================
--- framework/trunk/pom.xml	2009-04-20 06:25:40 UTC (rev 9835)
+++ framework/trunk/pom.xml	2009-04-20 07:33:37 UTC (rev 9836)
@@ -24,7 +24,7 @@
   
   <!-- Properties -->
   <properties>
-    <jbossws.common.version>1.0.10.GA</jbossws.common.version>
+    <jbossws.common.version>1.0.11-SNAPSHOT</jbossws.common.version>
     <jbossws.spi.version>1.1.1.GA</jbossws.spi.version>
     <jboss.common.version>1.2.1.GA</jboss.common.version>
     <jbossxb.version>1.0.0.SP1</jbossxb.version>

Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml	2009-04-20 06:25:40 UTC (rev 9835)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml	2009-04-20 07:33:37 UTC (rev 9836)
@@ -423,22 +423,11 @@
     </ear>
     
     <!-- jaxws-jbws1841 -->
-    <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1841.jar">
+  	<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1841.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/jbws1841/*.class"/>
       	<exclude name="org/jboss/test/ws/jaxws/jbws1841/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1841/META-INF_4">
-        <include name="wsdl/*"/>
-        <include name="ejb-jar.xml"/>
-        <include name="jboss.xml"/>
-      </metainf>
-    </jar>
-  	<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1841-as5.jar">
-      <fileset dir="${tests.output.dir}/test-classes">
-        <include name="org/jboss/test/ws/jaxws/jbws1841/*.class"/>
-      	<exclude name="org/jboss/test/ws/jaxws/jbws1841/*TestCase.class"/>
-      </fileset>
       <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1841/META-INF">
         <include name="wsdl/*"/>
         <include name="ejb-jar.xml"/>

Modified: framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml	2009-04-20 06:25:40 UTC (rev 9835)
+++ framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml	2009-04-20 07:33:37 UTC (rev 9836)
@@ -71,15 +71,6 @@
         <include name="jboss-app.xml"/>
       </metainf>
     </jar>
-    <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment42.ear">
-      <fileset dir="${tests.output.dir}/test-libs">
-        <include name="jaxws-samples-eardeployment.jar"/>
-        <include name="jaxws-samples-eardeployment.war"/>
-      </fileset>
-      <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/META-INF">
-        <include name="application.xml"/>
-      </metainf>
-    </jar>
 
     <!-- jaxws-samples-exception -->
     <war warfile="${tests.output.dir}/test-libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/exception/WEB-INF/web.xml">
@@ -214,17 +205,12 @@
       </metainf>
     </jar>
   	
-    <!-- jaxws-samples-securityDomain -->
-    <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-securityDomain.jar">
-      <fileset dir="${tests.output.dir}/test-classes">
-        <include name="org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.class"/>
-      </fileset>
-    </jar>
-  	<jar destfile="${tests.output.dir}/test-libs/jaxws-samples-securityDomain-as5.jar">
-      <fileset dir="${tests.output.dir}/test-classes">
-        <include name="org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.class"/>
-      </fileset>
-    </jar>
+     <!-- jaxws-samples-securityDomain -->
+     <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-securityDomain.jar">
+       <fileset dir="${tests.output.dir}/test-classes">
+         <include name="org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.class"/>
+       </fileset>
+     </jar>
 
      <!-- jaxws-samples-serviceref -->
      <war warfile="${tests.output.dir}/test-libs/jaxws-samples-serviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/serviceref/WEB-INF/web.xml">

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java	2009-04-20 06:25:40 UTC (rev 9835)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java	2009-04-20 07:33:37 UTC (rev 9836)
@@ -23,7 +23,6 @@
 
 import junit.framework.Test;
 import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
 import org.jboss.wsf.test.JBossWSTestSetup;
 
 import javax.xml.namespace.QName;
@@ -37,7 +36,6 @@
  * http://jira.jboss.org/jira/browse/JBWS-1841
  *
  * @author Heiko.Braun at jboss.com
- * @since 09-Oct-2007
  */
 public class JBWS1841TestCase extends JBossWSTest
 {
@@ -48,8 +46,7 @@
 
    public static Test suite()
    {
-      //here in the AS 5 jar we use <service-qname> that does not exist in AS 4.2.x
-      return new JBossWSTestSetup(JBWS1841TestCase.class, new JBossWSTestHelper().isTargetJBoss5OrGreater() ? "jaxws-jbws1841-as5.jar" : "jaxws-jbws1841.jar");
+      return new JBossWSTestSetup(JBWS1841TestCase.class, "jaxws-jbws1841.jar");
    }
 
    protected void setUp() throws Exception

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java	2009-04-20 06:25:40 UTC (rev 9835)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java	2009-04-20 07:33:37 UTC (rev 9836)
@@ -33,7 +33,6 @@
 import junit.framework.Test;
 
 import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
 import org.jboss.wsf.test.JBossWSTestSetup;
 
 /**
@@ -42,14 +41,13 @@
  * [JBWS-1616] Verify correct bahaviour of @WebService.wsdlLocation
  *
  * @author Thomas.Diesler at jboss.org
- * @since 08-Dec-2006
+ * @author <a href="mailto:richard.opalka at jboss.org">Richard Opalka</a>
  */
 public class EarTestCase extends JBossWSTest
 {
    public static Test suite()
    {
-      String earName = (new JBossWSTestHelper().isTargetJBoss5OrGreater() ? "jaxws-samples-eardeployment.ear" : "jaxws-samples-eardeployment42.ear");
-      return new JBossWSTestSetup(EarTestCase.class, earName);
+      return new JBossWSTestSetup(EarTestCase.class, "jaxws-samples-eardeployment.ear");
    }
 
    public void testEJB3Endpoint() throws Exception

Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.java	2009-04-20 06:25:40 UTC (rev 9835)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.java	2009-04-20 07:33:37 UTC (rev 9836)
@@ -1,66 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.securityDomain;
-
-import javax.annotation.security.RolesAllowed;
-import javax.ejb.Stateless;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.Style;
-
-import org.jboss.ejb3.annotation.SecurityDomain;
-import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.annotation.AuthMethod;
-import org.jboss.wsf.spi.annotation.TransportGuarantee;
-import org.jboss.wsf.spi.annotation.WebContext;
-
- at Stateless(name = "SecureEndpoint")
- at SOAPBinding(style = Style.RPC)
- at WebService
-(
-   name = "SecureEndpoint",
-   serviceName = "SecureEndpointService",
-   targetNamespace = "http://org.jboss.ws/securityDomain"
-)
- at WebContext
-(
-   contextRoot="/jaxws-securityDomain", 
-   urlPattern="/*",
-   authMethod = AuthMethod.BASIC,
-   transportGuarantee = TransportGuarantee.NONE,
-   secureWSDLAccess = false
-)
- at SecurityDomain("JBossWS")
- at RolesAllowed("friend")
-public class SecureEndpointAS5Impl
-{
-   // Provide logging
-   private static Logger log = Logger.getLogger(SecureEndpointAS5Impl.class);
-
-   @WebMethod
-   public String echo(String input)
-   {
-      log.info(input);
-      return input;
-   }
-}

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.java	2009-04-20 06:25:40 UTC (rev 9835)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.java	2009-04-20 07:33:37 UTC (rev 9836)
@@ -28,7 +28,7 @@
 import javax.jws.soap.SOAPBinding;
 import javax.jws.soap.SOAPBinding.Style;
 
-import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.annotation.SecurityDomain;
 import org.jboss.logging.Logger;
 import org.jboss.wsf.spi.annotation.AuthMethod;
 import org.jboss.wsf.spi.annotation.TransportGuarantee;
@@ -44,7 +44,7 @@
 )
 @WebContext
 (
-   contextRoot="/jaxws-securityDomain",
+   contextRoot="/jaxws-securityDomain", 
    urlPattern="/*",
    authMethod = AuthMethod.BASIC,
    transportGuarantee = TransportGuarantee.NONE,

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java	2009-04-20 06:25:40 UTC (rev 9835)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java	2009-04-20 07:33:37 UTC (rev 9836)
@@ -32,7 +32,6 @@
 import junit.framework.Test;
 
 import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
 import org.jboss.wsf.test.JBossWSTestSetup;
 
 /**
@@ -41,7 +40,7 @@
  * @SecurityDomain
  * 
  * @author alessio.soldano at jboss.com
- * @since 04-Jun-2008
+ * @author <a href="mailto:richard.opalka at jboss.org">Richard Opalka</a>
  */
 public class SecurityDomainTestCase extends JBossWSTest
 {
@@ -49,7 +48,7 @@
 
    public static Test suite()
    {
-      return new JBossWSTestSetup(SecurityDomainTestCase.class, new JBossWSTestHelper().isTargetJBoss5OrGreater() ? "jaxws-samples-securityDomain-as5.jar" : "jaxws-samples-securityDomain.jar");
+      return new JBossWSTestSetup(SecurityDomainTestCase.class, "jaxws-samples-securityDomain.jar");
    }
 
    private SecureEndpoint getPort() throws Exception

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java	2009-04-20 06:25:40 UTC (rev 9835)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java	2009-04-20 07:33:37 UTC (rev 9836)
@@ -21,7 +21,6 @@
  */
 package org.jboss.test.ws.jaxws.samples.serviceref;
 
-import java.io.File;
 import java.io.InputStream;
 import java.net.URL;
 
@@ -34,14 +33,13 @@
 import junit.framework.Test;
 
 import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
 import org.jboss.wsf.test.JBossWSTestSetup;
 
 /**
  * Test the JAXWS <service-ref>
  *
  * @author Thomas.Diesler at jboss.com
- * @since 123-Mar-2007
+ * @author <a href="mailto:richard.opalka at jboss.org">Richard Opalka</a>
  */
 public class ServiceRefClientTestCase extends JBossWSTest
 {
@@ -49,10 +47,7 @@
 
    public static Test suite()
    {
-      String archives = "jaxws-samples-serviceref.war";
-      if (new JBossWSTestHelper().isTargetJBoss5OrGreater())
-         archives += ",jaxws-samples-serviceref-client.jar";
-      
+      String archives = "jaxws-samples-serviceref.war,jaxws-samples-serviceref-client.jar";
       return new JBossWSTestSetup(ServiceRefClientTestCase.class, archives);
    }
 
@@ -66,9 +61,6 @@
 
    public void testDynamicProxy() throws Exception
    {
-      if (isTargetJBoss5() == false)
-         return;
-      
       URL wsdlURL = getResourceURL("jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl");
       QName qname = new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/", "EndpointService");
       Service service = Service.create(wsdlURL, qname);
@@ -81,15 +73,11 @@
 
    public void testApplicationClient() throws Exception
    {
-      if (isTargetJBoss5() == false)
-         return;
-      
       InitialContext iniCtx = getInitialContext("jbossws-client");
       Service service = (Service) iniCtx.lookup("java:comp/env/service2");
       Endpoint port = service.getPort(Endpoint.class);
       assertNotNull(port);
 
-
       if(isIntegrationNative())
       {
          BindingProvider bp = (BindingProvider)port;

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java	2009-04-20 06:25:40 UTC (rev 9835)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java	2009-04-20 07:33:37 UTC (rev 9836)
@@ -21,7 +21,6 @@
  */
 package org.jboss.test.ws.jaxws.samples.serviceref;
 
-import java.io.File;
 import java.io.InputStream;
 import java.net.URL;
 
@@ -33,14 +32,13 @@
 
 import org.jboss.test.ws.jaxws.samples.serviceref.EJBRemote;
 import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
 import org.jboss.wsf.test.JBossWSTestSetup;
 
 /**
- * Test the JAXRPC <service-ref>
+ * Test the JAXWS <service-ref>
  *
  * @author Thomas.Diesler at jboss.com
- * @since 23-Oct-2005
+ * @author <a href="mailto:richard.opalka at jboss.org">Richard Opalka</a>
  */
 public class ServiceRefEJBTestCase extends JBossWSTest
 {
@@ -48,10 +46,7 @@
    
    public static Test suite()
    {
-      String archives = "jaxws-samples-serviceref.war";
-      if (new JBossWSTestHelper().isTargetJBoss5OrGreater())
-         archives += ",jaxws-samples-serviceref-ejb-client.jar";
-      
+      final String archives = "jaxws-samples-serviceref.war,jaxws-samples-serviceref-ejb-client.jar";
       return new JBossWSTestSetup(ServiceRefEJBTestCase.class, archives);
    }
 
@@ -63,35 +58,26 @@
       inputStream.close();
    }
 
-   
    public void testDynamicProxy() throws Exception
    {
-      // JAXWS <service-ref> is only supported in EE5 
-      if (isTargetJBoss5())
-      {
-         URL wsdlURL = getResourceURL("jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl");
-         QName qname = new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/", "EndpointService");
-         Service service = Service.create(wsdlURL, qname);
-         Endpoint port = (Endpoint)service.getPort(Endpoint.class);
+      URL wsdlURL = getResourceURL("jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl");
+      QName qname = new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/", "EndpointService");
+      Service service = Service.create(wsdlURL, qname);
+      Endpoint port = (Endpoint)service.getPort(Endpoint.class);
 
-         String helloWorld = "DynamicProxy";
-         Object retObj = port.echo(helloWorld);
-         assertEquals(helloWorld, retObj);
-      }
+      String helloWorld = "DynamicProxy";
+      Object retObj = port.echo(helloWorld);
+      assertEquals(helloWorld, retObj);
    }
 
-
    public void testEJBClient() throws Exception
    {      
-      // JAXWS <service-ref> is only supported in EE5 
-      if (isTargetJBoss5())
-      {
-         InitialContext iniCtx = getInitialContext();
-         EJBRemote ejbRemote = (EJBRemote)iniCtx.lookup("/EJBClient/remote");
+      InitialContext iniCtx = getInitialContext();
+      EJBRemote ejbRemote = (EJBRemote)iniCtx.lookup("/EJBClient/remote");
 
-         String helloWorld = "Hello World!";
-         Object retObj = ejbRemote.echo(helloWorld);
-         assertEquals(helloWorld, retObj);
-      }
+      String helloWorld = "Hello World!";
+      Object retObj = ejbRemote.echo(helloWorld);
+      assertEquals(helloWorld, retObj);
    }
+
 }

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java	2009-04-20 06:25:40 UTC (rev 9835)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java	2009-04-20 07:33:37 UTC (rev 9836)
@@ -23,33 +23,29 @@
 
 import junit.framework.Test;
 import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
 import org.jboss.wsf.test.JBossWSTestSetup;
 
 import javax.xml.namespace.QName;
 import javax.xml.ws.Service;
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.InputStreamReader;
 import java.io.InputStream;
 import java.net.URL;
 
 /**
- * Test the jaxws <service-ref>
+ * Test the JAXWS <service-ref>
  *
  * @author Thomas.Diesler at jboss.com
- * @since 23-Oct-2005
+ * @author <a href="mailto:richard.opalka at jboss.org">Richard Opalka</a>
  */
 public class ServiceRefServletTestCase extends JBossWSTest
 {
+   
    public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-serviceref";
    
    public static Test suite()
    {
-      String archives = "jaxws-samples-serviceref.war";
-      if (new JBossWSTestHelper().isTargetJBoss5OrGreater())
-         archives += ",jaxws-samples-serviceref-servlet-client.war";
-      
+      String archives = "jaxws-samples-serviceref.war,jaxws-samples-serviceref-servlet-client.war";
       return new JBossWSTestSetup(ServiceRefServletTestCase.class, archives);
    }
 
@@ -63,9 +59,6 @@
   
    public void testDynamicProxy() throws Exception
    {
-      if (isTargetJBoss5() == false)
-         return;
-      
       URL wsdlURL = getResourceURL("jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl");
       QName qname = new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/", "EndpointService");
       Service service = Service.create(wsdlURL, qname);
@@ -78,12 +71,10 @@
 
    public void testServletClient() throws Exception
    {
-      if (isTargetJBoss5() == false)
-         return;
-      
       URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld");
       BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
       String retStr = br.readLine();
       assertEquals("HelloWorld", retStr);
    }
+
 }

Deleted: framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/META-INF/application.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/META-INF/application.xml	2009-04-20 06:25:40 UTC (rev 9835)
+++ framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/META-INF/application.xml	2009-04-20 07:33:37 UTC (rev 9836)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- This is only needed for JBoss-4.2 deployments -->
-
-<application xmlns="http://java.sun.com/xml/ns/j2ee"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-    http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
-  version="1.4">
-
-  <module>
-    <web>
-      <web-uri>jaxws-samples-eardeployment.war</web-uri>
-      <context-root>earjse</context-root>
-    </web>
-  </module>
-  <module>
-    <java>jaxws-samples-eardeployment.jar</java>
-  </module>
-
-</application>
\ No newline at end of file




More information about the jbossws-commits mailing list