[seam-commits] Seam SVN: r8160 - trunk/build and 1 other directory.

Author: pete.muir(a)jboss.org Date: 2008-05-12 06:28:43 -0400 (Mon, 12 May 2008) New Revision: 8160 Modified: branches/Seam_2_0/build/ci.build.xml trunk/build/ci.build.xml Log: Newer docs deploy, fix ws Modified: branches/Seam_2_0/build/ci.build.xml =================================================================== --- branches/Seam_2_0/build/ci.build.xml 2008-05-12 08:18:28 UTC (rev 8159) +++ branches/Seam_2_0/build/ci.build.xml 2008-05-12 10:28:43 UTC (rev 8160) @@ -3,7 +3,6 @@ <project name="Seam2 Continuous Integration Support" basedir="." xmlns:artifact="urn:maven-artifact-ant"> <property name="qualifier" value="-SNAPSHOT" /> - <property file="default.build.properties" /> <property file="build.properties" /> @@ -14,7 +13,7 @@ <property name="maven.settings.xml" location="ci.settings.xml" /> <import file="common.build.xml" /> - + <artifact:remoteRepository id="snapshots.jboss.org" url="dav:https://snapshots.jboss.org/maven2" /> <target name="deploySeamSnapshot" description="Deploy a Seam snapshot to snapshots.jboss.org" depends="initdav, initpoms"> @@ -22,7 +21,7 @@ <deploySnapshotPom pom="${parent.pom}" /> <deploySnapshot pom="${core.pom}" jar="${lib.dir}/jboss-seam.jar" srcjar="${lib.dir}/src/jboss-seam-sources.jar" /> <deploySnapshot pom="${debug.pom}" jar="${lib.dir}/jboss-seam-debug.jar" srcjar="${lib.dir}/src/jboss-seam-debug-sources.jar" /> - <deploySnapshot pom="${jbas5.pom}" jar="${lib.dir}/interop/jboss-seam-jbas5.jar" srcjar="${lib.dir}/interop/src/jboss-seam-jbas5-sources.jar" /> + <deploySnapshot pom="${jbas5.pom}" jar="${lib.dir}/interop/jboss-seam-jbas5.jar" srcjar="${lib.dir}/interop/src/jboss-seam-jbas5-sources.jar" /> <deploySnapshot pom="${gen.pom}" jar="${lib.dir}/jboss-seam-gen.jar" srcjar="${lib.dir}/src/jboss-seam-gen-sources.jar" /> <deploySnapshot pom="${ioc.pom}" jar="${lib.dir}/jboss-seam-ioc.jar" srcjar="${lib.dir}/src/jboss-seam-ioc-sources.jar" /> <deploySnapshot pom="${mail.pom}" jar="${lib.dir}/jboss-seam-mail.jar" srcjar="${lib.dir}/src/jboss-seam-mail-sources.jar" /> @@ -33,24 +32,24 @@ <target name="tests"> <build target="cleanall" /> - <build target="coverageall" testngjvmargs="-Dfoo" /> + <build target="coverageall" /> <build target="copytestoutput" /> <build target="testreport" /> </target> + + <target name="tests-java16"> + <build target="cleanall" /> + <copyInlineDependencies id="endorsed" scope="compile" todir="${endorsed.dir}"> + <dependency groupId="javax.xml.bind" artifactId="jaxb-api" version="2.1"> + <exclusion groupId="javax.xml.stream" artifactId="stax-api" /> + <exclusion groupId="javax.activation" artifactId="activation" /> + </dependency> + </copyInlineDependencies> + <build target="testall" testngjvmargs="-Dsun.lang.ClassLoader.allowArraySyntax=true" /> + <build target="copytestoutput" /> + <build target="testreport" /> + </target> - <target name="tests-java16"> - <build target="cleanall" /> - <copyInlineDependencies id="endorsed" scope="compile" todir="${endorsed.dir}"> - <dependency groupId="javax.xml.bind" artifactId="jaxb-api" version="2.1"> - <exclusion groupId="javax.xml.stream" artifactId="stax-api" /> - <exclusion groupId="javax.activation" artifactId="activation" /> - </dependency> - </copyInlineDependencies> - <build target="testall" testngjvmargs="-Dsun.lang.ClassLoader.allowArraySyntax=true" /> - <build target="copytestoutput" /> - <build target="testreport" /> - </target> - <target name="snapshot"> <build target="cleanall" /> <build target="dist" /> @@ -72,13 +71,13 @@ <property name="qualifier" value="-SNAPSHOT" /> </ant> </target> - + <target name="deployExamplesSnapshot" depends="initdav"> <deployExample name="booking" repositoryId="snapshots.jboss.org" /> <deployExampleNoDs name="numberguess" repositoryId="snapshots.jboss.org" /> <deployExample name="dvd" path="${seam.dir}/examples/dvdstore" repositoryId="snapshots.jboss.org" /> </target> - + <target name="deployDocumentation" depends="initdav, initpoms"> <artifact:deploy uniqueVersion="false" file="${docs.pom}"> <pom file="${docs.pom}" /> @@ -89,38 +88,38 @@ <macrodef name="build"> <attribute name="target" /> - <attribute name="testngjvmargs" default="" /> + <attribute name="testngjvmargs" default="" /> <element name="properties" optional="true" /> <sequential> <ant antfile="${seam.dir}/build.xml" target="@{target}" inheritall="false" inheritrefs="false" dir="../"> <property name="dist.location" value="${dist.location}" /> <property name="qualifier" value="-SNAPSHOT" /> <property name="quietclean" value="true" /> - <property name="testng.jvmargs" value="@{testngjvmargs}" /> + <property name="testng.jvmargs" value="@{testngjvmargs}" /> <property name="maven.settings.xml" value="${maven.settings.xml}" /> <properties /> </ant> </sequential> </macrodef> - <macrodef name="deploySnapshotPom"> - <attribute name="pom" /> - <sequential> - <artifact:deploy uniqueVersion="true"> - <pom file="@{pom}" /> - <remoteRepository refid="snapshots.jboss.org" /> - </artifact:deploy> - </sequential> - </macrodef> + <macrodef name="deploySnapshotPom"> + <attribute name="pom" /> + <sequential> + <artifact:deploy uniqueVersion="true"> + <pom file="@{pom}" /> + <remoteRepository refid="snapshots.jboss.org" /> + </artifact:deploy> + </sequential> + </macrodef> <macrodef name="deploySnapshot"> <attribute name="pom" /> <attribute name="jar" /> - <attribute name="srcjar" /> + <attribute name="srcjar" /> <sequential> <artifact:deploy file="@{jar}" uniqueVersion="true"> <pom file="@{pom}" /> - <attach file="@{srcjar}" classifier="sources" /> + <attach file="@{srcjar}" classifier="sources" /> <remoteRepository refid="snapshots.jboss.org" /> </artifact:deploy> </sequential> Modified: trunk/build/ci.build.xml =================================================================== --- trunk/build/ci.build.xml 2008-05-12 08:18:28 UTC (rev 8159) +++ trunk/build/ci.build.xml 2008-05-12 10:28:43 UTC (rev 8160) @@ -2,14 +2,13 @@ <!-- Continuous integration related targets --> <project name="Seam2 Continuous Integration Support" basedir="." xmlns:artifact="urn:maven-artifact-ant"> - <property name="qualifier" value="-SNAPSHOT"/> - + <property name="qualifier" value="-SNAPSHOT" /> <property file="default.build.properties" /> <property file="build.properties" /> <property name="seam.dir" value="${basedir}/../" /> <property name="dist.location" value="${seam.dir}/dist" /> - <property name="dist.ref.dir" value="${dist.location}/ref" /> + <property name="doc.ref.dir" value="${seam.dir}/doc/Seam_Reference_Guide" /> <property name="maven.settings.xml" location="ci.settings.xml" /> @@ -17,7 +16,7 @@ <artifact:remoteRepository id="snapshots.jboss.org" url="dav:https://snapshots.jboss.org/maven2" /> - <target name="deploySeamSnapshot" description="Deploy a Seam snapshot to snapshots.jboss.org" depends="initdav, initpoms"> + <target name="deploySeamSnapshot" description="Deploy a Seam snapshot to snapshots.jboss.org" depends="initdav, initpoms"> <deploySnapshotPom pom="${root.pom}" /> <deploySnapshotPom pom="${parent.pom}" /> <deploySnapshot pom="${core.pom}" jar="${lib.dir}/jboss-seam.jar" srcjar="${lib.dir}/src/jboss-seam-sources.jar" /> @@ -34,22 +33,21 @@ </target> <target name="tests"> - <echo>${maven.settings.xml}</echo> <build target="cleanall" /> - <build target="coverageall" testngjvmargs="-Dfoo"/> + <build target="coverageall" /> <build target="copytestoutput" /> <build target="testreport" /> </target> - + <target name="tests-java16"> - <build target="cleanall" /> - <copyInlineDependencies id="endorsed" scope="compile" todir="${endorsed.dir}"> + <build target="cleanall" /> + <copyInlineDependencies id="endorsed" scope="compile" todir="${endorsed.dir}"> <dependency groupId="javax.xml.bind" artifactId="jaxb-api" version="2.1"> <exclusion groupId="javax.xml.stream" artifactId="stax-api" /> <exclusion groupId="javax.activation" artifactId="activation" /> </dependency> </copyInlineDependencies> - <build target="testall" testngjvmargs="-Dsun.lang.ClassLoader.allowArraySyntax=true"/> + <build target="testall" testngjvmargs="-Dsun.lang.ClassLoader.allowArraySyntax=true" /> <build target="copytestoutput" /> <build target="testreport" /> </target> @@ -63,27 +61,31 @@ </properties> </build> <ant target="deploySeamSnapshot" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir="."> - <property name="qualifier" value="-SNAPSHOT"/> + <property name="qualifier" value="-SNAPSHOT" /> </ant> <ant target="deployExamplesSnapshot" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir="."> - <property name="qualifier" value="-SNAPSHOT"/> + <property name="qualifier" value="-SNAPSHOT" /> </ant> <ant target="deployDocumentation" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir="."> - <property name="qualifier" value="-SNAPSHOT"/> + <property name="qualifier" value="-SNAPSHOT" /> </ant> <ant target="tests" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir="."> - <property name="qualifier" value="-SNAPSHOT"/> + <property name="qualifier" value="-SNAPSHOT" /> </ant> </target> <target name="deployExamplesSnapshot" depends="initdav"> - <deployExample name="booking" repositoryId="snapshots.jboss.org"/> - <deployExampleNoDs name="numberguess" repositoryId="snapshots.jboss.org"/> - <deployExample name="dvd" path="${seam.dir}/examples/dvdstore" repositoryId="snapshots.jboss.org"/> + <deployExample name="booking" repositoryId="snapshots.jboss.org" /> + <deployExampleNoDs name="numberguess" repositoryId="snapshots.jboss.org" /> + <deployExample name="dvd" path="${seam.dir}/examples/dvdstore" repositoryId="snapshots.jboss.org" /> </target> <target name="deployDocumentation" depends="initdav, initpoms"> - <deploy pom="${docs.pom}" jar="${dist.ref.dir}/en/pdf/seam_reference.pdf" unique="false" repositoryId="snapshots.jboss.org"/> + <artifact:deploy uniqueVersion="false" file="${docs.pom}"> + <pom file="${docs.pom}" /> + <remoteRepository refId="snapshots.jboss.org" /> + <attach file="${doc.ref.dir}/target/docbook/publish/en-US/pdf/seam_reference.pdf" classifier="pdf" type="pdf" /> + </artifact:deploy> </target> <macrodef name="build"> @@ -103,13 +105,13 @@ </macrodef> <macrodef name="deploySnapshotPom"> - <attribute name="pom" /> - <sequential> - <artifact:deploy uniqueVersion="true"> - <pom file="@{pom}" /> - <remoteRepository refid="snapshots.jboss.org" /> - </artifact:deploy> - </sequential> + <attribute name="pom" /> + <sequential> + <artifact:deploy uniqueVersion="true"> + <pom file="@{pom}" /> + <remoteRepository refid="snapshots.jboss.org" /> + </artifact:deploy> + </sequential> </macrodef> <macrodef name="deploySnapshot">