Author: richard.opalka(a)jboss.com Date: 2010-11-04 11:02:23 -0400 (Thu, 04 Nov 2010) New Revision: 13237 Modified: stack/cxf/trunk/modules/management/pom.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/pom.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: fixing hudson regressions of AS 5x Modified: stack/cxf/trunk/modules/management/pom.xml =================================================================== --- stack/cxf/trunk/modules/management/pom.xml 2010-11-04 12:07:13 UTC (rev 13236) +++ stack/cxf/trunk/modules/management/pom.xml 2010-11-04 15:02:23 UTC (rev 13237) @@ -46,6 +46,11 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501-metadata</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss510</artifactId> <scope>provided</scope> <exclusions> @@ -61,6 +66,11 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss510-metadata</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss600M5</artifactId> <scope>provided</scope> <exclusions> Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-11-04 12:07:13 UTC (rev 13236) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-11-04 15:02:23 UTC (rev 13237) @@ -169,6 +169,16 @@ <patternset refid="jbossws.client.patternset"/> </fileset> </copy> + <condition property="patch.jboss.metadata" value="true"> + <or> + <equals arg1="${jbossid}" arg2="jboss501"/> + <equals arg1="${jbossid}" arg2="jboss510"/> + </or> + </condition> + <antcall target="modify-jboss-metadata"> + <param name="targetdir" value="@{targetdir}"/> + <param name="thirdpartydir" value="@{thirdpartydir}"/> + </antcall> </sequential> </macrodef> @@ -187,6 +197,16 @@ <include name="**/jbossws-${jbossid}.jar"/> </fileset> </copy> + <condition property="patch.jboss.metadata" value="true"> + <or> + <equals arg1="${jbossid}" arg2="jboss501"/> + <equals arg1="${jbossid}" arg2="jboss510"/> + </or> + </condition> + <antcall target="modify-jboss-metadata"> + <param name="targetdir" value="@{targetdir}"/> + <param name="thirdpartydir" value="@{thirdpartydir}"/> + </antcall> </sequential> </macrodef> @@ -439,4 +459,17 @@ </condition> </target> + <target name="modify-jboss-metadata" if="patch.jboss.metadata"> + <sequential> + <copy + tofile="${targetdir}/jboss-metadata.jar" + failonerror="false" + overwrite="true"> + <fileset dir="${thirdpartydir}"> + <include name="**/jbossws-${jbossid}-metadata.jar"/> + </fileset> + </copy> + </sequential> + </target> + </project> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2010-11-04 12:07:13 UTC (rev 13236) +++ stack/cxf/trunk/pom.xml 2010-11-04 15:02:23 UTC (rev 13237) @@ -127,6 +127,11 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501-metadata</artifactId> + <version>${jbossws.jboss501.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501</artifactId> <version>${jbossws.jboss501.version}</version> <classifier>resources</classifier> @@ -139,6 +144,11 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss510-metadata</artifactId> + <version>${jbossws.jboss510.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss510</artifactId> <version>${jbossws.jboss510.version}</version> <classifier>resources</classifier> Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-11-04 12:07:13 UTC (rev 13236) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-11-04 15:02:23 UTC (rev 13237) @@ -142,6 +142,16 @@ </dependencySet> <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> + <outputFileNameMapping>jbossws-jboss501-metadata.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + <includes> + <include>org.jboss.ws:jbossws-jboss501-metadata:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> @@ -152,6 +162,16 @@ </dependencySet> <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> + <outputFileNameMapping>jbossws-jboss510-metadata.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + <includes> + <include>org.jboss.ws:jbossws-jboss510-metadata:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope>