[jbossws-commits] JBossWS SVN: r15819 - in stack/native/branches/jbossws-native-4.0.x: modules/testsuite and 44 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Thu Mar 1 17:15:15 EST 2012


Author: ropalka
Date: 2012-03-01 17:15:11 -0500 (Thu, 01 Mar 2012)
New Revision: 15819

Removed:
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws637/META-INF/jboss-client.xml
Modified:
   stack/native/branches/jbossws-native-4.0.x/
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1792/JBWS1792TestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/jboss-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/jboss-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/anonymous/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/anonymous/META-INF/jboss-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/href/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/href/META-INF/jboss-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/jboss-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/parametermode/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/parametermode/META-INF/jboss-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws124/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws124/META-INF/jboss-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1316/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1316/META-INF/jboss-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws153/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws153/META-INF/jboss-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1619/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1619/META-INF/jboss-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws163/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws163/META-INF/jboss-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1653/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1653/META-INF/jboss-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws168/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws168/META-INF/jboss-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1792/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1792/META-INF/jboss-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws637/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-doclit/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-doclit/META-INF/jboss-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-rpclit/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/overloaded/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/overloaded/META-INF/jboss-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/utf16/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/utf16/META-INF/jboss-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml
Log:
Merged revisions 15812-15818 via svnmerge from 
https://svn.jboss.org/repos/jbossws/stack/native/trunk

.......
  r15812 | ropalka | 2012-03-01 20:38:15 +0100 (Thu, 01 Mar 2012) | 1 line
  
  [AS7-3444] enabling appclient tests (WIP)
.......
  r15813 | ropalka | 2012-03-01 21:17:36 +0100 (Thu, 01 Mar 2012) | 1 line
  
  [AS7-3444] enabling appclient tests (WIP)
.......
  r15814 | ropalka | 2012-03-01 21:41:27 +0100 (Thu, 01 Mar 2012) | 1 line
  
  [AS7-3444] enabling appclient tests (WIP)
.......
  r15815 | ropalka | 2012-03-01 22:08:34 +0100 (Thu, 01 Mar 2012) | 1 line
  
  [AS7-3444] enabling appclient tests (WIP)
.......
  r15816 | ropalka | 2012-03-01 22:09:02 +0100 (Thu, 01 Mar 2012) | 1 line
  
  [AS7-3444] enabling appclient tests (WIP)
.......
  r15817 | ropalka | 2012-03-01 22:31:11 +0100 (Thu, 01 Mar 2012) | 1 line
  
  [AS7-3444] enabling appclient tests (WIP)
.......
  r15818 | ropalka | 2012-03-01 23:06:02 +0100 (Thu, 01 Mar 2012) | 1 line
  
  [AS7-3444] enabling appclient tests (WIP)
.......



Property changes on: stack/native/branches/jbossws-native-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
   - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-15678,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793-15804,15810
   + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-15678,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793-15804,15810,15812-15818
Modified: svn:mergeinfo
   - /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810
   + /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -73,13 +73,17 @@
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-anonymous-client.jar">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-anonymous-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestService.class"/>
         <include name="org/jboss/test/ws/jaxrpc/anonymous/ComplexTypeRoot.class"/>
         <include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeRoot.class"/>
         <include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeInside.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/anonymous/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -89,6 +93,11 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-anonymous-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-anonymous-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-benchmark -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-rpclit.war" webxml="${tests.output.dir}/test-resources/benchmark/jaxrpc/rpclit/WEB-INF/web.xml">
@@ -120,14 +129,18 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-rpclit-client.jar">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-rpclit-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_*.class"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*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/benchmark/jaxrpc/rpclit/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -135,6 +148,11 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-rpclit-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-benchmark-rpclit-appclient.jar"/>
+      </fileset>
+    </jar>
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-doclit.war" webxml="${tests.output.dir}/test-resources/benchmark/jaxrpc/doclit/WEB-INF/web.xml">
       <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/>
@@ -164,14 +182,18 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-doclit-client.jar">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-doclit-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_arr*/**"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*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/benchmark/jaxrpc/doclit/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -179,6 +201,11 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-doclit-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-benchmark-doclit-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-encoded-href.war -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-encoded-href.war" webxml="${tests.output.dir}/test-resources/jaxrpc/encoded/href/WEB-INF/web.xml">
@@ -193,11 +220,15 @@
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-encoded-href-client.jar">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-encoded-href-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/encoded/href/MarshallTest.class"/>
         <include name="org/jboss/test/ws/jaxrpc/encoded/href/HRefHandler.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/encoded/href/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
@@ -207,6 +238,11 @@
         <include name="jboss-client.xml"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-encoded-href-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-encoded-href-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-encoded-marshalltest.war -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-encoded-marshalltest.war" webxml="${tests.output.dir}/test-resources/jaxrpc/encoded/marshalltest/WEB-INF/web.xml">
@@ -220,12 +256,16 @@
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-encoded-marshalltest-client.jar">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-encoded-marshalltest-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestImpl.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.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/encoded/marshalltest/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
@@ -235,6 +275,11 @@
         <include name="jboss-client.xml"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-encoded-marshalltest-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-encoded-marshalltest-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-encoded-parametermode.war -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-encoded-parametermode.war"
@@ -250,13 +295,17 @@
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-encoded-parametermode-client.jar">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-encoded-parametermode-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/holders/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestImpl.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.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/encoded/parametermode/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
@@ -266,6 +315,11 @@
         <include name="jboss-client.xml"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-encoded-parametermode-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-encoded-parametermode-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-enventry.war -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-enventry.war" webxml="${tests.output.dir}/test-resources/jaxrpc/enventry/WEB-INF/web.xml">
