[jbossws-commits] JBossWS SVN: r16108 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060 and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2012-04-06 06:41:22 -0400 (Fri, 06 Apr 2012)
New Revision: 16108

Modified:
   stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
   stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060EJB3TestCase.java
   stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java
   stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java
Log:
[JBWS-3482] Use different context-root for endpoints that can be deployed concurrently


Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml	2012-04-05 16:30:03 UTC (rev 16107)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml	2012-04-06 10:41:22 UTC (rev 16108)
@@ -177,7 +177,7 @@
         <attribute name="Dependencies" value="org.jboss.logging"/>
       </manifest>
     </jar>
-    <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3060.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/jbws3060/WEB-INF/web.xml">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3060-jse.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/jbws3060/WEB-INF/web.xml">
       <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.class"/>
         <include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.class"/>

Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060EJB3TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060EJB3TestCase.java	2012-04-05 16:30:03 UTC (rev 16107)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060EJB3TestCase.java	2012-04-06 10:41:22 UTC (rev 16108)
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2012, 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.
  *
@@ -32,8 +32,24 @@
  */
 public class JBWS3060EJB3TestCase extends JBWS3060Tests
 {
+   private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/ServiceOne/EndpointOne";
+   private String endpointTwoURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/ServiceTwo/EndpointTwo";
+   
    public static Test suite()
    {
       return new JBossWSCXFTestSetup(JBWS3060EJB3TestCase.class, "jaxws-cxf-jbws3060.jar");
    }
+
+   @Override
+   protected String getEndpointOneURL()
+   {
+      return endpointOneURL;
+   }
+
+
+   @Override
+   protected String getEndpointTwoURL()
+   {
+      return endpointTwoURL;
+   }
 }

Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java	2012-04-05 16:30:03 UTC (rev 16107)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java	2012-04-06 10:41:22 UTC (rev 16108)
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2012, 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.
  *
@@ -32,9 +32,24 @@
  */
 public class JBWS3060ServletTestCase extends JBWS3060Tests
 {
+   private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060-jse/ServiceOne/EndpointOne";
+   private String endpointTwoURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060-jse/ServiceTwo/EndpointTwo";
+
    public static Test suite()
    {
-      return new JBossWSCXFTestSetup(JBWS3060ServletTestCase.class, "jaxws-cxf-jbws3060.war");
+      return new JBossWSCXFTestSetup(JBWS3060ServletTestCase.class, "jaxws-cxf-jbws3060-jse.war");
    }
    
+   @Override
+   protected String getEndpointOneURL()
+   {
+      return endpointOneURL;
+   }
+
+
+   @Override
+   protected String getEndpointTwoURL()
+   {
+      return endpointTwoURL;
+   }
 }

Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java	2012-04-05 16:30:03 UTC (rev 16107)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java	2012-04-06 10:41:22 UTC (rev 16108)
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2012, 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.
  *
@@ -42,15 +42,17 @@
  */
 public abstract class JBWS3060Tests extends JBossWSTest //*Tests does not match the configured surefire filter on test classes' names
 {
-   private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/ServiceOne/EndpointOne";
-   private String endpointTwoURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/ServiceTwo/EndpointTwo";
    private String targetNS = "http://org.jboss.ws.jaxws.cxf/jbws3060";
    
    private EndpointOne portOne;
    private EndpointTwo portTwo;
    
    protected int defaultSize = 30;
+   
+   protected abstract String getEndpointOneURL();
 
+   protected abstract String getEndpointTwoURL();
+
    public void testAccess() throws Exception
    {
       initPorts();
@@ -101,12 +103,12 @@
    
    private void initPorts() throws MalformedURLException
    {
-      URL wsdlOneURL = new URL(endpointOneURL + "?wsdl");
+      URL wsdlOneURL = new URL(getEndpointOneURL() + "?wsdl");
       QName serviceOneName = new QName(targetNS, "ServiceOne");
       Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
       portOne = (EndpointOne)serviceOne.getPort(EndpointOne.class);
       
-      URL wsdlTwoURL = new URL(endpointTwoURL + "?wsdl");
+      URL wsdlTwoURL = new URL(getEndpointTwoURL() + "?wsdl");
       QName serviceTwoName = new QName(targetNS, "ServiceTwo");
       Service serviceTwo = Service.create(wsdlTwoURL, serviceTwoName);
       portTwo = (EndpointTwo)serviceTwo.getPort(EndpointTwo.class);