Author: richard.opalka(a)jboss.com Date: 2008-11-13 01:38:21 -0500 (Thu, 13 Nov 2008) New Revision: 8716 Removed: stack/metro/trunk/modules/testsuite/test-excludes-jboss422-JDK6.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss423-JDK6.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss424-JDK6.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss500-JDK6.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss501-JDK6.txt Modified: stack/metro/trunk/modules/testsuite/pom.xml stack/metro/trunk/pom.xml Log: removing JDK6 separate tests excludes files Modified: stack/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/metro/trunk/modules/testsuite/pom.xml 2008-11-13 06:38:21 UTC (rev 8716) @@ -317,7 +317,7 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration> <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss422${excludeFileSuffix}.txt</testExcludeFile> + <testExcludeFile>../test-excludes-jboss422.txt</testExcludeFile> </configuration> </plugin> <plugin> @@ -362,7 +362,7 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration> <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss423${excludeFileSuffix}.txt</testExcludeFile> + <testExcludeFile>../test-excludes-jboss423.txt</testExcludeFile> </configuration> </plugin> <plugin> @@ -407,7 +407,7 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration> <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss424${excludeFileSuffix}.txt</testExcludeFile> + <testExcludeFile>../test-excludes-jboss424.txt</testExcludeFile> </configuration> </plugin> <plugin> @@ -465,7 +465,7 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration> <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss500${excludeFileSuffix}.txt</testExcludeFile> + <testExcludeFile>../test-excludes-jboss500.txt</testExcludeFile> </configuration> </plugin> <plugin> @@ -528,7 +528,7 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration> <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss501${excludeFileSuffix}.txt</testExcludeFile> + <testExcludeFile>../test-excludes-jboss501.txt</testExcludeFile> </configuration> </plugin> <plugin> Deleted: stack/metro/trunk/modules/testsuite/test-excludes-jboss422-JDK6.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss422-JDK6.txt 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422-JDK6.txt 2008-11-13 06:38:21 UTC (rev 8716) @@ -1,52 +0,0 @@ -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/jbws2307/** - -# Exclude endpoints with AS5 @SecurityDomain -org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.* - -# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration -org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* - -# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail -org/jboss/test/ws/jaxws/jbws1762/** - -# [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-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws2183/** - -# [JBWS-2131] NoSuchElementException during wsdl generation at deploy -org/jboss/test/ws/jaxws/jbws1702/** - -# [JBWS-2165] Fix xop tests with maven build -org/jboss/test/ws/jaxws/jbws2000/** -org/jboss/test/ws/jaxws/samples/xop/** - -# [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed -org/jboss/test/ws/jaxws/jbws2241/** - -# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2329] Failed to deploy service with multiple bindings -org/jboss/test/ws/jaxws/jbws2278/** - -# [JBWS-2347] Rewrite @WebFault related tests -org/jboss/test/ws/jaxws/jbws1904/** -org/jboss/test/ws/jaxws/webfault/** - -# [JBWS-2348] Fix jbws1969 testcase -org/jboss/test/ws/jaxws/jbws1969/** - -# [JBWS-2397] Fix jbws1797 testcase -org/jboss/test/ws/jaxws/jbws1797/** - -# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5 -org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* Deleted: stack/metro/trunk/modules/testsuite/test-excludes-jboss423-JDK6.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss423-JDK6.txt 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423-JDK6.txt 2008-11-13 06:38:21 UTC (rev 8716) @@ -1,46 +0,0 @@ -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/jbws2307/** - -# Exclude endpoints with AS5 @SecurityDomain -org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.* - -# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration -org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* - -# [JBWS-1841] WebServiceRef injection from DD doesn't work -org/jboss/test/ws/jaxws/jbws1841/** - -# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws2183/** - -# [JBWS-2131] NoSuchElementException during wsdl generation at deploy -org/jboss/test/ws/jaxws/jbws1702/** - -# [JBWS-2165] Fix xop tests with maven build -org/jboss/test/ws/jaxws/jbws2000/** -org/jboss/test/ws/jaxws/samples/xop/** - -# [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed -org/jboss/test/ws/jaxws/jbws2241/** - -# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2329] Failed to deploy service with multiple bindings -org/jboss/test/ws/jaxws/jbws2278/** - -# [JBWS-2347] Rewrite @WebFault related tests -org/jboss/test/ws/jaxws/jbws1904/** -org/jboss/test/ws/jaxws/webfault/** - -# [JBWS-2348] Fix jbws1969 testcase -org/jboss/test/ws/jaxws/jbws1969/** - -# [JBWS-2397] Fix jbws1797 testcase -org/jboss/test/ws/jaxws/jbws1797/** - -# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5 -org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* Deleted: stack/metro/trunk/modules/testsuite/test-excludes-jboss424-JDK6.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss424-JDK6.txt 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss424-JDK6.txt 2008-11-13 06:38:21 UTC (rev 8716) @@ -1,46 +0,0 @@ -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/jbws2307/** - -# Exclude endpoints with AS5 @SecurityDomain -org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.* - -# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration -org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* - -# [JBWS-1841] WebServiceRef injection from DD doesn't work -org/jboss/test/ws/jaxws/jbws1841/** - -# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws2183/** - -# [JBWS-2131] NoSuchElementException during wsdl generation at deploy -org/jboss/test/ws/jaxws/jbws1702/** - -# [JBWS-2165] Fix xop tests with maven build -org/jboss/test/ws/jaxws/jbws2000/** -org/jboss/test/ws/jaxws/samples/xop/** - -# [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed -org/jboss/test/ws/jaxws/jbws2241/** - -# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2329] Failed to deploy service with multiple bindings -org/jboss/test/ws/jaxws/jbws2278/** - -# [JBWS-2347] Rewrite @WebFault related tests -org/jboss/test/ws/jaxws/jbws1904/** -org/jboss/test/ws/jaxws/webfault/** - -# [JBWS-2348] Fix jbws1969 testcase -org/jboss/test/ws/jaxws/jbws1969/** - -# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5 -org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* - -# [JBWS-2397] Fix jbws1797 testcase -org/jboss/test/ws/jaxws/jbws1797/** Deleted: stack/metro/trunk/modules/testsuite/test-excludes-jboss500-JDK6.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss500-JDK6.txt 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500-JDK6.txt 2008-11-13 06:38:21 UTC (rev 8716) @@ -1,45 +0,0 @@ -# Exclude endpoints with AS42 @SecurityDomain -org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.* - -# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration -org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* - -# [JBAS-5115] Valid jboss-app.xml file not recognized correctly by jbossxb runtime -org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.* - -# [JBMETA-141] Implement getChildren() in VirtualFileAdaptor -org/jboss/test/ws/jaxws/jbws2206/** - -# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws2183/** - -# [JBWS-2131] NoSuchElementException during wsdl generation at deploy -org/jboss/test/ws/jaxws/jbws1702/** - -# [JBWS-2165] Fix xop tests with maven build -org/jboss/test/ws/jaxws/samples/xop/** -org/jboss/test/ws/jaxws/jbws2000/** - -# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2329] Failed to deploy service with multiple bindings -org/jboss/test/ws/jaxws/jbws2278/** - -# [JBWS-2347] Rewrite @WebFault related tests -org/jboss/test/ws/jaxws/jbws1904/** -org/jboss/test/ws/jaxws/webfault/** - -# [JBWS-2348] Fix jbws1969 testcase -org/jboss/test/ws/jaxws/jbws1969/** - -# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable -org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* - -# [JBWS-2397] Fix jbws1797 testcase -org/jboss/test/ws/jaxws/jbws1797/** Deleted: stack/metro/trunk/modules/testsuite/test-excludes-jboss501-JDK6.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss501-JDK6.txt 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501-JDK6.txt 2008-11-13 06:38:21 UTC (rev 8716) @@ -1,39 +0,0 @@ -# Exclude endpoints with AS42 @SecurityDomain -org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.* - -# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration -org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* - -# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws2183/** - -# [JBWS-2131] NoSuchElementException during wsdl generation at deploy -org/jboss/test/ws/jaxws/jbws1702/** - -# [JBWS-2165] Fix xop tests with maven build -org/jboss/test/ws/jaxws/samples/xop/** -org/jboss/test/ws/jaxws/jbws2000/** - -# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2329] Failed to deploy service with multiple bindings -org/jboss/test/ws/jaxws/jbws2278/** - -# [JBWS-2347] Rewrite @WebFault related tests -org/jboss/test/ws/jaxws/jbws1904/** -org/jboss/test/ws/jaxws/webfault/** - -# [JBWS-2348] Fix jbws1969 testcase -org/jboss/test/ws/jaxws/jbws1969/** - -# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable -org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* - -# [JBWS-2397] Fix jbws1797 testcase -org/jboss/test/ws/jaxws/jbws1797/** Modified: stack/metro/trunk/pom.xml =================================================================== --- stack/metro/trunk/pom.xml 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/metro/trunk/pom.xml 2008-11-13 06:38:21 UTC (rev 8716) @@ -479,33 +479,6 @@ </profile> <!-- - Name: jdk16 - Descr: Set jdk1.6 properties - --> - <profile> - <id>jdk16</id> - <activation> - <jdk>1.6</jdk> - </activation> - <properties> - <excludeFileSuffix>-JDK6</excludeFileSuffix> - </properties> - </profile> - - <!-- - Name: not_jdk16 - --> - <profile> - <id>not_jdk16</id> - <activation> - <jdk>!1.6</jdk> - </activation> - <properties> - <excludeFileSuffix></excludeFileSuffix> - </properties> - </profile> - - <!-- Name: smoketest Descr: Executes the smoke tests -->