[jbossws-commits] JBossWS SVN: r7376 - 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
Wed Jun 4 12:06:06 EDT 2008


Author: alessio.soldano at jboss.com
Date: 2008-06-04 12:06:06 -0400 (Wed, 04 Jun 2008)
New Revision: 7376

Added:
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/jboss.xml
Modified:
   stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/HelloJavaBean.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java
   stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt
   stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt
   stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
   stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
   stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2107] Resolve dependency on @SecurityDomain


Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml	2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml	2008-06-04 16:06:06 UTC (rev 7376)
@@ -30,6 +30,9 @@
         <include name="org/jboss/test/ws/jaxws/samples/dar/ServiceRequest.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/dar/Stop.class"/>
       </fileset>
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/dar/META-INF">
+        <include name="jboss.xml"/>
+      </metainf>
     </jar>
     <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-client.jar">
       <fileset dir="${tests.output.dir}/test-classes">
@@ -53,6 +56,9 @@
         <include name="org/jboss/test/ws/jaxws/samples/dar/Stop.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/dar/generated/reply/*.class"/>
       </fileset>
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/dar/META-INF">
+        <include name="jboss.xml"/>
+      </metainf>
     </jar>
     <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-addressing-client.jar">
       <fileset dir="${tests.output.dir}/test-classes">
@@ -175,6 +181,27 @@
         <include name="wsse10.truststore"/>
       </metainf>
     </jar>
