Author: richard.opalka(a)jboss.com Date: 2008-06-19 09:27:19 -0400 (Thu, 19 Jun 2008) New Revision: 7677 Modified: stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/management/pom.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: sync trunk with QA tag Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2008-06-19 13:03:13 UTC (rev 7676) +++ stack/native/trunk/modules/core/pom.xml 2008-06-19 13:27:19 UTC (rev 7677) @@ -199,7 +199,7 @@ </artifactItem> <artifactItem> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423</artifactId> + <artifactId>jbossws-jboss423x</artifactId> <version>${jbossws.jboss423.version}</version> <classifier>resources</classifier> <type>zip</type> @@ -207,7 +207,7 @@ </artifactItem> <artifactItem> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> + <artifactId>jbossws-jboss500Beta4</artifactId> <version>${jbossws.jboss500.version}</version> <classifier>resources</classifier> <type>zip</type> @@ -215,7 +215,7 @@ </artifactItem> <artifactItem> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> + <artifactId>jbossws-jboss500x</artifactId> <version>${jbossws.jboss501.version}</version> <classifier>resources</classifier> <type>zip</type> Modified: stack/native/trunk/modules/management/pom.xml =================================================================== --- stack/native/trunk/modules/management/pom.xml 2008-06-19 13:03:13 UTC (rev 7676) +++ stack/native/trunk/modules/management/pom.xml 2008-06-19 13:27:19 UTC (rev 7677) @@ -42,28 +42,28 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423</artifactId> + <artifactId>jbossws-jboss423x</artifactId> <scope>runtime</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> + <artifactId>jbossws-jboss500Beta4</artifactId> <scope>runtime</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> + <artifactId>jbossws-jboss500Beta4</artifactId> <classifier>container</classifier> <scope>runtime</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> + <artifactId>jbossws-jboss500x</artifactId> <scope>runtime</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> + <artifactId>jbossws-jboss500x</artifactId> <classifier>container</classifier> <scope>runtime</scope> </dependency> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2008-06-19 13:03:13 UTC (rev 7676) +++ stack/native/trunk/modules/testsuite/pom.xml 2008-06-19 13:27:19 UTC (rev 7677) @@ -373,7 +373,7 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423</artifactId> + <artifactId>jbossws-jboss423x</artifactId> </dependency> </dependencies> <build> @@ -408,7 +408,7 @@ <dependencies> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> + <artifactId>jbossws-jboss500Beta4</artifactId> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -463,7 +463,7 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> + <artifactId>jbossws-jboss500x</artifactId> </dependency> </dependencies> <build> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2008-06-19 13:03:13 UTC (rev 7676) +++ stack/native/trunk/pom.xml 2008-06-19 13:27:19 UTC (rev 7677) @@ -51,14 +51,14 @@ <!-- Properties --> <properties> - <jbossws.common.version>1.0.5-SNAPSHOT</jbossws.common.version> - <jbossws.framework.version>3.0.3-SNAPSHOT</jbossws.framework.version> - <jbossws.spi.version>1.0.4-SNAPSHOT</jbossws.spi.version> - <jbossws.jboss421.version>3.0.2-SNAPSHOT</jbossws.jboss421.version> - <jbossws.jboss422.version>3.0.2-SNAPSHOT</jbossws.jboss422.version> - <jbossws.jboss423.version>3.0.2-SNAPSHOT</jbossws.jboss423.version> - <jbossws.jboss500.version>3.0.2-SNAPSHOT</jbossws.jboss500.version> - <jbossws.jboss501.version>3.0.2-SNAPSHOT</jbossws.jboss501.version> + <jbossws.common.version>1.0.5.GA</jbossws.common.version> + <jbossws.framework.version>3.0.2.GA</jbossws.framework.version> + <jbossws.spi.version>1.0.4.GA</jbossws.spi.version> + <jbossws.jboss421.version>3.0.2.GA</jbossws.jboss421.version> + <jbossws.jboss422.version>3.0.2.GA</jbossws.jboss422.version> + <jbossws.jboss423.version>3.0.2.GA</jbossws.jboss423.version> + <jbossws.jboss500.version>3.0.2.GA</jbossws.jboss500.version> + <jbossws.jboss501.version>3.0.2.GA</jbossws.jboss501.version> <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version> <commons.logging.version>1.1.1</commons.logging.version> <javassist.version>3.6.0.GA</javassist.version> @@ -135,48 +135,48 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423</artifactId> + <artifactId>jbossws-jboss423x</artifactId> <version>${jbossws.jboss423.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423</artifactId> + <artifactId>jbossws-jboss423x</artifactId> <version>${jbossws.jboss423.version}</version> <classifier>resources</classifier> <type>zip</type> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> + <artifactId>jbossws-jboss500Beta4</artifactId> <version>${jbossws.jboss500.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> + <artifactId>jbossws-jboss500Beta4</artifactId> <version>${jbossws.jboss500.version}</version> <classifier>container</classifier> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> + <artifactId>jbossws-jboss500Beta4</artifactId> <version>${jbossws.jboss500.version}</version> <classifier>resources</classifier> <type>zip</type> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> + <artifactId>jbossws-jboss500x</artifactId> <version>${jbossws.jboss501.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> + <artifactId>jbossws-jboss500x</artifactId> <version>${jbossws.jboss501.version}</version> <classifier>container</classifier> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> + <artifactId>jbossws-jboss500x</artifactId> <version>${jbossws.jboss501.version}</version> <classifier>resources</classifier> <type>zip</type> Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-06-19 13:03:13 UTC (rev 7676) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-06-19 13:27:19 UTC (rev 7677) @@ -93,23 +93,59 @@ <include>*:jbossws-framework:jar</include> <include>*:jbossws-jboss421:jar</include> <include>*:jbossws-jboss422:jar</include> - <include>*:jbossws-jboss423:jar</include> - <include>*:jbossws-jboss500:jar</include> - <include>*:jbossws-jboss501:jar</include> <include>*:juddi-service:sar</include> </includes> </dependencySet> <dependencySet> <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping> + <outputFileNameMapping>jbossws-jboss423.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>runtime</scope> <unpack>false</unpack> <includes> - <include>*:jbossws-jboss500:jar:container</include> - <include>*:jbossws-jboss501:jar:container</include> + <include>*:jbossws-jboss423x:jar</include> </includes> </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>jbossws-jboss500.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> + <include>*:jbossws-jboss500Beta4:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> + <include>*:jbossws-jboss500x:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>jbossws-jboss500-${artifact.classifier}.${artifact.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> + <include>*:jbossws-jboss500Beta4:jar:container</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>jbossws-jboss501-${artifact.classifier}.${artifact.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> + <include>*:jbossws-jboss500x:jar:container</include> + </includes> + </dependencySet> </dependencySets> </binaries> </moduleSet>