@@ -684,10 +738,14 @@
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws124-client.jar">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws124-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws124/Hello.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/jbws124/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -697,6 +755,11 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws124-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-jbws124-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-jbws128 -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws128-service.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws128/WEB-INF-service/web.xml">
@@ -740,10 +803,14 @@
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws153-client.jar">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws153-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws153/Order.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/jbws153/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -753,6 +820,11 @@
         <include name="jaxrpc-deployment.xml"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws153-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-jbws153-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-jbws163 -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws163.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws163/WEB-INF/web.xml">
@@ -766,10 +838,14 @@
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws163-client.jar">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws163-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws163/Hello.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/jbws163/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -779,6 +855,11 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws163-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-jbws163-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-jbws165 -->
     <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws165-none.jar">
@@ -877,13 +958,17 @@
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws168-client.jar">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws168-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws168/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws168/UserType.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws168/*RequestStruct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws168/*ResponseStruct.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/jbws168/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -894,6 +979,11 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws168-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-jbws168-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-jbws217 -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws217.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws217/WEB-INF/web.xml">
@@ -1757,18 +1847,26 @@
     </jar>
     
     <!-- jaxrpc-jbws637 -->
-    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws637-client.jar">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws637-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws637/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws637/*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/jbws637/META-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="application-client.xml"/>
-        <include name="jboss-client.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws637-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-jbws637-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-jbws643 -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws643.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws643/WEB-INF/web.xml">
@@ -2953,11 +3051,15 @@
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1316-client.jar">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1316-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1316/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws1316/*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/jbws1316/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -2967,6 +3069,11 @@
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1316-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-jbws1316-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-jbws1378 -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1378.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1378/WEB-INF/web.xml">
@@ -3046,11 +3153,15 @@
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1619-client.jar">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1619-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
-        <include name="org/jboss/test/ws/jbws1619/TestEndpoint.class"/>
-        <include name="org/jboss/test/ws/jbws1619/ClientHandler.class"/>
+        <include name="org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.class"/>
+        <include name="org/jboss/test/ws/jaxrpc/jbws1619/ClientHandler.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/jbws1619/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -3060,6 +3171,11 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1619-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-jbws1619-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jbossws-jbws1647 -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1647-rpclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml">
@@ -3109,10 +3225,14 @@
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1653-client.jar">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1653-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
-        <include name="org/jboss/test/ws/jbws1653/TestEndpoint.class"/>
+        <include name="org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.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/jbws1653/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -3122,6 +3242,11 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1653-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-jbws1653-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-jbws1792 -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1792.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1792/WEB-INF/web.xml">
@@ -3137,10 +3262,14 @@
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1792-client.jar">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1792-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
-        <include name="org/jboss/test/ws/jbws1792/TestEndpoint.class"/>
+        <include name="org/jboss/test/ws/jaxrpc/jbws1792/TestEndpoint.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/jbws1792/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -3150,6 +3279,11 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1792-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-jbws1792-appclient.jar"/>
+      </fileset>
+    </jar>
     
 	<!-- jaxrpc-jbws1862 -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1862.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1862/WEB-INF/web.xml">
@@ -3217,11 +3351,15 @@
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-marshall-doclit-client.jar">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-marshall-doclit-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/>
         <include name="org/jboss/test/ws/jaxrpc/marshall/types/**"/>
+        <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/marshall-doclit/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -3230,6 +3368,11 @@
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-marshall-doclit-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-marshall-doclit-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-marshall-rpclit.war -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-marshall-rpclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml">
@@ -3245,12 +3388,16 @@
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-marshall-rpclit-client.jar">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-marshall-rpclit-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/>
         <include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean2.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/marshall-rpclit/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -3259,6 +3406,11 @@
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-marshall-rpclit-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-marshall-rpclit-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-outparam.war -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-outparam.war" webxml="${tests.output.dir}/test-resources/jaxrpc/outparam/WEB-INF/web.xml">
@@ -3286,11 +3438,15 @@
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-overloaded-client.jar">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-overloaded-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/overloaded/Overloaded.class"/>
         <include name="org/jboss/test/ws/jaxrpc/overloaded/OverloadedBean.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/overloaded/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -3300,6 +3456,11 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-overloaded-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-overloaded-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-utf16 -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-utf16.war" webxml="${tests.output.dir}/test-resources/jaxrpc/utf16/WEB-INF/web.xml">
@@ -3313,10 +3474,14 @@
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-utf16-client.jar">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-utf16-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/utf16/Hello.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/utf16/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -3326,6 +3491,11 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-utf16-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-utf16-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-wsdlpublish -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsdlpublish.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsdlpublish/WEB-INF/web.xml">
@@ -3333,6 +3503,9 @@
         <include name="org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.class"/>
       </classes>
+      <manifest>
+          <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
+      </manifest>
       <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsdlpublish/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
