[jbossws-commits] JBossWS SVN: r14981 - in stack/cxf/trunk: modules/dist and 2 other directories.

Author: richard.opalka(a)jboss.com Date: 2011-09-12 08:13:39 -0400 (Mon, 12 Sep 2011) New Revision: 14981 Modified: stack/cxf/trunk/modules/dist/pom.xml stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/pom.xml Log: resuscitate JBossWS CXF against AS700 Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2011-09-12 11:51:48 UTC (rev 14980) +++ stack/cxf/trunk/modules/dist/pom.xml 2011-09-12 12:13:39 UTC (rev 14981) @@ -151,6 +151,22 @@ </exclusions> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss700</artifactId> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <!--junit--> <dependency> <groupId>junit</groupId> Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-09-12 11:51:48 UTC (rev 14980) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-09-12 12:13:39 UTC (rev 14981) @@ -97,6 +97,7 @@ <include>org.jboss.ws:jbossws-common-tools:jar</include> <include>org.jboss.ws:jbossws-jboss600:jar</include> <include>org.jboss.ws:jbossws-jboss610:jar</include> + <include>org.jboss.ws:jbossws-jboss700:jar</include> <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> @@ -125,8 +126,7 @@ <scope>test</scope> <useProjectArtifact>false</useProjectArtifact> </dependencySet> - - <dependencySet> + <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <outputFileNameMapping>wstx.jar</outputFileNameMapping> 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 2011-09-12 11:51:48 UTC (rev 14980) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-09-12 12:13:39 UTC (rev 14981) @@ -397,6 +397,7 @@ <copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/jbossws-cxf-resources.jar"/> + <include name="**/jbossws-jboss700.jar"/> </fileset> </copy> <!-- module.xml files --> @@ -519,6 +520,7 @@ <delete includeemptydirs="true" verbose="true"> <fileset dir="${jboss.modules}"> <include name="**/org/jboss/as/webservices/main/jbossws-*-resources*"/> + <include name="**/org/jboss/as/webservices/main/*7.0.0.Final*"/> </fileset> </delete> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2011-09-12 11:51:48 UTC (rev 14980) +++ stack/cxf/trunk/pom.xml 2011-09-12 12:13:39 UTC (rev 14981) @@ -52,6 +52,7 @@ <jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.testsuite.version> <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version> <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version> + <jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version> <jboss700.version>7.0.0.Final</jboss700.version> <cxf.version>2.4.3-SNAPSHOT</cxf.version> <cxf.asm.version>3.3</cxf.asm.version> @@ -148,6 +149,11 @@ <type>zip</type> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss700</artifactId> + <version>${jbossws.jboss700.version}</version> + </dependency> + <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> <version>${jboss700.version}</version>