Author: richard.opalka(a)jboss.com Date: 2009-02-13 16:11:39 -0500 (Fri, 13 Feb 2009) New Revision: 9299 Added: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt Modified: stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/management/pom.xml stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2505] rollback Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2009-02-13 20:19:52 UTC (rev 9298) +++ stack/native/trunk/modules/core/pom.xml 2009-02-13 21:11:39 UTC (rev 9299) @@ -225,7 +225,6 @@ </artifactItem> <!-- [JBWS-2505] --> <!-- START --> - <!-- <artifactItem> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501x</artifactId> @@ -250,7 +249,6 @@ <type>zip</type> <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory> </artifactItem> - --> <!-- END --> </artifactItems> </configuration> Modified: stack/native/trunk/modules/management/pom.xml =================================================================== --- stack/native/trunk/modules/management/pom.xml 2009-02-13 20:19:52 UTC (rev 9298) +++ stack/native/trunk/modules/management/pom.xml 2009-02-13 21:11:39 UTC (rev 9299) @@ -52,7 +52,6 @@ </dependency> <!-- [JBWS-2505] --> <!-- START --> - <!-- <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501x</artifactId> @@ -68,7 +67,6 @@ <artifactId>jbossws-jboss600x</artifactId> <scope>runtime</scope> </dependency> - --> <!-- END --> <dependency> <groupId>org.jboss.jaxr</groupId> Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-02-13 20:19:52 UTC (rev 9298) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-02-13 21:11:39 UTC (rev 9299) @@ -225,9 +225,7 @@ <patternset refid="jbossws.client.patternset"/> <!-- JBWS-2505 --> <!-- START --> - <!-- <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - --> <!-- END --> </fileset> </copy> @@ -245,9 +243,7 @@ <patternset refid="jbossws.client.patternset"/> <!-- JBWS-2505 --> <!-- START --> - <!-- <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - --> <!-- END --> </fileset> </copy> @@ -265,9 +261,7 @@ <patternset refid="jbossws.client.patternset"/> <!-- JBWS-2505 --> <!-- START --> - <!-- <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - --> <!-- END --> </fileset> </copy> @@ -511,21 +505,17 @@ <include name="**/jbossws-framework.jar"/> <!-- [JBWS-2505] --> <!-- START --> - <!-- <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - --> <!-- END --> </fileset> </copy> <!-- [JBWS-2505] --> <!-- START --> - <!-- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> <include name="**/jbossws-deployer-jboss-beans.xml"/> </fileset> </copy> - --> <!-- END --> </sequential> </macrodef> @@ -558,21 +548,17 @@ <include name="**/jbossws-framework.jar"/> <!-- [JBWS-2505] --> <!-- START --> - <!-- <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - --> <!-- END --> </fileset> </copy> <!-- [JBWS-2505] --> <!-- START --> - <!-- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> <include name="**/jbossws-deployer-jboss-beans.xml"/> </fileset> </copy> - --> <!-- END --> </sequential> </macrodef> @@ -605,21 +591,17 @@ <include name="**/jbossws-framework.jar"/> <!-- [JBWS-2505] --> <!-- START --> - <!-- <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - --> <!-- END --> </fileset> </copy> <!-- [JBWS-2505] --> <!-- START --> - <!-- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> <include name="**/jbossws-deployer-jboss-beans.xml"/> </fileset> </copy> - --> <!-- END --> </sequential> </macrodef> @@ -784,7 +766,6 @@ <!-- [JBWS-2505] --> <!-- START --> <!-- delete stale container integration jars --> - <!-- <delete> <fileset dir="${jboss.server.home}"> <include name="**/jbossws-jboss*.jar"/> @@ -793,7 +774,6 @@ <include name="jbossws-jboss*.jar"/> </fileset> </delete> - --> <!-- END --> <!-- delete content of last deployment --> @@ -825,7 +805,6 @@ <!-- [JBWS-2505] --> <!-- START --> <!-- delete stale container integration jars --> - <!-- <delete> <fileset dir="${jboss.server.home}"> <include name="**/jbossws-jboss*.jar"/> @@ -834,7 +813,6 @@ <include name="jbossws-jboss*.jar"/> </fileset> </delete> - --> <!-- END --> <!-- delete content of last deployment --> @@ -866,7 +844,6 @@ <!-- [JBWS-2505] --> <!-- START --> <!-- delete stale container integration jars --> - <!-- <delete> <fileset dir="${jboss.server.home}"> <include name="**/jbossws-jboss*.jar"/> @@ -875,7 +852,6 @@ <include name="jbossws-jboss*.jar"/> </fileset> </delete> - --> <!-- END --> <!-- delete content of last deployment --> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2009-02-13 20:19:52 UTC (rev 9298) +++ stack/native/trunk/modules/testsuite/pom.xml 2009-02-13 21:11:39 UTC (rev 9299) @@ -480,22 +480,22 @@ <dependencies> <!-- [JBWS-2505] --> <!-- START --> - <!--dependency> + <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501x</artifactId> <exclusions> - <exclusion> Exclude old jaxws impl transitive dependency brought in by jboss-metadata + <exclusion> <!-- Exclude old jaxws impl transitive dependency brought in by jboss-metadata --> <groupId>jboss.jbossws</groupId> <artifactId>jboss-jaxws</artifactId> </exclusion> </exclusions> - </dependency--> - <dependency> + </dependency> + <!--dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> <exclusions> - <exclusion> <!-- Exclude old jaxws impl transitive dependency brought in by jboss-metadata --> + <exclusion> Exclude old jaxws impl transitive dependency brought in by jboss-metadata <groupId>jboss.jbossws</groupId> <artifactId>jboss-jaxws</artifactId> </exclusion> @@ -504,7 +504,7 @@ <artifactId>jbosssx</artifactId> </exclusion> </exclusions> - </dependency> + </dependency--> <!-- END --> <dependency> <groupId>org.hibernate</groupId> @@ -570,22 +570,22 @@ <dependencies> <!-- [JBWS-2505] --> <!-- START --> - <!--dependency> + <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss510x</artifactId> <exclusions> - <exclusion> Exclude old jaxws impl transitive dependency brought in by jboss-metadata + <exclusion> <!-- Exclude old jaxws impl transitive dependency brought in by jboss-metadata --> <groupId>jboss.jbossws</groupId> <artifactId>jboss-jaxws</artifactId> </exclusion> </exclusions> - </dependency--> - <dependency> + </dependency> + <!--dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> <exclusions> - <exclusion> <!-- Exclude old jaxws impl transitive dependency brought in by jboss-metadata --> + <exclusion> Exclude old jaxws impl transitive dependency brought in by jboss-metadata <groupId>jboss.jbossws</groupId> <artifactId>jboss-jaxws</artifactId> </exclusion> @@ -594,7 +594,7 @@ <artifactId>jbosssx</artifactId> </exclusion> </exclusions> - </dependency> + </dependency--> <!-- END --> <dependency> <groupId>org.hibernate</groupId> @@ -660,22 +660,22 @@ <dependencies> <!-- [JBWS-2505] --> <!-- START --> - <!--dependency> + <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss600x</artifactId> <exclusions> - <exclusion> Exclude old jaxws impl transitive dependency brought in by jboss-metadata + <exclusion> <!-- Exclude old jaxws impl transitive dependency brought in by jboss-metadata --> <groupId>jboss.jbossws</groupId> <artifactId>jboss-jaxws</artifactId> </exclusion> </exclusions> - </dependency--> - <dependency> + </dependency> + <!--dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> <exclusions> - <exclusion> <!-- Exclude old jaxws impl transitive dependency brought in by jboss-metadata --> + <exclusion> Exclude old jaxws impl transitive dependency brought in by jboss-metadata <groupId>jboss.jbossws</groupId> <artifactId>jboss-jaxws</artifactId> </exclusion> @@ -684,7 +684,7 @@ <artifactId>jbosssx</artifactId> </exclusion> </exclusions> - </dependency> + </dependency--> <!-- END --> <dependency> <groupId>org.hibernate</groupId> Added: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt (rev 0) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-02-13 21:11:39 UTC (rev 9299) @@ -0,0 +1,14 @@ +# 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.* + +# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration +org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* + +# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored +org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* + +# [JBWS-2217] Fix BPEL jaxrpc samples +org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* + Property changes on: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt ___________________________________________________________________ Name: svn:executable + * Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2009-02-13 20:19:52 UTC (rev 9298) +++ stack/native/trunk/pom.xml 2009-02-13 21:11:39 UTC (rev 9299) @@ -57,11 +57,9 @@ <jbossws.jboss500.version>3.1.0-SNAPSHOT</jbossws.jboss500.version> <!-- [JBWS-2505] --> <!-- START --> - <!-- <jbossws.jboss501.version>3.1.0-SNAPSHOT</jbossws.jboss501.version> <jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.version> <jbossws.jboss600.version>3.1.0-SNAPSHOT</jbossws.jboss600.version> - --> <!-- END --> <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version> <commons.logging.version>1.1.1</commons.logging.version> @@ -161,7 +159,6 @@ </dependency> <!-- [JBWS-2505] --> <!-- START --> - <!-- <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501x</artifactId> @@ -198,7 +195,6 @@ <classifier>resources</classifier> <type>zip</type> </dependency> - --> <!-- END --> <!-- provided apis --> <dependency> Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-13 20:19:52 UTC (rev 9298) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-13 21:11:39 UTC (rev 9299) @@ -102,7 +102,6 @@ </dependencySet> <!-- [JBWS-2505] --> <!-- START --> - <!-- <dependencySet> <outputDirectory>lib</outputDirectory> <outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping> @@ -133,7 +132,6 @@ <include>org.jboss.ws:jbossws-jboss600x:jar</include> </includes> </dependencySet> - --> <!-- END --> </dependencySets> </binaries>