+  	<jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-news-step2-newspaper-as5.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
+        <include name="org/jboss/test/ws/jaxws/samples/news/PressRelease.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/AbstractPressReleaseEndpoint.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/SecurePressReleaseEndpoint.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/NewspaperSWA.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/AbstractNewspaperSWAEndpoint.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/NewspaperMTOM.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/AbstractNewspaperMTOMEndpoint.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/EditionSWA.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/EditionMTOM.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/jaxws-handlers-server.xml"/>
+      </fileset>
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/news/META-INF">
+        <include name="jboss-wsse-server.xml"/>
+        <include name="bob-sign_enc.jks"/>
+        <include name="wsse10.truststore"/>
+      </metainf>
+    </jar>
     <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-news-step2-agency-client.jar">
       <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/samples/news/generated/agency/*.class"/>

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java	2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java	2008-06-04 16:06:06 UTC (rev 7376)
@@ -39,8 +39,6 @@
 @SOAPBinding(style = SOAPBinding.Style.RPC)
 @WebContext(contextRoot = "/jaxws-jbws1988", urlPattern = "/*")
 @EndpointConfig(configName = "Standard WSSecurity Endpoint")
-//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42
-//@SecurityDomain("JBossWSDigest")
 @RolesAllowed({"friend"}) 
 public class HelloJavaBean
 {

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java	2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java	2008-06-04 16:06:06 UTC (rev 7376)
@@ -39,8 +39,6 @@
 @SOAPBinding(style = SOAPBinding.Style.RPC)
 @WebContext(contextRoot = "/jaxws-jbws1991", urlPattern = "/*")
 @EndpointConfig(configName = "Standard WSSecurity Endpoint")
-//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42
-//@SecurityDomain("JBossWS")
 @RolesAllowed({"friend"}) 
 public class HelloJavaBean
 {

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/HelloJavaBean.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/HelloJavaBean.java	2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/HelloJavaBean.java	2008-06-04 16:06:06 UTC (rev 7376)
@@ -39,8 +39,6 @@
 @SOAPBinding(style = SOAPBinding.Style.RPC)
 @WebContext(contextRoot = "/jaxws-jbws2116", urlPattern = "/*")
 @EndpointConfig(configName = "Standard WSSecurity Endpoint")
-//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42
-//@SecurityDomain("JBossWS")
 public class HelloJavaBean
 {
    private Logger log = Logger.getLogger(HelloJavaBean.class);

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java	2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java	2008-06-04 16:06:06 UTC (rev 7376)
@@ -60,8 +60,6 @@
             serviceName = "DarService")
 @SOAPBinding(style = SOAPBinding.Style.RPC,
              use = SOAPBinding.Use.LITERAL)
-//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42 
-//@SecurityDomain("JBossWS")
 @WebContext(contextRoot="/dar",
             urlPattern="/*",
             authMethod="BASIC",

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.java	2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.java	2008-06-04 16:06:06 UTC (rev 7376)
@@ -42,8 +42,6 @@
             serviceName = "DarService")
 @SOAPBinding(style = SOAPBinding.Style.RPC,
              use = SOAPBinding.Use.LITERAL)
-//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42 
-//@SecurityDomain("JBossWS")
 @WebContext(contextRoot="/dar",
             urlPattern="/*",
             authMethod="BASIC",

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java	2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java	2008-06-04 16:06:06 UTC (rev 7376)
@@ -26,6 +26,7 @@
 import java.net.URL;
 import junit.framework.Test;
 import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
 import org.jboss.wsf.test.JBossWSTestSetup;
 
 /**
@@ -40,10 +41,11 @@
 {
    public static Test suite()
    {
+      String newspaperJar = new JBossWSTestHelper().isTargetJBoss50() ? "jaxws-samples-news-step2-newspaper-as5.jar" : "jaxws-samples-news-step2-newspaper.jar";
       return new JBossWSTestSetup
       (
          SecureNewsTestCase.class,
-         "jaxws-samples-news-step2-newspaper.jar, jaxws-samples-news-step2-agency-client.jar"
+         newspaperJar + ", jaxws-samples-news-step2-agency-client.jar"
       );
    }
    

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.java	                        (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.java	2008-06-04 16:06:06 UTC (rev 7376)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.news;
+
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.BindingType;
+
+import org.jboss.ejb3.annotation.SecurityDomain;
+import org.jboss.wsf.spi.annotation.WebContext;
+
+
+ at Stateless
+ at WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.news.NewspaperMTOM",
+      name = "NewspaperMTOMEndpoint",
+      targetNamespace = "http://org.jboss.ws/samples/news",
+      serviceName = "NewspaperMTOMService")
+ at SOAPBinding(style = SOAPBinding.Style.RPC,
+       use = SOAPBinding.Use.LITERAL)
+ at SecurityDomain("JBossWS")
+ at WebContext(contextRoot="/news",
+      urlPattern="/newspaper/mtom",
+      authMethod="BASIC",
+      transportGuarantee="CONFIDENTIAL",
+      secureWSDLAccess=false)
+ at BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true")
+public class SecureNewspaperMTOMAS5Endpoint extends AbstractNewspaperMTOMEndpoint implements NewspaperMTOM
+{
+   
+}


Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.java	2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.java	2008-06-04 16:06:06 UTC (rev 7376)
@@ -26,6 +26,7 @@
 import javax.jws.soap.SOAPBinding;
 import javax.xml.ws.BindingType;
 
+import org.jboss.annotation.security.SecurityDomain;
 import org.jboss.wsf.spi.annotation.WebContext;
 
 
@@ -36,8 +37,7 @@
       serviceName = "NewspaperMTOMService")
 @SOAPBinding(style = SOAPBinding.Style.RPC,
        use = SOAPBinding.Use.LITERAL)
-//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42 
-//@SecurityDomain("JBossWS")
+ at SecurityDomain("JBossWS")
 @WebContext(contextRoot="/news",
       urlPattern="/newspaper/mtom",
       authMethod="BASIC",

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.java	                        (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.java	2008-06-04 16:06:06 UTC (rev 7376)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.news;
+
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.wsf.spi.annotation.WebContext;
+import org.jboss.ejb3.annotation.SecurityDomain;
+
+
+ at Stateless
+ at WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.news.NewspaperSWA",
+      name = "NewspaperSWAEndpoint",
+      targetNamespace = "http://org.jboss.ws/samples/news",
+      serviceName = "NewspaperSWAService")
+ at SOAPBinding(style = SOAPBinding.Style.RPC,
+       use = SOAPBinding.Use.LITERAL)
+ at SecurityDomain("JBossWS")
+ at WebContext(contextRoot="/news",
+      urlPattern="/newspaper/swa",
+      authMethod="BASIC",
+      transportGuarantee="CONFIDENTIAL",
+      secureWSDLAccess=false)
+public class SecureNewspaperSWAAS5Endpoint extends AbstractNewspaperSWAEndpoint implements NewspaperSWA
+{
+   
+}


Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.java	2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.java	2008-06-04 16:06:06 UTC (rev 7376)
@@ -26,6 +26,7 @@
 import javax.jws.soap.SOAPBinding;
 
 import org.jboss.wsf.spi.annotation.WebContext;
+import org.jboss.annotation.security.SecurityDomain;
 
 
 @Stateless
@@ -35,8 +36,7 @@
       serviceName = "NewspaperSWAService")
 @SOAPBinding(style = SOAPBinding.Style.RPC,
        use = SOAPBinding.Use.LITERAL)
-//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42 
-//@SecurityDomain("JBossWS")
+ at SecurityDomain("JBossWS")
 @WebContext(contextRoot="/news",
       urlPattern="/newspaper/swa",
       authMethod="BASIC",

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java	2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java	2008-06-04 16:06:06 UTC (rev 7376)
@@ -28,6 +28,7 @@
 import javax.jws.soap.SOAPBinding;
 import javax.jws.soap.SOAPBinding.Style;
 
+import org.jboss.ejb3.annotation.SecurityDomain;
 import org.jboss.logging.Logger;
 import org.jboss.wsf.spi.annotation.WebContext;
 
@@ -36,8 +37,7 @@
 @SOAPBinding(style = Style.RPC)
 
 @WebContext(contextRoot="/jaxws-webserviceref-secure", urlPattern="/*", authMethod = "BASIC", transportGuarantee = "NONE", secureWSDLAccess = false)
-//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42 
-//@SecurityDomain("JBossWS")
+ at SecurityDomain("JBossWS")
 @RolesAllowed("friend")
 public class SecureEndpointImpl
 {

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/jboss.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/jboss.xml	                        (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/jboss.xml	2008-06-04 16:06:06 UTC (rev 7376)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss>
+  <security-domain>java:/jaas/JBossWS</security-domain>
+</jboss>
\ No newline at end of file


Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/jboss.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt	2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt	2008-06-04 16:06:06 UTC (rev 7376)
@@ -10,6 +10,11 @@
 # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
 org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
 
+# Exclude endpoints with AS5 @SecurityDomain
+org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
+org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.*
+org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.*
+
 # [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail
 # This requires changes to the AS web meta data (servlet init params)
 org/jboss/test/ws/jaxws/jbws1762/**
@@ -32,8 +37,3 @@
 
 # [JBWS-2170] Fix embedded for maven build
 org/jboss/test/ws/embedded/**
-
-# [JBWS-2107] Resolve dependency on @SecurityDomain
-org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.*
-org/jboss/test/ws/jaxws/samples/dar/ClientTestCase.*
-

Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt	2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt	2008-06-04 16:06:06 UTC (rev 7376)
@@ -10,6 +10,11 @@
 # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
 org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
 
+# Exclude endpoint with AS5 @SecurityDomain
+org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
+org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.*
+org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.*
+
 # [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail
 # This requires changes to the AS web meta data (servlet init params)
 org/jboss/test/ws/jaxws/jbws1762/**
@@ -27,9 +32,5 @@
 org/jboss/test/ws/jaxws/samples/jmstransport/**
 org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.*
 
-# [JBWS-2107] Resolve dependency on @SecurityDomain
-org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.*
-org/jboss/test/ws/jaxws/samples/dar/ClientTestCase.*
-
 # [JBWS-2170] Fix embedded for maven build
 org/jboss/test/ws/embedded/**

Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt	2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt	2008-06-04 16:06:06 UTC (rev 7376)
@@ -10,9 +10,10 @@
 # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
 org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
 
-# [JBWS-2107] Resolve dependency on @SecurityDomain
-org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.*
-org/jboss/test/ws/jaxws/samples/dar/ClientTestCase.*
+# Exclude endpoints with AS5 @SecurityDomain
+org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
+org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.*
+org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.*
 
 # [JBWS-2170] Fix embedded for maven build
 org/jboss/test/ws/embedded/**
\ No newline at end of file

Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt	2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt	2008-06-04 16:06:06 UTC (rev 7376)
@@ -8,6 +8,11 @@
 # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
 org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
 
+# Exclude endpoints with AS42 @SecurityDomain
+org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
+org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.*
+org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.*
+
 # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
 org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
 
@@ -24,4 +29,4 @@
 org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.*
 
 # [JBWS-2170] Fix embedded for maven build
-org/jboss/test/ws/embedded/**
\ No newline at end of file
+org/jboss/test/ws/embedded/**

Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt	2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt	2008-06-04 16:06:06 UTC (rev 7376)
@@ -8,6 +8,11 @@
 # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
 org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
 
+# Exclude endpoints with AS42 @SecurityDomain
+org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
+org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.*
+org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.*
+
 # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
 org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
 
@@ -23,12 +28,6 @@
 # [JBAS-5115] Valid jboss-app.xml file not recognized correctly by jbossxb runtime
 org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.*
 
-# [JBWS-2107] Resolve dependency on @SecurityDomain
-org/jboss/test/ws/jaxws/webserviceref/Secure**
-org/jboss/test/ws/jaxws/samples/dar/**
-org/jboss/test/ws/jaxws/samples/news/**
-org/jboss/test/ws/jaxws/jbws1840/**
-
 # [EJBTHREE-1150] WebServiceContext injection requires mapped-name
 org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.*
 




More information about the jbossws-commits mailing list