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

Author: alessio.soldano(a)jboss.com Date: 2011-03-08 12:07:42 -0500 (Tue, 08 Mar 2011) New Revision: 13865 Modified: stack/cxf/trunk/modules/dist/pom.xml stack/cxf/trunk/modules/dist/src/main/distro/build.xml stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/trunk/pom.xml Log: [JBWS-3210] Preparing binary distribution runs against AS7 Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2011-03-08 16:12:56 UTC (rev 13864) +++ stack/cxf/trunk/modules/dist/pom.xml 2011-03-08 17:07:42 UTC (rev 13865) @@ -108,24 +108,24 @@ <scope>provided</scope> </dependency> - <!--jboss600--> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600</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> + <!--jboss600--> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss600</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--> + <!--junit--> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -181,6 +181,9 @@ <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss601.txt"> <param name="targetName" expression="jboss601" /> </xslt> + <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss700.txt"> + <param name="targetName" expression="jboss700" /> + </xslt> </tasks> </configuration> <goals> @@ -205,6 +208,28 @@ <name>bindist</name> </property> </activation> + <dependencies> + <!--Libraries required for running binary distro testsuite and not available on server--> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-webservices-tests-integration</artifactId> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-build-config</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-server</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.marshalling</groupId> + <artifactId>jboss-marshalling-river</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> <build> <plugins> <plugin> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2011-03-08 16:12:56 UTC (rev 13864) +++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2011-03-08 17:07:42 UTC (rev 13865) @@ -53,6 +53,11 @@ <equals arg1="${jbossws.integration.target}" arg2="jboss601"/> </or> </condition> + <condition property="jbossws.integration.jboss70" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss700"/> + </or> + </condition> <property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/> <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> @@ -63,6 +68,7 @@ <path id="ws.stack.classpath"> <fileset dir="${thirdparty.dir}"> <exclude name="**/jbossws-jboss*.jar"/> + <exclude name="**/jboss-as-webservices-tests-integration.jar"/> </fileset> </path> 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-03-08 16:12:56 UTC (rev 13864) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-03-08 17:07:42 UTC (rev 13865) @@ -94,6 +94,7 @@ <include>apache-scout:scout:jar</include> <include>juddi:juddi:jar</include> <include>org.jboss.ws:jbossws-jboss600:jar</include> + <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <scope>provided</scope> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2011-03-08 16:12:56 UTC (rev 13864) +++ stack/cxf/trunk/pom.xml 2011-03-08 17:07:42 UTC (rev 13865) @@ -55,6 +55,7 @@ <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version> --> <!-- END --> + <jboss700.version>7.0.0.Alpha2-SNAPSHOT</jboss700.version> <cxf.version>2.3.4-SNAPSHOT</cxf.version> <cxf.stax.version>1.0.1</cxf.stax.version> <cxf.asm.version>3.3</cxf.asm.version> @@ -123,6 +124,11 @@ <classifier>resources</classifier> <type>zip</type> </dependency> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-webservices-tests-integration</artifactId> + <version>${jboss700.version}</version> + </dependency> <!-- JBWS-2505 --> <!-- START --> <!--