@@ -3680,18 +3853,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 +3881,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 +3894,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 +3905,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 +3924,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 +3937,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 +3965,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 +3978,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 +3989,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 +4008,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/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -39,27 +39,34 @@
 public class BenchmarkDocEJBTestCase extends JBossWSTest
 {
    private static BenchmarkService endpoint;
+   private static InitialContext iniCtx;
 
    public static Test suite()
    {
-      return new JBossWSTestSetup(BenchmarkDocEJBTestCase.class, "jaxrpc-benchmark-doclit.jar, jaxrpc-benchmark-doclit-client.jar");
+      return new JBossWSTestSetup(BenchmarkDocEJBTestCase.class, "jaxrpc-benchmark-doclit.jar, jaxrpc-benchmark-doclit-appclient.ear#jaxrpc-benchmark-doclit-appclient.jar");
    }
 
    protected void setUp() throws Exception
    {
       super.setUp();
-
       if (endpoint == null)
       {
-         InitialContext iniCtx = getInitialContext("benchmark-client");
-         Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkEJB");
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/BenchmarkEJB");
          endpoint = (BenchmarkService)service.getPort(BenchmarkService.class);
 
          ((Stub)endpoint)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-benchmark-doc-ejb");
       }
-
-
    }
+   
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+         iniCtx = null;
+      }
+   }
 
    public void testEchoSimpleType() throws Exception
    {

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -41,10 +41,11 @@
 public class BenchmarkDocJSETestCase extends JBossWSTest
 {
     private static BenchmarkService endpoint;
+    private static InitialContext iniCtx;
 
     public static Test suite()
     {
-        return new JBossWSTestSetup(BenchmarkDocJSETestCase.class, "jaxrpc-benchmark-doclit.war, jaxrpc-benchmark-doclit-client.jar");
+        return new JBossWSTestSetup(BenchmarkDocJSETestCase.class, "jaxrpc-benchmark-doclit.war, jaxrpc-benchmark-doclit-appclient.ear#jaxrpc-benchmark-doclit-appclient.jar");
     }
 
     protected void setUp() throws Exception
@@ -55,8 +56,8 @@
        {
           if (endpoint == null)
           {
-              InitialContext iniCtx = getInitialContext("benchmark-client");
-              Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkJSE");
+              iniCtx = getAppclientInitialContext();
+              Service service = (Service)iniCtx.lookup("java:service/BenchmarkJSE");
               endpoint = (BenchmarkService)service.getPort(BenchmarkService.class);
 
              ((Stub)endpoint)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-benchmark-doc/jse");
@@ -72,6 +73,15 @@
        }
     }
 
+    protected void tearDown() throws Exception
+    {
+       if (iniCtx != null)
+       {
+          iniCtx.close();
+          iniCtx = null;
+       }
+    }
+
     public void testEchoSimpleType() throws Exception
     {
         SimpleUserType userType = new SimpleUserType(1, 1.0f, "test");

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -39,10 +39,11 @@
 public class BenchmarkRpcEJBTestCase extends JBossWSTest
 {
    private static BenchmarkService endpoint;
+   private static InitialContext iniCtx;
 
    public static Test suite()
    {
-      return new JBossWSTestSetup(BenchmarkRpcEJBTestCase.class, "jaxrpc-benchmark-rpclit.jar, jaxrpc-benchmark-rpclit-client.jar");
+      return new JBossWSTestSetup(BenchmarkRpcEJBTestCase.class, "jaxrpc-benchmark-rpclit.jar, jaxrpc-benchmark-rpclit-appclient.ear#jaxrpc-benchmark-rpclit-appclient.jar");
    }
 
    protected void setUp() throws Exception
@@ -51,14 +52,23 @@
 
       if (endpoint == null)
       {
-         InitialContext iniCtx = getInitialContext("benchmark-client");
-         Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkEJB");
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/BenchmarkEJB");
          endpoint = (BenchmarkService)service.getPort(BenchmarkService.class);
 
          ((Stub)endpoint)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-benchmark-rpc-ejb");
       }
    }
 
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+         iniCtx = null;
+      }
+   }
+
    public void testEchoSimpleType() throws Exception
    {
       SimpleUserType userType = new SimpleUserType(1, 1.0f, "test");

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -39,10 +39,11 @@
 public class BenchmarkRpcJSETestCase extends JBossWSTest
 {
    private static BenchmarkService endpoint;
+   private static InitialContext iniCtx;
 
    public static Test suite()
    {
-      return new JBossWSTestSetup(BenchmarkRpcJSETestCase.class, "jaxrpc-benchmark-rpclit.war, jaxrpc-benchmark-rpclit-client.jar");
+      return new JBossWSTestSetup(BenchmarkRpcJSETestCase.class, "jaxrpc-benchmark-rpclit.war, jaxrpc-benchmark-rpclit-appclient.ear#jaxrpc-benchmark-rpclit-appclient.jar");
    }
 
    protected void setUp() throws Exception
@@ -51,14 +52,23 @@
 
       if (endpoint == null)
       {
-         InitialContext iniCtx = getInitialContext("benchmark-client");
-         Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkJSE");
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/BenchmarkJSE");
          endpoint = (BenchmarkService)service.getPort(BenchmarkService.class);
 
          ((Stub)endpoint)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-benchmark-rpc");
       }
    }
 
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+         iniCtx = null;
+      }
+   }
+
    public void testEchoSimpleType() throws Exception
    {
       SimpleUserType userType = new SimpleUserType(1, 1.0f, "test");

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -38,10 +38,11 @@
 public class AnonymousTypesTestCase extends JBossWSTest
 {
    private static AnonymousTypesTestService endpoint;
+   private static InitialContext iniCtx;
 
    public static Test suite()
    {
-      return new JBossWSTestSetup(AnonymousTypesTestCase.class, "jaxrpc-anonymous.war, jaxrpc-anonymous-client.jar");
+      return new JBossWSTestSetup(AnonymousTypesTestCase.class, "jaxrpc-anonymous.war, jaxrpc-anonymous-appclient.ear#jaxrpc-anonymous-appclient.jar");
    }
 
    protected void setUp() throws Exception
@@ -50,12 +51,21 @@
 
       if (endpoint == null)
       {
-         InitialContext iniCtx = getInitialContext();
-         Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/TestService");
          endpoint = (AnonymousTypesTestService)service.getPort(AnonymousTypesTestService.class);
       }
    }
 
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+         iniCtx = null;
+      }
+   }
+
    public void testElementTypeRoot() throws Exception
    {
       ElementTypeInside ins1 = new ElementTypeInside("ins1");

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -38,10 +38,11 @@
 public class MarshallTestCase extends JBossWSTest
 {
    private static MarshallTest port;
+   private static InitialContext iniCtx;
 
    public static Test suite()
    {
-      return new JBossWSTestSetup(MarshallTestCase.class, "jaxrpc-encoded-href.war, jaxrpc-encoded-href-client.jar");
+      return new JBossWSTestSetup(MarshallTestCase.class, "jaxrpc-encoded-href.war, jaxrpc-encoded-href-appclient.ear#jaxrpc-encoded-href-appclient.jar");
    }
 
    protected void setUp() throws Exception
@@ -49,12 +50,21 @@
       super.setUp();
       if (port == null)
       {
-         InitialContext iniCtx = getInitialContext();
-         Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/TestService");
          port = (MarshallTest)service.getPort(MarshallTest.class);
       }
    }
 
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+         iniCtx = null;
+      }
+   }
+
    public void testByteArrayTest() throws Exception
    {
       byte[] retObj = port.base64BinaryTest("Hello World!".getBytes());

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -44,10 +44,11 @@
 public class MarshallTestCase extends JBossWSTest
 {
    private static MarshallTest port;
+   private static InitialContext iniCtx;
 
    public static Test suite()
    {
-      return new JBossWSTestSetup(MarshallTestCase.class, "jaxrpc-encoded-marshalltest.war, jaxrpc-encoded-marshalltest-client.jar");
+      return new JBossWSTestSetup(MarshallTestCase.class, "jaxrpc-encoded-marshalltest.war, jaxrpc-encoded-marshalltest-appclient.ear#jaxrpc-encoded-marshalltest-appclient.jar");
    }
 
    protected void setUp() throws Exception
@@ -55,12 +56,21 @@
       super.setUp();
       if (port == null)
       {
-         InitialContext iniCtx = getInitialContext();
-         Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/TestService");
          port = (MarshallTest)service.getPort(MarshallTest.class);
       }
    }
 
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+         iniCtx = null;
+      }
+   }
+
    public void testBigDecimalArrayTest() throws Exception
    {
       BigDecimal[] inObj = new BigDecimal[] { new BigDecimal("100"), new BigDecimal("200"), new BigDecimal("300") };

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -121,6 +121,7 @@
    private static EnumFloat _varEnumFloat = EnumFloat.value1;
    private static EnumDouble _varEnumDouble = EnumDouble.value1;
    private static EnumByte _varEnumByte = EnumByte.value1;
+   private static InitialContext iniCtx;
 
    static
    {
@@ -129,7 +130,7 @@
 
    public static Test suite()
    {
-      return new JBossWSTestSetup(ParameterModeTestCase.class, "jaxrpc-encoded-parametermode.war, jaxrpc-encoded-parametermode-client.jar");
+      return new JBossWSTestSetup(ParameterModeTestCase.class, "jaxrpc-encoded-parametermode.war, jaxrpc-encoded-parametermode-appclient.ear#jaxrpc-encoded-parametermode-appclient.jar");
    }
 
    protected void setUp() throws Exception
@@ -137,12 +138,21 @@
       super.setUp();
       if (port == null)
       {
-         InitialContext iniCtx = getInitialContext();
-         Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/TestService");
          port = (ParameterModeTest)service.getPort(ParameterModeTest.class);
       }
    }
 
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+         iniCtx = null;
+      }
+   }
+
    public void testEchoIn() throws Exception
    {
       port.echoIn("Kermit");

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -42,7 +42,7 @@
    /** Deploy the test */
    public static Test suite() throws Exception
    {
-      return new JBossWSTestSetup(JBWS124TestCase.class, "jaxrpc-jbws124.war, jaxrpc-jbws124-client.jar");
+      return new JBossWSTestSetup(JBWS124TestCase.class, "jaxrpc-jbws124.war, jaxrpc-jbws124-appclient.ear#jaxrpc-jbws124-appclient.jar");
    }
 
    /**
@@ -50,12 +50,23 @@
     */
    public void testEndpoint() throws Exception
    {
-      InitialContext iniCtx = getInitialContext();
-      Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
-      Hello hello = (Hello)service.getPort(Hello.class);
+      InitialContext iniCtx = null;
+      try
+      {
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/HelloService");
+         Hello hello = (Hello)service.getPort(Hello.class);
 
-      String in0 = "Kermit";
-      String retObj = hello.hello(in0);
-      assertEquals(in0, retObj);
+         String in0 = "Kermit";
+         String retObj = hello.hello(in0);
+         assertEquals(in0, retObj);
+      }
+      finally
+      {
+         if (iniCtx != null)
+         {
+            iniCtx.close();
+         }
+      }
    }
 }

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -44,10 +44,11 @@
    private static final String MESSAGE = "Hello JBWS1316!!";
 
    private static TestEndpoint port;
