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

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Thu Mar 1 07:41:47 EST 2012


Author: ropalka
Date: 2012-03-01 07:41:45 -0500 (Thu, 01 Mar 2012)
New Revision: 15800

Modified:
   stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/application-client.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/application.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/jboss-client.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/application-client.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/jboss-client.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/application-client.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/jboss-client.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/application-client.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/jboss-client.xml
   stack/native/trunk/modules/testsuite/pom.xml
Log:
[AS7-3444] enabling appclient tests (WIP)

Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml	2012-03-01 12:08:12 UTC (rev 15799)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml	2012-03-01 12:41:45 UTC (rev 15800)
@@ -405,11 +405,16 @@
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws68-client.jar">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws68-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws68/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws68/UserType.class"/>
+        <include name="org/jboss/test/ws/jaxrpc/jbws68/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/jbws68/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -419,6 +424,11 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws68-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-jbws68-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-jbws70 -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws70.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws70/WEB-INF/web.xml">
@@ -1643,13 +1653,20 @@
         <include name="webservices.xml"/>
         <include name="wsdl/TestService.wsdl"/>
       </metainf>
+      <manifest>
+          <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
+      </manifest>
     </jar>
-    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws626-client.jar">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws626-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws626/DemoEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws626/ValueObj.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws626/_arrays/**"/>
+        <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/jbws626/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -1657,13 +1674,17 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws626-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-jbws626-appclient.jar"/>
+      </fileset>
+    </jar>
     <ear destfile="${tests.output.dir}/test-libs/jaxrpc-jbws626.ear" appxml="${tests.output.dir}/test-resources/jaxrpc/jbws626/META-INF/application.xml">
       <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws626/META-INF">
         <include name="jboss-app.xml"/>
       </metainf>
       <fileset dir="${tests.output.dir}/test-libs">
         <include name="jaxrpc-jbws626.jar"/>
-        <include name="jaxrpc-jbws626-client.jar"/>
       </fileset>
     </ear>
     
@@ -1680,11 +1701,15 @@
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws632-client.jar">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws632-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws632/TestSEI.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws632/_arrays/**"/>
+        <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/jbws632/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -1694,6 +1719,11 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws632-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-jbws632-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-jbws637 -->
     <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws637-client.jar">
