[jbossws-commits] JBossWS SVN: r15812 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 6 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Thu Mar 1 14:38:16 EST 2012


Author: ropalka
Date: 2012-03-01 14:38:15 -0500 (Thu, 01 Mar 2012)
New Revision: 15812

Modified:
   stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/META-INF/application-client.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml
   stack/native/trunk/modules/testsuite/pom.xml
Log:
[AS7-3444] enabling appclient tests (WIP)

Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml	2012-03-01 17:55:56 UTC (rev 15811)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml	2012-03-01 19:38:15 UTC (rev 15812)
@@ -3680,18 +3680,25 @@
         <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
       </classes>
+      <manifest>
+          <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
+      </manifest>
       <webinf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit-client.jar">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
+        <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/>
       </fileset>
+      <manifest>
+          <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/>
+      </manifest>
       <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -3701,6 +3708,11 @@
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-xop-doclit-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-xop-doclit with handlers -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit_handler.war" webxml="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF/web.xml">
@@ -3709,6 +3721,9 @@
         <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
       </classes>
+      <manifest>
+          <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
+      </manifest>
       <webinf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
@@ -3717,12 +3732,16 @@
         <include name="webservices.xml"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit_handler-client.jar">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit_handler-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
+        <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/>
       </fileset>
+      <manifest>
+          <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/>
+      </manifest>
       <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/handlerconfig/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -3732,6 +3751,11 @@
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit_handler-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-xop-doclit_handler-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-xop-rpclit without handlers -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/WEB-INF/web.xml">
@@ -3740,18 +3764,25 @@
         <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
       </classes>
+      <manifest>
+          <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
+      </manifest>
       <webinf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit-client.jar">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
+        <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/>
       </fileset>
+      <manifest>
+          <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/>
+      </manifest>
       <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -3761,6 +3792,11 @@
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-xop-rpclit-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-xop-rpclit with handlers -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit_handler.war" webxml="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/WEB-INF/web.xml">
@@ -3769,6 +3805,9 @@
         <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
       </classes>
+      <manifest>
+          <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
+      </manifest>
       <webinf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
@@ -3777,12 +3816,16 @@
         <include name="webservices.xml"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit_handler-client.jar">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit_handler-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
+        <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/>
       </fileset>
+      <manifest>
+          <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/>
+      </manifest>
       <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/handlerconfig/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -3792,6 +3835,11 @@
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit_handler-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-xop-rpclit_handler-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- Please add alphabetically -->
     

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java	2012-03-01 17:55:56 UTC (rev 15811)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java	2012-03-01 19:38:15 UTC (rev 15812)
@@ -40,10 +40,11 @@
 public class XOPHandlerTestCase extends XOPBase  {
 
    private static XOPPing port;
+   private static InitialContext iniCtx;
 
    public static Test suite()
    {
-      return new JBossWSTestSetup(XOPHandlerTestCase.class, "jaxrpc-xop-doclit_handler.war, jaxrpc-xop-doclit_handler-client.jar");
+      return new JBossWSTestSetup(XOPHandlerTestCase.class, "jaxrpc-xop-doclit_handler.war, jaxrpc-xop-doclit_handler-appclient.ear#jaxrpc-xop-doclit_handler-appclient.jar");
    }
 
    protected void setUp() throws Exception
@@ -51,13 +52,20 @@
       super.setUp();
       if (port == null)
       {
-         InitialContext iniCtx = getInitialContext();
-         Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPHandlerTestCase");
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/XOPHandlerTestCase");
          port = (XOPPing)service.getPort(XOPPing.class);
          ((StubExt)port).setConfigName("Standard MTOM client");
       }
+   }
 
