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

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


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

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/encoded/href/MarshallTestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/href/META-INF/application-client.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/href/META-INF/jboss-client.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/application-client.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/jboss-client.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-doclit/META-INF/application-client.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-doclit/META-INF/jboss-client.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-rpclit/META-INF/application-client.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-rpclit/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 19:38:15 UTC (rev 15812)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml	2012-03-01 20:17:36 UTC (rev 15813)
@@ -193,11 +193,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 +211,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 +229,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 +248,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"
@@ -3217,11 +3235,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 +3252,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 +3272,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 +3290,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">

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java	2012-03-01 19:38:15 UTC (rev 15812)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java	2012-03-01 20:17:36 UTC (rev 15813)
@@ -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/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java	2012-03-01 19:38:15 UTC (rev 15812)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java	2012-03-01 20:17:36 UTC (rev 15813)
@@ -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/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java	2012-03-01 19:38:15 UTC (rev 15812)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java	2012-03-01 20:17:36 UTC (rev 15813)
@@ -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/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java	2012-03-01 19:38:15 UTC (rev 15812)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java	2012-03-01 20:17:36 UTC (rev 15813)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/href/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/href/META-INF/application-client.xml	2012-03-01 19:38:15 UTC (rev 15812)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/href/META-INF/application-client.xml	2012-03-01 20:17:36 UTC (rev 15813)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/href/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/href/META-INF/jboss-client.xml	2012-03-01 19:38:15 UTC (rev 15812)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/href/META-INF/jboss-client.xml	2012-03-01 20:17:36 UTC (rev 15813)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/application-client.xml	2012-03-01 19:38:15 UTC (rev 15812)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/application-client.xml	2012-03-01 20:17:36 UTC (rev 15813)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/jboss-client.xml	2012-03-01 19:38:15 UTC (rev 15812)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/jboss-client.xml	2012-03-01 20:17:36 UTC (rev 15813)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-doclit/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-doclit/META-INF/application-client.xml	2012-03-01 19:38:15 UTC (rev 15812)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-doclit/META-INF/application-client.xml	2012-03-01 20:17:36 UTC (rev 15813)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-doclit/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-doclit/META-INF/jboss-client.xml	2012-03-01 19:38:15 UTC (rev 15812)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-doclit/META-INF/jboss-client.xml	2012-03-01 20:17:36 UTC (rev 15813)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-rpclit/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-rpclit/META-INF/application-client.xml	2012-03-01 19:38:15 UTC (rev 15812)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-rpclit/META-INF/application-client.xml	2012-03-01 20:17:36 UTC (rev 15813)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml	2012-03-01 19:38:15 UTC (rev 15812)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml	2012-03-01 20:17:36 UTC (rev 15813)
@@ -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/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml	2012-03-01 19:38:15 UTC (rev 15812)
+++ stack/native/trunk/modules/testsuite/pom.xml	2012-03-01 20:17:36 UTC (rev 15813)
@@ -1168,8 +1168,6 @@
                  <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>
@@ -1187,8 +1185,7 @@
                  <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/marshall/MarshallDocLitTestCase*</exclude><!-- investigate failure -->
                  <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>



More information about the jbossws-commits mailing list