Author: richard.opalka(a)jboss.com
Date: 2008-03-27 14:35:52 -0400 (Thu, 27 Mar 2008)
New Revision: 6140
Modified:
stack/native/trunk/src/test/resources/test-excludes-jboss421.txt
stack/native/trunk/src/test/resources/test-excludes-jboss422.txt
stack/native/trunk/src/test/resources/test-excludes-jboss423.txt
stack/native/trunk/src/test/resources/test-excludes-jboss500.txt
stack/native/trunk/src/test/resources/test-excludes-jboss501.txt
Log:
[JBWS-2082] svn merge -r 6111:6112
https://svn.jboss.org/repos/jbossws/stack/native/branches/jbossws-3.0.1-n...
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss421.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss421.txt 2008-03-27 18:34:24
UTC (rev 6139)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss421.txt 2008-03-27 18:35:52
UTC (rev 6140)
@@ -1,4 +1,6 @@
-# $Id: $
+#
+# $Id: test-excludes-jboss421.txt 6108 2008-03-26 17:32:49Z richard.opalka(a)jboss.com $
+#
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
@@ -7,19 +9,19 @@
# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat
configuration
org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
+# [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/**
+
# [JBWS-1797] Setting .NET friendly Endpoint in web.xml
org/jboss/test/ws/jaxws/jbws1797/**
+# [JBWS-1813] context-root from jboss.xml
+org/jboss/test/ws/jaxws/jbws1813/**
+
+# [JBWS-1841] WebServiceRef injection from DD doesn't work
+org/jboss/test/ws/jaxws/jbws1841/**
+
# [JBWS-1911] Support the JMS transport with JAX-WS
org/jboss/test/ws/jaxws/samples/jmstransport/**
-# [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/*/jbws1762/**
-
-#[JBWS-1841] WebServiceRef injection from DD doesn't work
-org/jboss/test/ws/*/jbws1841/**
-
-#[JBWS-1813] context-root from jboss.xml
-org/jboss/test/ws/*/jbws1813/**
-
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss422.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss422.txt 2008-03-27 18:34:24
UTC (rev 6139)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss422.txt 2008-03-27 18:35:52
UTC (rev 6140)
@@ -1,24 +1,27 @@
-# $Id: $
+#
+# $Id: test-excludes-jboss422.txt 6108 2008-03-26 17:32:49Z richard.opalka(a)jboss.com $
+#
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/webserviceref/**
-# [JBWS-1797] Setting .NET friendly Endpoint in web.xml
-org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBWS-1911] Support the JMS transport with JAX-WS
-org/jboss/test/ws/jaxws/samples/jmstransport/**
-
# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat
configuration
org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
# [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/*/jbws1762/**
+org/jboss/test/ws/jaxws/jbws1762/**
-#[JBWS-1841] WebServiceRef injection from DD doesn't work
-org/jboss/test/ws/*/jbws1841/**
+# [JBWS-1797] Setting .NET friendly Endpoint in web.xml
+org/jboss/test/ws/jaxws/jbws1797/**
-#[JBWS-1813] context-root from jboss.xml
-org/jboss/test/ws/*/jbws1813/**
+# [JBWS-1813] context-root from jboss.xml
+org/jboss/test/ws/jaxws/jbws1813/**
+
+# [JBWS-1841] WebServiceRef injection from DD doesn't work
+org/jboss/test/ws/jaxws/jbws1841/**
+
+# [JBWS-1911] Support the JMS transport with JAX-WS
+org/jboss/test/ws/jaxws/samples/jmstransport/**
+
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss423.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss423.txt 2008-03-27 18:34:24
UTC (rev 6139)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss423.txt 2008-03-27 18:35:52
UTC (rev 6140)
@@ -1,4 +1,6 @@
+#
# $Id$
+#
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2008-03-27 18:34:24
UTC (rev 6139)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2008-03-27 18:35:52
UTC (rev 6140)
@@ -1,4 +1,6 @@
-# $Id: $
+#
+# $Id: test-excludes-jboss500.txt 6108 2008-03-26 17:32:49Z richard.opalka(a)jboss.com $
+#
# Fix BPEL before AS50 goes final
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
@@ -9,9 +11,6 @@
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-# [EJBTHREE-1150] WebServiceContext injection requires mapped-name
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
-
# [JBAS-5055] Failed to load users/passwords/role files
org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.*
org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.*
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss501.txt 2008-03-27 18:34:24
UTC (rev 6139)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss501.txt 2008-03-27 18:35:52
UTC (rev 6140)
@@ -1,5 +1,11 @@
+#
# $Id$
+#
+# EJB3/Injection excludes
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/webserviceref/**
+
# Fix BPEL before AS50 goes final
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
@@ -10,10 +16,9 @@
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
# [EJBTHREE-1150] WebServiceContext injection requires mapped-name
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.*
# [JBAS-5055] Failed to load users/passwords/role files
-org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.*
org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.*
# [JBAS-5114] MessageDriven EJB3 does not create destination automatically
@@ -25,6 +30,3 @@
# [JBAS-5257] jboss:service=defaultClassLoader is not registered with dynamic webapp
deployment
org/jboss/test/ws/jaxws/endpoint/**
-# TODO: Fix classpath to ClientLauncher
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/webserviceref/**