-      //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-doclit_handler");
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+         iniCtx = null;
+      }
    }
 
    protected XOPPing getPort() {

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java	2012-03-01 17:55:56 UTC (rev 15811)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java	2012-03-01 19:38:15 UTC (rev 15812)
@@ -38,10 +38,11 @@
 public class XOPTestCase extends XOPBase {
 
    private static XOPPing port;
+   private static InitialContext iniCtx;
 
    public static Test suite()
    {
-      return new JBossWSTestSetup(XOPTestCase.class, "jaxrpc-xop-doclit.war, jaxrpc-xop-doclit-client.jar");
+      return new JBossWSTestSetup(XOPTestCase.class, "jaxrpc-xop-doclit.war, jaxrpc-xop-doclit-appclient.ear#jaxrpc-xop-doclit-appclient.jar");
    }
 
    protected void setUp() throws Exception
@@ -49,13 +50,20 @@
       super.setUp();
       if (port == null)
       {
-         InitialContext iniCtx = getInitialContext();
-         Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestCase");
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/XOPTestCase");
          port = (XOPPing)service.getPort(XOPPing.class);
          ((StubExt)port).setConfigName("Standard MTOM client");
       }
+   }
 
-      //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-doclit");
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+         iniCtx = null;
+      }
    }
 
    protected XOPPing getPort()

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java	2012-03-01 17:55:56 UTC (rev 15811)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java	2012-03-01 19:38:15 UTC (rev 15812)
@@ -36,10 +36,11 @@
 public class XOPHandlerTestCase extends XOPBase  {
 
    private static XOPPing port;
+   private static InitialContext iniCtx;
 
    public static Test suite()
    {
-      return new JBossWSTestSetup(XOPHandlerTestCase.class, "jaxrpc-xop-rpclit_handler.war, jaxrpc-xop-rpclit_handler-client.jar");
+      return new JBossWSTestSetup(XOPHandlerTestCase.class, "jaxrpc-xop-rpclit_handler.war, jaxrpc-xop-rpclit_handler-appclient.ear#jaxrpc-xop-rpclit_handler-appclient.jar");
    }
 
    protected void setUp() throws Exception
@@ -47,13 +48,20 @@
       super.setUp();
       if (port == null)
       {
-         InitialContext iniCtx = getInitialContext();
-         Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPHandlerTestCaseRPC");
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/XOPHandlerTestCaseRPC");
          port = (XOPPing)service.getPort(XOPPing.class);
          ((StubExt)port).setConfigName("Standard MTOM client");
       }
+   }
 
