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

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Fri Mar 2 03:43:18 EST 2012


Author: ropalka
Date: 2012-03-02 03:43:17 -0500 (Fri, 02 Mar 2012)
New Revision: 15822

Added:
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-ejb3.xml
Removed:
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/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/jaxrpc/jbws1179/JBWS1179TestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/application-client.xml
   stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml
Log:
Merged revisions 15821 via svnmerge from 
https://svn.jboss.org/repos/jbossws/stack/native/trunk

.......
  r15821 | ropalka | 2012-03-02 09:34:56 +0100 (Fri, 02 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,15812-15818
   + 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,15821
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,15812-15818
   + /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,15821

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-02 08:34:56 UTC (rev 15821)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml	2012-03-02 08:43:17 UTC (rev 15822)
@@ -2211,17 +2211,22 @@
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="ejb-jar.xml"/>
+        <include name="jboss-ejb3.xml"/>
         <include name="jboss.xml"/>
         <include name="jboss-webservices.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws723-client.jar">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws723-appclient.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.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/jbws723/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -2229,6 +2234,11 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws723-appclient.ear">
+      <fileset dir="${tests.output.dir}/test-libs">
+        <include name="jaxrpc-jbws723-appclient.jar"/>
+      </fileset>
+    </jar>
     
     <!-- jaxrpc-jbws732 -->
     <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws732.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws732/WEB-INF/web.xml">

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java	2012-03-02 08:34:56 UTC (rev 15821)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java	2012-03-02 08:43:17 UTC (rev 15822)
@@ -54,7 +54,7 @@
       super.setUp();
       if (port == null)
       {
-         InitialContext iniCtx = getInitialContext();
+         InitialContext iniCtx = getAppclientInitialContext();
          Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
          port = (TestEndpoint)service.getPort(TestEndpoint.class);
       }

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java	2012-03-02 08:34:56 UTC (rev 15821)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java	2012-03-02 08:43:17 UTC (rev 15822)
@@ -48,7 +48,7 @@
 
    public void testEndpointAccess() throws Exception
    {
-      InitialContext iniCtx = getInitialContext();
+      InitialContext iniCtx = getAppclientInitialContext();
       Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
       Hello endpoint = (Hello)service.getPort(Hello.class);
 
@@ -58,7 +58,7 @@
 
    public void testRemoteAccess() throws Exception
    {
-      InitialContext iniCtx = getInitialContext();
+      InitialContext iniCtx = getAppclientInitialContext();
       HelloHome home = (HelloHome)iniCtx.lookup("java:comp/env/ejb/Hello");
       HelloRemote slsb = home.create();
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java	2012-03-02 08:34:56 UTC (rev 15821)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java	2012-03-02 08:43:17 UTC (rev 15822)
@@ -49,12 +49,29 @@
 {
    public static final String USERNAME = "kermit";
    public static final String PASSWORD = "thefrog";
+   private static InitialContext iniCtx;
 
    public static Test suite() throws Exception
    {
-      return new JBossWSTestSetup(JBWS723TestCase.class, "jaxrpc-jbws723.jar, jaxrpc-jbws723-client.jar");
+      return new JBossWSTestSetup(JBWS723TestCase.class, "jaxrpc-jbws723.jar, jaxrpc-jbws723-appclient.ear#jaxrpc-jbws723-appclient.jar", true);
    }
 
+   protected void setUp() throws Exception
+   {
+      super.setUp();
+      iniCtx = getAppclientInitialContext();
+   }
+
+   protected void tearDown() throws Exception
+   {
+      if (iniCtx != null)
+      {
+         iniCtx.close();
+         iniCtx = null;
+      }
+      super.tearDown();
+   }
+
    public void testRoleSecuredWSDLAccess() throws Exception
    {
       URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws723/RoleSecured?wsdl");
@@ -65,8 +82,8 @@
 
    public void testRoleSecuredServiceAccess() throws Exception
    {
-      InitialContext iniCtx = getInitialContext();
-      Service service = (Service)iniCtx.lookup("java:comp/env/service/RoleSecured");
+      iniCtx = getAppclientInitialContext();
+      Service service = (Service)iniCtx.lookup("java:service/RoleSecured");
       QName portName = new QName("http://org.jboss.ws/jbws723", "RoleSecuredPort");
       OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class);
 
@@ -88,18 +105,6 @@
       assertEquals("The 'mafia' boss is currently out of office, please call again.", info);
    }
 
-   /** Test that the remote access to this bean is unchecked
-    */
-   public void testBasicSecuredSLSB() throws Exception
-   {
-      InitialContext iniCtx = getInitialContext();
-      OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/JBWS723BasicSecuredSLSB");
-
-      OrganizationRemote bean = home.create();
-      String info = bean.getContactInfo("mafia");
-      assertEquals("The 'mafia' boss is currently out of office, please call again.", info);
-   }
-
    public void testBasicSecuredWSDLAccess() throws Exception
    {
       URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws723/BasicSecured?wsdl");
@@ -118,8 +123,8 @@
 
    public void testBasicSecuredServiceAccess() throws Exception
    {
-      InitialContext iniCtx = getInitialContext();
-      Service service = (Service)iniCtx.lookup("java:comp/env/service/BasicSecured");
+      iniCtx = getAppclientInitialContext();
+      Service service = (Service)iniCtx.lookup("java:service/BasicSecured");
       QName portName = new QName("http://org.jboss.ws/jbws723", "BasicSecuredPort");
       OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class);
 
@@ -151,8 +156,8 @@
 
    public void testConfidentialServiceAccess() throws Exception
    {
-      InitialContext iniCtx = getInitialContext();
-      Service service = (Service)iniCtx.lookup("java:comp/env/service/ConfidentialSecured");
+      iniCtx = getAppclientInitialContext();
+      Service service = (Service)iniCtx.lookup("java:service/ConfidentialSecured");
       QName portName = new QName("http://org.jboss.ws/jbws723", "ConfidentialPort");
       OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class);
 
@@ -171,10 +176,5 @@
       {
          // ignore expected exception
       }
-
-      // test confidential access
-      //stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "https://" + getServerHost() + ":8443/jaxrpc-jbws723/ConfidentialSecured");
-      //String info = port.getContactInfo("mafia");
-      //assertEquals("The 'mafia' boss is currently out of office, please call again.", info);
    }
 }

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java	2012-03-02 08:34:56 UTC (rev 15821)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java	2012-03-02 08:43:17 UTC (rev 15822)
@@ -46,7 +46,7 @@
       
       if (port == null)
       {
-         InitialContext iniCtx = getInitialContext();
+         InitialContext iniCtx = getAppclientInitialContext();
          Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
          port = (ITranHistory)service.getPort(ITranHistory.class);
       }

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java	2012-03-02 08:34:56 UTC (rev 15821)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java	2012-03-02 08:43:17 UTC (rev 15822)
@@ -47,7 +47,7 @@
 
    public void testEndpointAccess() throws Exception
    {
-      InitialContext iniCtx = getInitialContext();
+      InitialContext iniCtx = getAppclientInitialContext();
       Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
       Hello port = (Hello)service.getPort(Hello.class);
 
@@ -57,7 +57,7 @@
 
    public void testRemoteAccess() throws Exception
    {
-      InitialContext iniCtx = getInitialContext();
+      InitialContext iniCtx = getAppclientInitialContext();
       HelloHome home = (HelloHome)iniCtx.lookup("java:comp/env/ejb/HelloEJBTwo");
       HelloRemote remote = home.create();
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java	2012-03-02 08:34:56 UTC (rev 15821)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java	2012-03-02 08:43:17 UTC (rev 15822)
@@ -52,7 +52,7 @@
     */
    public void testEndpoint() throws Exception
    {
-      InitialContext iniCtx = getInitialContext();
+      InitialContext iniCtx = getAppclientInitialContext();
       Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
       Hello hello = (Hello)service.getPort(Hello.class);
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java	2012-03-02 08:34:56 UTC (rev 15821)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java	2012-03-02 08:43:17 UTC (rev 15822)
@@ -47,7 +47,7 @@
 
    public void testEndpoint() throws Exception
    {
-      InitialContext iniCtx = getInitialContext();
+      InitialContext iniCtx = getAppclientInitialContext();
       Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
       Hello hello = (Hello)service.getPort(Hello.class);
 
@@ -58,7 +58,7 @@
 
    public void testFault() throws Exception
    {
-      InitialContext iniCtx = getInitialContext();
+      InitialContext iniCtx = getAppclientInitialContext();
       Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
       Hello hello = (Hello)service.getPort(Hello.class);
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java	2012-03-02 08:34:56 UTC (rev 15821)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java	2012-03-02 08:43:17 UTC (rev 15822)
@@ -57,7 +57,7 @@
 
    public void testEndpoint() throws Exception
    {
-      InitialContext iniCtx = getInitialContext();
+      InitialContext iniCtx = getAppclientInitialContext();
       Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
       Hello hello = (Hello)service.getPort(Hello.class);
 
@@ -71,7 +71,7 @@
       clearEnvironment();
       try
       {
-         InitialContext iniCtx = getInitialContext();
+         InitialContext iniCtx = getAppclientInitialContext();
          Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
          Hello hello = (Hello)service.getPort(Hello.class);
    

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java	2012-03-02 08:34:56 UTC (rev 15821)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java	2012-03-02 08:43:17 UTC (rev 15822)
@@ -59,7 +59,7 @@
 
       if (port == null)
       {
-         InitialContext iniCtx = getInitialContext();
+         InitialContext iniCtx = getAppclientInitialContext();
          Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB");
          port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class);
       }

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java	2012-03-02 08:34:56 UTC (rev 15821)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java	2012-03-02 08:43:17 UTC (rev 15822)
@@ -43,7 +43,7 @@
 
    public void testEndpoint() throws Exception
    {
-      InitialContext iniCtx = getInitialContext();
+      InitialContext iniCtx = getAppclientInitialContext();
       Service service = (Service)iniCtx.lookup("java:comp/env/service/AccountSignupService");
       AccountSignup signup = (AccountSignup)service.getPort(AccountSignup.class);
 

Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/application-client.xml	2012-03-02 08:34:56 UTC (rev 15821)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/application-client.xml	2012-03-02 08:43:17 UTC (rev 15822)
@@ -8,19 +8,19 @@
   <display-name>webservice client app</display-name>
 
   <service-ref>
-    <service-ref-name>service/BasicSecured</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/BasicSecured</service-ref-name>
     <service-interface>javax.xml.rpc.Service</service-interface>
     <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
   </service-ref>
   <service-ref>
-    <service-ref-name>service/RoleSecured</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/RoleSecured</service-ref-name>
     <service-interface>javax.xml.rpc.Service</service-interface>
     <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
   </service-ref>
   <service-ref>
-    <service-ref-name>service/ConfidentialSecured</service-ref-name>
+    <service-ref-name>java:jboss/exported/service/ConfidentialSecured</service-ref-name>
     <service-interface>javax.xml.rpc.Service</service-interface>
     <wsdl-file>META-INF/wsdl/OrganizationService.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/jbws723/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-client.xml	2012-03-02 08:34:56 UTC (rev 15821)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-client.xml	2012-03-02 08:43:17 UTC (rev 15822)
@@ -1,7 +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>

Copied: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-ejb3.xml (from rev 15821, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-ejb3.xml)
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-ejb3.xml	                        (rev 0)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-ejb3.xml	2012-03-02 08:43:17 UTC (rev 15822)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<jboss:jboss
+  xmlns:jboss="http://www.jboss.com/xml/ns/javaee"
+  xmlns:spec="http://java.sun.com/xml/ns/javaee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd
+                      http://java.sun.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-ejb3-spec-2_0.xsd"
+  version="3.1"
+  impl-version="2.0">
+
+  <spec:assembly-descriptor>
+    <security xmlns="urn:security">
+      <spec:ejb-name>JBWS723RoleSecuredSLSB</spec:ejb-name>
+      <security-domain>JBossWS</security-domain>
+    </security>
+    <security xmlns="urn:security">
+      <spec:ejb-name>JBWS723BasicSecuredSLSB</spec:ejb-name>
+      <security-domain>JBossWS</security-domain>
+    </security>
+    <security xmlns="urn:security">
+      <spec:ejb-name>JBWS723ConfidentialSLSB</spec:ejb-name>
+      <security-domain>JBossWS</security-domain>
+    </security>
+    <spec:security-role>
+      <spec:role-name>friend</spec:role-name>
+    </spec:security-role>
+  </spec:assembly-descriptor>
+
+</jboss:jboss>

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-02 08:34:56 UTC (rev 15821)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml	2012-03-02 08:43:17 UTC (rev 15822)
@@ -1162,13 +1162,14 @@
                  <!-- JAXR not available -->
                  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
 
-                 <!-- # Remote JNDI lookup & jaxrpc client issues -->
-                 <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/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><!-- investigate failure -->
+                 <!-- # TODO: rewrite tests using AS6 internals -->
+                 <exclude>org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase*</exclude>
+                 <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude>
+                 <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude>
 
+                 <!-- # TODO: investigate failure -->
+                 <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase*</exclude>
+
                  <!-- # webservices-description in jboss-web.xml / jboss.xml -->
                  <exclude>org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase*</exclude>



More information about the jbossws-commits mailing list