+   private static InitialContext iniCtx;
 
    public static Test suite()
    {
-      return new JBossWSTestSetup(JBWS1316CallTestCase.class, "jaxrpc-jbws1316.war, jaxrpc-jbws1316-client.jar");
+      return new JBossWSTestSetup(JBWS1316CallTestCase.class, "jaxrpc-jbws1316.war, jaxrpc-jbws1316-appclient.ear#jaxrpc-jbws1316-appclient.jar");
    }
 
    protected void setUp() throws Exception
@@ -55,12 +56,21 @@
       super.setUp();
       if (port == null)
       {
-         InitialContext iniCtx = getInitialContext();
-         Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/TestService");
          port = (TestEndpoint)service.getPort(TestEndpoint.class);
       }
    }
 
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+         iniCtx = null;
+      }
+   }
+
    /**
     * Test that a message without a wsse:Security header is rejected.
     * 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -41,7 +41,7 @@
    /** Deploy the test */
    public static Test suite() throws Exception
    {
-      return new JBossWSTestSetup(JBWS153TestCase.class, "jaxrpc-jbws153.war, jaxrpc-jbws153-client.jar");
+      return new JBossWSTestSetup(JBWS153TestCase.class, "jaxrpc-jbws153.war, jaxrpc-jbws153-appclient.ear#jaxrpc-jbws153-appclient.jar");
    }
 
    /**
@@ -49,12 +49,23 @@
     */
    public void testEndpoint() throws Exception
    {
-      InitialContext iniContext = getInitialContext();
-      Service service = (Service)iniContext.lookup("java:comp/env/service/OrderService");
-      Order port = (Order)service.getPort(Order.class);
+      InitialContext iniCtx = null;
+      try
+      {
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/OrderService");
+         Order port = (Order)service.getPort(Order.class);
 
-      String getMessage = "Ferrari";
-      String retStr = port.getOrder(getMessage);
-      assertEquals(getMessage, retStr);
+         String getMessage = "Ferrari";
+         String retStr = port.getOrder(getMessage);
+         assertEquals(getMessage, retStr);
+      }
+      finally
+      {
+         if (iniCtx != null)
+         {
+            iniCtx.close();
+         }
+      }
    }
 }

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -41,10 +41,11 @@
 {
 
    private static TestEndpoint port;
+   private static InitialContext iniCtx;
 
    public static Test suite() throws Exception
    {
-      return new JBossWSTestSetup(JBWS1619TestCase.class, "jaxrpc-jbws1619.war, jaxrpc-jbws1619-client.jar");
+      return new JBossWSTestSetup(JBWS1619TestCase.class, "jaxrpc-jbws1619.war, jaxrpc-jbws1619-appclient.ear#jaxrpc-jbws1619-appclient.jar");
    }
 
    public void setUp() throws Exception
@@ -52,12 +53,21 @@
       super.setUp();
       if (port == null)
       {
-         InitialContext iniCtx = getInitialContext();
-         Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/TestService");
          port = (TestEndpoint)service.getPort(TestEndpoint.class);
       }
    }
 
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+         iniCtx = null;
+      }
+   }
+
    public void testServletEndpointContext() throws Exception
    {
       ClientHandler.message = "Use ServletEndpointContext";

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -45,11 +45,12 @@
 public class JBWS163TestCase extends JBossWSTest
 {
    private static Hello hello;
+   private static InitialContext iniCtx;
 
    /** Deploy the test */
    public static Test suite() throws Exception
    {
-      return new JBossWSTestSetup(JBWS163TestCase.class, "jaxrpc-jbws163.war, jaxrpc-jbws163-client.jar");
+      return new JBossWSTestSetup(JBWS163TestCase.class, "jaxrpc-jbws163.war, jaxrpc-jbws163-appclient.ear#jaxrpc-jbws163-appclient.jar");
    }
 
    protected void setUp() throws Exception
@@ -58,11 +59,20 @@
 
       if (hello == null)
       {
-         InitialContext iniCtx = getInitialContext();
-         Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/HelloService");
          hello = (Hello)service.getPort(Hello.class);
       }
    }
+   
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+         iniCtx = null;
+      }
+   }
 
    public void testNonPositiveInteger() throws Exception
    {

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -21,23 +21,17 @@
  */
 package org.jboss.test.ws.jaxrpc.jbws165;
 
-import java.io.File;
 import java.net.URL;
 
-import javax.naming.InitialContext;
 import javax.xml.namespace.QName;
 import javax.xml.rpc.Service;
-import javax.xml.rpc.Stub;
 
 import junit.framework.Test;
 
 import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
-import org.jboss.ws.core.jaxrpc.client.ServiceImpl;
 import org.jboss.wsf.test.JBossWSTest;
 import org.jboss.wsf.test.JBossWSTestSetup;
 
-
-
 /**
  * Tests <context-root> and <port-component-root> elements in EJB endpoints
  *

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -47,7 +47,7 @@
    
    public static Test suite() throws Exception
    {
-      return new JBossWSTestSetup(JBWS1653TestCase.class, "jaxrpc-jbws1653.war, jaxrpc-jbws1653-client.jar");
+      return new JBossWSTestSetup(JBWS1653TestCase.class, "jaxrpc-jbws1653.war, jaxrpc-jbws1653-appclient.ear#jaxrpc-jbws1653-appclient.jar");
    }
 
    public void setUp() throws Exception
@@ -57,13 +57,24 @@
 
    public void testStandardConfig() throws Exception
    {
-      InitialContext iniCtx = getInitialContext();
-      Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
-      TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
+      InitialContext iniCtx = null;
+      try
+      {
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/TestService");
+         TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
 
-      String retStr = port.echoString("kermit");
-      assertEquals("kermit", retStr);
-      assertNull(ClientHandler.message);
+         String retStr = port.echoString("kermit");
+         assertEquals("kermit", retStr);
+         assertNull(ClientHandler.message);
+      }
+      finally
+      {
+         if (iniCtx != null)
+         {
+            iniCtx.close();
+         }
+      }
    }
 
    public void testStandardConfigConfiguredDII() throws Exception
@@ -140,13 +151,24 @@
          URL configURL = urlLoader.findResource("META-INF/standard-jaxrpc-client-config.xml");
          assertTrue("Invalid config url: " + configURL, configURL.toExternalForm().indexOf("jbws1653") > 0);
 
-         InitialContext iniCtx = getInitialContext();
-         Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
-         TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
+         InitialContext iniCtx = null;
+         try
+         {
+            iniCtx = getAppclientInitialContext();
+            Service service = (Service)iniCtx.lookup("java:service/TestService");
+            TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
 
-         String retStr = port.echoString("kermit");
-         assertEquals("kermit", retStr);
-         assertEquals("kermit", ClientHandler.message);
+            String retStr = port.echoString("kermit");
+            assertEquals("kermit", retStr);
+            assertEquals("kermit", ClientHandler.message);
+         }
+         finally
+         {
+            if (iniCtx != null)
+            {
+               iniCtx.close();
+            }
+         }
       }
       finally
       {

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -42,18 +42,29 @@
    /** Deploy the test */
    public static Test suite() throws Exception
    {
-      return new JBossWSTestSetup(JBWS168TestCase.class, "jaxrpc-jbws168.war, jaxrpc-jbws168-client.jar");
+      return new JBossWSTestSetup(JBWS168TestCase.class, "jaxrpc-jbws168.war, jaxrpc-jbws168-appclient.ear#jaxrpc-jbws168-appclient.jar");
    }
 
    public void testEmptyProperty() throws Exception
    {
 
-      InitialContext iniCtx = getInitialContext();
-      Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
-      Hello hello = (Hello)service.getPort(Hello.class);
+      InitialContext iniCtx = null;
+      try
+      {
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/HelloService");
+         Hello hello = (Hello)service.getPort(Hello.class);
 
-      UserType ut = new UserType("A", null, null);
-      UserType retObj = hello.hello(ut);
-      assertEquals(ut, retObj);
+         UserType ut = new UserType("A", null, null);
+         UserType retObj = hello.hello(ut);
+         assertEquals(ut, retObj);
+      }
+      finally
+      {
+         if (iniCtx != null)
+         {
+            iniCtx.close();
+         }
+      }
    }
 }

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1792/JBWS1792TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1792/JBWS1792TestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1792/JBWS1792TestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -40,10 +40,11 @@
 public class JBWS1792TestCase extends JBossWSTest
 {
    private static TestEndpoint port;
+   private static InitialContext iniCtx;
 
    public static Test suite() throws Exception
    {
-      return new JBossWSTestSetup(JBWS1792TestCase.class, "jaxrpc-jbws1792.war, jaxrpc-jbws1792-client.jar");
+      return new JBossWSTestSetup(JBWS1792TestCase.class, "jaxrpc-jbws1792.war, jaxrpc-jbws1792-appclient.ear#jaxrpc-jbws1792-appclient.jar");
    }
 
    public void setUp() throws Exception
@@ -51,12 +52,21 @@
       super.setUp();
       if (port == null)
       {
-         InitialContext iniCtx = getInitialContext();
-         Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/TestService");
          port = (TestEndpoint)service.getPort(TestEndpoint.class);
       }
    }
 
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+         iniCtx = null;
+      }
+   }
+
    public void testCall() throws Exception
    {
       final String message = "Hello!!";

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -41,11 +41,12 @@
 public class JBWS637TestCase extends JBossWSTest
 {
    private static CheckSoap port;
-   
+   private static InitialContext iniCtx;
+
    /** Deploy the test */
    public static Test suite() throws Exception
    {
-      return new JBossWSTestSetup(JBWS637TestCase.class, "jaxrpc-jbws637-client.jar");
+      return new JBossWSTestSetup(JBWS637TestCase.class, "jaxrpc-jbws637-appclient.ear#jaxrpc-jbws637-appclient.jar");
    }
 
    protected void setUp() throws Exception
@@ -53,12 +54,21 @@
       super.setUp();
       if (port == null)
       {
-         InitialContext iniCtx = getInitialContext();
-         Check service = (Check)iniCtx.lookup("java:comp/env/service/Check");
+         iniCtx = getAppclientInitialContext();
+         Check service = (Check)iniCtx.lookup("java:service/Check");
          port = service.getCheckSoap();
       }
    }
 
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+         iniCtx = null;
+      }
+   }
+
    public void testCreateService() throws Exception
    {
       assertNotNull("port not null", port);

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -43,11 +43,12 @@
 {
    // The static endpoint cache
    private static StandardTypes port;
+   private static InitialContext iniCtx;
 
    /** Deploy the test ear */
    public static Test suite() throws Exception
    {
-      return new JBossWSTestSetup(MarshallDocLitTestCase.class, "jaxrpc-marshall-doclit.war, jaxrpc-marshall-doclit-client.jar");
+      return new JBossWSTestSetup(MarshallDocLitTestCase.class, "jaxrpc-marshall-doclit.war, jaxrpc-marshall-doclit-appclient.ear#jaxrpc-marshall-doclit-appclient.jar");
    }
 
    protected void setUp() throws Exception
@@ -56,12 +57,21 @@
 
       if (port == null)
       {
-         InitialContext iniCtx = getInitialContext();
-         Service service = (Service)iniCtx.lookup("java:comp/env/service/StandardTypes");
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/StandardTypes");
          port = (StandardTypes)service.getPort(StandardTypes.class);         
       }
    }
 
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+         iniCtx = null;
+      }
+   }
+
    public BigDecimal bigDecimalTest(BigDecimal param) throws Exception
    {
       return port.bigDecimalTest(param);

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -44,11 +44,12 @@
 {
    // The static endpoint cache
    private static StandardTypes port;
+   private static InitialContext iniCtx;
 
    /** Deploy the test ear */
    public static Test suite() throws Exception
    {
-      return new JBossWSTestSetup(MarshallRpcLitTestCase.class, "jaxrpc-marshall-rpclit.war, jaxrpc-marshall-rpclit-client.jar");
+      return new JBossWSTestSetup(MarshallRpcLitTestCase.class, "jaxrpc-marshall-rpclit.war, jaxrpc-marshall-rpclit-appclient.ear#jaxrpc-marshall-rpclit-appclient.jar");
    }
 
    protected void setUp() throws Exception
@@ -57,12 +58,21 @@
 
       if (port == null)
       {
-         InitialContext iniCtx = getInitialContext();
-         Service service = (Service)iniCtx.lookup("java:comp/env/service/StandardTypes");
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/StandardTypes");
          port = (StandardTypes)service.getPort(StandardTypes.class);
       }
    }
 
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+         iniCtx = null;
+      }
+   }
+
    public BigDecimal bigDecimalTest(BigDecimal param) throws Exception
    {
       return port.bigDecimalTest(param);

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -37,10 +37,11 @@
 public class OverloadedTestCase extends JBossWSTest
 {
    private static Overloaded endpoint;
+   private static InitialContext iniCtx;
 
    public static Test suite()
    {
-      return new JBossWSTestSetup(OverloadedTestCase.class, "jaxrpc-overloaded.war, jaxrpc-overloaded-client.jar");
+      return new JBossWSTestSetup(OverloadedTestCase.class, "jaxrpc-overloaded.war, jaxrpc-overloaded-appclient.ear#jaxrpc-overloaded-appclient.jar");
    }
 
    protected void setUp() throws Exception
@@ -49,12 +50,21 @@
 
       if (endpoint == null)
       {
-         InitialContext iniCtx = getInitialContext();
-         Service service = (Service)iniCtx.lookup("java:comp/env/service/OverloadedTestService");
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/OverloadedTestService");
          endpoint = (Overloaded)service.getPort(Overloaded.class);
       }
    }
 
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+         iniCtx = null;
+      }
+   }
+
    public void testEcho1() throws Exception
    {
       String hello = "Hello";

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -67,7 +67,7 @@
    /** Deploy the test */
    public static Test suite() throws Exception
    {
-      return new JBossWSTestSetup(UTF16TestCase.class, "jaxrpc-utf16.war, jaxrpc-utf16-client.jar");
+      return new JBossWSTestSetup(UTF16TestCase.class, "jaxrpc-utf16.war, jaxrpc-utf16-appclient.ear#jaxrpc-utf16-appclient.jar");
    }
 
    public void setUp() throws Exception 
@@ -79,12 +79,23 @@
    
    public void testClientAccess() throws Exception
    {
-      InitialContext iniCtx = getInitialContext();
-      Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
-      Hello endpoint = (Hello)service.getPort(Hello.class);
-      
-      String retObj = endpoint.hello("Kermit");
-      assertEquals("Kermit", retObj);
+      InitialContext iniCtx = null;
+      try
+      {
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/TestService");
+         Hello endpoint = (Hello)service.getPort(Hello.class);
+         
+         String retObj = endpoint.hello("Kermit");
+         assertEquals("Kermit", retObj);
+      }
+      finally
+      {
+         if (iniCtx != null)
+         {
+            iniCtx.close();
+         }
+      }
    }
    
    /** Test SAAJ access without MIME headers, using the default encoding

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -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/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -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/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -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/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java	2012-03-01 22:15:11 UTC (rev 15819)
@@ -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/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -8,7 +8,7 @@
   <display-name>Benchmark test</display-name>
 
   <service-ref>
-    <service-ref-name>service/BenchmarkJSE</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/BenchmarkJSE</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>
@@ -17,7 +17,7 @@
     </port-component-ref>
   </service-ref>
   <service-ref>
-    <service-ref-name>service/BenchmarkEJB</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/BenchmarkEJB</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/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -3,14 +3,13 @@
 <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
 
 <jboss-client>
-  <jndi-name>benchmark-client</jndi-name>
 
   <service-ref>
-    <service-ref-name>service/BenchmarkJSE</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/BenchmarkJSE</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-benchmark-doc/jse?wsdl</wsdl-override>
   </service-ref>
   <service-ref>
-    <service-ref-name>service/BenchmarkEJB</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/BenchmarkEJB</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-benchmark-doc-ejb?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -8,7 +8,7 @@
   <display-name>Benchmark test</display-name>
 
   <service-ref>
-    <service-ref-name>service/BenchmarkJSE</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/BenchmarkJSE</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>
@@ -17,7 +17,7 @@
     </port-component-ref>
   </service-ref>
   <service-ref>
-    <service-ref-name>service/BenchmarkEJB</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/BenchmarkEJB</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/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -3,14 +3,13 @@
 <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
 
 <jboss-client>
-  <jndi-name>benchmark-client</jndi-name>
 
   <service-ref>
-    <service-ref-name>service/BenchmarkJSE</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/BenchmarkJSE</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-benchmark-rpc?wsdl</wsdl-override>
   </service-ref>
   <service-ref>
-    <service-ref-name>service/BenchmarkEJB</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/BenchmarkEJB</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-benchmark-rpc-ejb?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/anonymous/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/anonymous/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/anonymous/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -8,7 +8,7 @@
   <display-name>JAXRPC simple tests</display-name>
 
   <service-ref>
-    <service-ref-name>service/TestService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/TestService</service-ref-name>
     <service-interface>javax.xml.rpc.Service</service-interface>
     <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/anonymous/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/anonymous/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/anonymous/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -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/TestService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/TestService</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-anonymous?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/href/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/href/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/href/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -8,7 +8,7 @@
   <display-name>JAXRPC simple tests</display-name>
 
   <service-ref>
-    <service-ref-name>service/TestService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/TestService</service-ref-name>
     <service-interface>javax.xml.rpc.Service</service-interface>
     <wsdl-file>META-INF/wsdl/MarshallTestService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/href/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/href/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/href/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -3,10 +3,9 @@
 <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "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/TestService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/TestService</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-encoded-href/MarshallTest?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -8,7 +8,7 @@
   <display-name>JAXRPC simple tests</display-name>
 
   <service-ref>
-    <service-ref-name>service/TestService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/TestService</service-ref-name>
     <service-interface>javax.xml.rpc.Service</service-interface>
     <wsdl-file>META-INF/wsdl/MarshallTestService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -3,10 +3,9 @@
 <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "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/TestService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/TestService</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-encoded-marshalltest/MarshallTest?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/parametermode/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/parametermode/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/parametermode/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -8,7 +8,7 @@
   <display-name>JAXRPC simple tests</display-name>
 
   <service-ref>
-    <service-ref-name>service/TestService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/TestService</service-ref-name>
     <service-interface>javax.xml.rpc.Service</service-interface>
     <wsdl-file>META-INF/wsdl/ParameterModeTest.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/parametermode/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/parametermode/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/parametermode/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -3,10 +3,9 @@
 <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "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/TestService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/TestService</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-encoded-parametermode/ParameterModeTest?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws124/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws124/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws124/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -8,7 +8,7 @@
   <display-name>HelloService</display-name>
 
   <service-ref>
-    <service-ref-name>service/HelloService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name>
     <service-interface>javax.xml.rpc.Service</service-interface>
     <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws124/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws124/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws124/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -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/HelloService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws124?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1316/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1316/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1316/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -8,7 +8,7 @@
   <display-name>HelloService</display-name>
 
   <service-ref>
-    <service-ref-name>service/TestService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/TestService</service-ref-name>
     <service-interface>javax.xml.rpc.Service</service-interface>
     <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
@@ -18,7 +18,7 @@
     <handler>
       <handler-name>ClientHandler</handler-name>
       <handler-class>org.jboss.test.ws.jaxrpc.jbws1316.TestSecurityHandler</handler-class>
-    </handler>    
+    </handler>
   </service-ref>
 
 </application-client>

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1316/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1316/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1316/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -3,10 +3,9 @@
 <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "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/TestService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/TestService</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1316?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws153/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws153/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws153/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -8,7 +8,7 @@
   <display-name>OrderService</display-name>
 
   <service-ref>
-    <service-ref-name>service/OrderService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/OrderService</service-ref-name>
     <service-interface>javax.xml.rpc.Service</service-interface>
     <wsdl-file>META-INF/wsdl/OrderSOAP.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws153/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws153/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws153/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -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/OrderService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/OrderService</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws153/Order?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1619/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1619/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1619/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -8,7 +8,7 @@
   <display-name>TestService</display-name>
 
   <service-ref>
-    <service-ref-name>service/TestService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/TestService</service-ref-name>
     <service-interface>javax.xml.rpc.Service</service-interface>
     <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1619/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1619/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1619/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -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/TestService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/TestService</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1619/TestEndpoint?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws163/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws163/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws163/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -8,7 +8,7 @@
   <display-name>HelloService</display-name>
 
   <service-ref>
-    <service-ref-name>service/HelloService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name>
     <service-interface>javax.xml.rpc.Service</service-interface>
     <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws163/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws163/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws163/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -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/HelloService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws163?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1653/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1653/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1653/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -8,7 +8,7 @@
   <display-name>TestService</display-name>
 
   <service-ref>
-    <service-ref-name>service/TestService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/TestService</service-ref-name>
     <service-interface>javax.xml.rpc.Service</service-interface>
     <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1653/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1653/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1653/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -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/TestService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/TestService</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1653/TestEndpoint?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws168/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws168/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws168/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -8,7 +8,7 @@
   <display-name>HelloService</display-name>
 
   <service-ref>
-    <service-ref-name>service/HelloService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name>
     <service-interface>javax.xml.rpc.Service</service-interface>
     <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws168/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws168/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws168/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -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/HelloService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws168?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1792/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1792/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1792/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -8,7 +8,7 @@
   <display-name>TestService</display-name>
 
   <service-ref>
-    <service-ref-name>service/TestService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/TestService</service-ref-name>
     <service-interface>javax.xml.rpc.Service</service-interface>
     <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1792/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1792/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1792/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -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/TestService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/TestService</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1792/TestEndpoint?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws637/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws637/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws637/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -8,7 +8,7 @@
   <display-name>TestService</display-name>
 
   <service-ref>
-    <service-ref-name>service/Check</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/Check</service-ref-name>
     <service-interface>org.jboss.test.ws.jaxrpc.jbws637.Check</service-interface>
     <wsdl-file>META-INF/wsdl/checkasmx.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>

Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws637/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws637/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws637/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-client PUBLIC
-   "-//JBoss//DTD Application Client 4.0//EN"
-   "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
-
-<jboss-client>
-  <jndi-name>jbossws-client</jndi-name>
-
-</jboss-client>

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-doclit/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-doclit/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-doclit/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -8,7 +8,7 @@
   <display-name>JAXRPC simple tests</display-name>
 
   <service-ref>
-    <service-ref-name>service/StandardTypes</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/StandardTypes</service-ref-name>
     <service-interface>javax.xml.rpc.Service</service-interface>
     <wsdl-file>META-INF/wsdl/MarshallService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-doclit/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-doclit/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-doclit/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -3,10 +3,9 @@
 <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "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/StandardTypes</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/StandardTypes</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-marshall-doclit?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-rpclit/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-rpclit/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-rpclit/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -8,7 +8,7 @@
   <display-name>JAXRPC simple tests</display-name>
 
   <service-ref>
-    <service-ref-name>service/StandardTypes</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/StandardTypes</service-ref-name>
     <service-interface>javax.xml.rpc.Service</service-interface>
     <wsdl-file>META-INF/wsdl/MarshallService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -3,11 +3,9 @@
 <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "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/StandardTypes</service-ref-name>
-     <config-name>Standard Client</config-name>
+    <service-ref-name>java:jboss/exported/service/StandardTypes</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-marshall-rpclit?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/overloaded/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/overloaded/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/overloaded/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -8,7 +8,7 @@
   <display-name>JAXRPC simple tests</display-name>
 
   <service-ref>
-    <service-ref-name>service/OverloadedTestService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/OverloadedTestService</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/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/overloaded/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/overloaded/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/overloaded/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -3,10 +3,9 @@
 <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "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/OverloadedTestService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/OverloadedTestService</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-overloaded?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/utf16/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/utf16/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/utf16/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -8,7 +8,7 @@
   <display-name>HelloService</display-name>
 
   <service-ref>
-    <service-ref-name>service/TestService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/TestService</service-ref-name>
     <service-interface>javax.xml.rpc.Service</service-interface>
     <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/utf16/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/utf16/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/utf16/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -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/TestService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/TestService</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-utf16?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -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/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -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/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -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/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -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/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -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/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -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/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -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/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -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/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml	2012-03-01 22:06:02 UTC (rev 15818)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml	2012-03-01 22:15:11 UTC (rev 15819)
@@ -1163,42 +1163,14 @@
                  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
 
                  <!-- # Remote JNDI lookup & jaxrpc client issues -->
-                 <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase*</exclude>
-                 <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase*</exclude>
-                 <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase*</exclude>
-                 <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/jbws1792/JBWS1792TestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase*</exclude><!-- rewrite test -->
                  <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude><!-- rewrite test -->
-                 <exclude>org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase*</exclude><!-- review test -->
                  <exclude>org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase*</exclude><!-- review test -->
                  <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude><!-- rewrite test -->
-                 <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase*</exclude>
-                 <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>
+                 <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase*</exclude><!-- investigate failure -->
 
                  <!-- # 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