-      //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-rpclit_handler");
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+         iniCtx = null;
+      }
    }
 
    protected XOPPing getPort() {

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java	2012-03-01 17:55:56 UTC (rev 15811)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java	2012-03-01 19:38:15 UTC (rev 15812)
@@ -37,10 +37,11 @@
 public class XOPTestCase extends XOPBase {
 
    private static XOPPing port;
+   private static InitialContext iniCtx;
 
    public static Test suite()
    {
-      return new JBossWSTestSetup(XOPTestCase.class, "jaxrpc-xop-rpclit.war, jaxrpc-xop-rpclit-client.jar");
+      return new JBossWSTestSetup(XOPTestCase.class, "jaxrpc-xop-rpclit.war, jaxrpc-xop-rpclit-appclient.ear#jaxrpc-xop-rpclit-appclient.jar");
    }
 
    protected void setUp() throws Exception
@@ -48,13 +49,20 @@
       super.setUp();
       if (port == null)
       {
-         InitialContext iniCtx = getInitialContext();
-         Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestCaseRPC");
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/XOPTestCaseRPC");
          port = (XOPPing)service.getPort(XOPPing.class);
          ((StubExt)port).setConfigName("Standard MTOM client");
       }
+   }
 
-      //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-rpclit");
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+         iniCtx = null;
+      }
    }
 
    protected XOPPing getPort() {

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/META-INF/application-client.xml	2012-03-01 17:55:56 UTC (rev 15811)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/META-INF/application-client.xml	2012-03-01 19:38:15 UTC (rev 15812)
@@ -8,7 +8,7 @@
    <display-name>XOP DOC/Lit without handlers</display-name>
 
    <service-ref>
-      <service-ref-name>service/XOPTestCase</service-ref-name>
+      <service-ref-name>java:jboss/exported/service/XOPTestCase</service-ref-name>
       <service-interface>javax.xml.rpc.Service</service-interface>
       <wsdl-file>use overwrite in jboss-client.xml</wsdl-file>
       <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml	2012-03-01 17:55:56 UTC (rev 15811)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml	2012-03-01 19:38:15 UTC (rev 15812)
@@ -5,10 +5,9 @@
    "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
 
 <jboss-client>
-  <jndi-name>jbossws-client</jndi-name>
 
   <service-ref>
-    <service-ref-name>service/XOPTestCase</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/XOPTestCase</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-xop-doclit?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml	2012-03-01 17:55:56 UTC (rev 15811)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml	2012-03-01 19:38:15 UTC (rev 15812)
@@ -8,7 +8,7 @@
    <display-name>XOP DOC/Lit with handlers</display-name>
 
    <service-ref>
-      <service-ref-name>service/XOPHandlerTestCase</service-ref-name>
+      <service-ref-name>java:jboss/exported/service/XOPHandlerTestCase</service-ref-name>
       <service-interface>javax.xml.rpc.Service</service-interface>
       <wsdl-file>use overwrite in jboss-client.xml</wsdl-file>
       <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml	2012-03-01 17:55:56 UTC (rev 15811)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml	2012-03-01 19:38:15 UTC (rev 15812)
@@ -5,10 +5,9 @@
    "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
 
 <jboss-client>
-  <jndi-name>jbossws-client</jndi-name>
 
   <service-ref>
-    <service-ref-name>service/XOPHandlerTestCase</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/XOPHandlerTestCase</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-xop-doclit_handler?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml	2012-03-01 17:55:56 UTC (rev 15811)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml	2012-03-01 19:38:15 UTC (rev 15812)
@@ -8,7 +8,7 @@
    <display-name>XOP DOC/Lit without handlers</display-name>
 
    <service-ref>
-      <service-ref-name>service/XOPTestCaseRPC</service-ref-name>
+      <service-ref-name>java:jboss/exported/service/XOPTestCaseRPC</service-ref-name>
       <service-interface>javax.xml.rpc.Service</service-interface>
       <wsdl-file>use overwrite in jboss-client.xml</wsdl-file>
       <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml	2012-03-01 17:55:56 UTC (rev 15811)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml	2012-03-01 19:38:15 UTC (rev 15812)
@@ -5,10 +5,9 @@
    "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
 
 <jboss-client>
-  <jndi-name>jbossws-client</jndi-name>
 
   <service-ref>
-    <service-ref-name>service/XOPTestCaseRPC</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/XOPTestCaseRPC</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-xop-rpclit?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml	2012-03-01 17:55:56 UTC (rev 15811)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml	2012-03-01 19:38:15 UTC (rev 15812)
@@ -8,7 +8,7 @@
    <display-name>XOP DOC/Lit with handlers</display-name>
 
    <service-ref>
-      <service-ref-name>service/XOPHandlerTestCaseRPC</service-ref-name>
+      <service-ref-name>java:jboss/exported/service/XOPHandlerTestCaseRPC</service-ref-name>
       <service-interface>javax.xml.rpc.Service</service-interface>
       <wsdl-file>use overwrite in jboss-client.xml</wsdl-file>
       <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml	2012-03-01 17:55:56 UTC (rev 15811)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml	2012-03-01 19:38:15 UTC (rev 15812)
@@ -5,10 +5,9 @@
    "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
 
 <jboss-client>
-  <jndi-name>jbossws-client</jndi-name>
 
   <service-ref>
-    <service-ref-name>service/XOPHandlerTestCaseRPC</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/XOPHandlerTestCaseRPC</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-xop-rpclit_handler?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml	2012-03-01 17:55:56 UTC (rev 15811)
+++ stack/native/trunk/modules/testsuite/pom.xml	2012-03-01 19:38:15 UTC (rev 15812)
@@ -1192,13 +1192,9 @@
                  <exclude>org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase*</exclude>
 
                  <!-- # webservices-description in jboss-web.xml / jboss.xml -->
+                 <exclude>org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/wsse/RpcTestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase*</exclude>



More information about the jbossws-commits mailing list