@@ -1721,11 +1751,15 @@
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws643-client.jar">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws643-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws643/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws643/*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/jbws643/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -1735,6 +1769,11 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws643-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-jbws643-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-jbws663 -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws663b.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws663b/WEB-INF/web.xml">

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java	2012-03-01 12:08:12 UTC (rev 15799)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java	2012-03-01 12:41:45 UTC (rev 15800)
@@ -39,12 +39,13 @@
  */
 public class JBWS626TestCase extends JBossWSTest
 {
+   private static InitialContext iniCtx;
    private static DemoEndpoint port;
 
    /** Deploy the test */
    public static Test suite() throws Exception
    {
-      return new JBossWSTestSetup(JBWS626TestCase.class, "jaxrpc-jbws626.ear");
+      return new JBossWSTestSetup(JBWS626TestCase.class, "jaxrpc-jbws626.ear, jaxrpc-jbws626-appclient.ear#jaxrpc-jbws626-appclient.jar");
    }
 
    protected 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 = (DemoEndpoint) service.getPort(DemoEndpoint.class);
       }
    }
 
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+      }
+      super.tearDown();
+   }
+
    public void testGetArray() throws Exception
    {
       ValueObj[] expArr = new ValueObj[]

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java	2012-03-01 12:08:12 UTC (rev 15799)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java	2012-03-01 12:41:45 UTC (rev 15800)
@@ -42,11 +42,12 @@
 public class JBWS632TestCase extends JBossWSTest
 {
    private static TestSEI port;
+   private static InitialContext iniCtx;
    
    /** Deploy the test */
    public static Test suite() throws Exception
    {
-      return new JBossWSTestSetup(JBWS632TestCase.class, "jaxrpc-jbws632.war, jaxrpc-jbws632-client.jar");
+      return new JBossWSTestSetup(JBWS632TestCase.class, "jaxrpc-jbws632.war, jaxrpc-jbws632-appclient.ear#jaxrpc-jbws632-appclient.jar");
    }
 
    protected void setUp() throws Exception
@@ -54,12 +55,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 = (TestSEI)service.getPort(TestSEI.class);
       }
    }
 
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+      }
+      super.tearDown();
+   }
+
    public void testStringArray() throws Exception
    {
       String[][] arr = new String[][]{new String[]{"a", "b"}, new String[]{"", null}, new String[]{"c", "d"}};

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java	2012-03-01 12:08:12 UTC (rev 15799)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java	2012-03-01 12:41:45 UTC (rev 15800)
@@ -42,11 +42,12 @@
 public class JBWS643TestCase extends JBossWSTest
 {
    private static ResearchService port;
+   private static InitialContext iniCtx;
    
    /** Deploy the test */
    public static Test suite() throws Exception
    {
-      return new JBossWSTestSetup(JBWS643TestCase.class, "jaxrpc-jbws643.war, jaxrpc-jbws643-client.jar");
+      return new JBossWSTestSetup(JBWS643TestCase.class, "jaxrpc-jbws643.war, jaxrpc-jbws643-appclient.ear#jaxrpc-jbws643-appclient.jar");
    }
 
    protected void setUp() throws Exception
@@ -54,12 +55,21 @@
       super.setUp();
       if (port == null)
       {
-         InitialContext iniCtx = getInitialContext();
-         Service service = (Service)iniCtx.lookup("java:comp/env/service/ResearchService");
+         iniCtx = getAppclientInitialContext();
+         Service service = (Service)iniCtx.lookup("java:service/ResearchService");
          port = (ResearchService)service.getPort(ResearchService.class);
       }
    }
 
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+      }
+      super.tearDown();
+   }
+
    public void testCreateService() throws Exception
    {
       assertNotNull("port not null", port);

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java	2012-03-01 12:08:12 UTC (rev 15799)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java	2012-03-01 12:41:45 UTC (rev 15800)
@@ -48,7 +48,7 @@
    /** Deploy the test */
    public static Test suite() throws Exception
    {
-      return new JBossWSTestSetup(JBWS68TestCase.class, "jaxrpc-jbws68.war, jaxrpc-jbws68-client.jar");
+      return new JBossWSTestSetup(JBWS68TestCase.class, "jaxrpc-jbws68.war, jaxrpc-jbws68-appclient.ear#jaxrpc-jbws68-appclient.jar");
    }
 
    /**
@@ -56,12 +56,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);
 
-      UserType in0 = new UserType("Kermit");
-      UserType retObj = hello.echoUserType(in0);
-      assertEquals(in0, retObj);
+         UserType in0 = new UserType("Kermit");
+         UserType retObj = hello.echoUserType(in0);
+         assertEquals(in0, retObj);
+      }
+      finally
+      {
+         if (iniCtx != null)
+         {
+            iniCtx.close();
+         }
+      }
    }
 }

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/application-client.xml	2012-03-01 12:08:12 UTC (rev 15799)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/application-client.xml	2012-03-01 12:41:45 UTC (rev 15800)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/application.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/application.xml	2012-03-01 12:08:12 UTC (rev 15799)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/application.xml	2012-03-01 12:41:45 UTC (rev 15800)
@@ -13,8 +13,4 @@
     </ejb>
   </module>
 
-  <module>
-    <java>jaxrpc-jbws626-client.jar</java>
-  </module>
 </application>
-

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/jboss-client.xml	2012-03-01 12:08:12 UTC (rev 15799)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/jboss-client.xml	2012-03-01 12:41:45 UTC (rev 15800)
@@ -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-jbws626/DemoBean?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/application-client.xml	2012-03-01 12:08:12 UTC (rev 15799)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/application-client.xml	2012-03-01 12:41:45 UTC (rev 15800)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/jboss-client.xml	2012-03-01 12:08:12 UTC (rev 15799)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/jboss-client.xml	2012-03-01 12:41:45 UTC (rev 15800)
@@ -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-jbws632?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/application-client.xml	2012-03-01 12:08:12 UTC (rev 15799)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/application-client.xml	2012-03-01 12:41:45 UTC (rev 15800)
@@ -8,7 +8,7 @@
   <display-name>TestService</display-name>
 
   <service-ref>
-    <service-ref-name>service/ResearchService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/ResearchService</service-ref-name>
     <service-interface>javax.xml.rpc.Service</service-interface>
     <wsdl-file>META-INF/wsdl/yahoo-research.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/jboss-client.xml	2012-03-01 12:08:12 UTC (rev 15799)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/jboss-client.xml	2012-03-01 12:41:45 UTC (rev 15800)
@@ -5,11 +5,10 @@
    "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/ResearchService</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/ResearchService</service-ref-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws643?wsdl</wsdl-override>
   </service-ref>
-	
+
 </jboss-client>

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/application-client.xml	2012-03-01 12:08:12 UTC (rev 15799)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/application-client.xml	2012-03-01 12:41:45 UTC (rev 15800)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/jboss-client.xml	2012-03-01 12:08:12 UTC (rev 15799)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/jboss-client.xml	2012-03-01 12:41:45 UTC (rev 15800)
@@ -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-jbws68?wsdl</wsdl-override>
   </service-ref>
 

Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml	2012-03-01 12:08:12 UTC (rev 15799)
+++ stack/native/trunk/modules/testsuite/pom.xml	2012-03-01 12:41:45 UTC (rev 15800)
@@ -1193,13 +1193,9 @@
                  <exclude>org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/jbws1792/JBWS1792TestCase*</exclude>
                  <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/jbws626/JBWS626TestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase*</exclude>



More information about the jbossws-commits mailing list