[jboss-cvs] jboss-seam/build ...
Peter Muir
peter at bleepbleep.org.uk
Sat Dec 8 21:24:32 EST 2007
User: pmuir
Date: 07/12/08 21:24:32
Modified: build common.build.xml ci.build.xml build.xml
Log:
Ability to deploy example artifacts to maven (for JBoss AS 5 testsuite)
Revision Changes Path
1.21 +69 -0 jboss-seam/build/common.build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: common.build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/common.build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- common.build.xml 7 Dec 2007 00:15:56 -0000 1.20
+++ common.build.xml 9 Dec 2007 02:24:32 -0000 1.21
@@ -174,4 +174,73 @@
</sequential>
</macrodef>
+ <macrodef name="deployExample">
+ <attribute name="name" />
+ <attribute name="path" default="${seam.dir}/examples/@{name}" />
+ <attribute name="repositoryId" />
+ <sequential>
+ <ant dir="@{path}" target="archive" inheritall="false">
+ <propertyset>
+ <propertyref name="initpomsdone" />
+ <propertyref name="copyseamdone" />
+ <propertyref name="copyseamdependenciesdone" />
+ <propertyref name="copyjbossembeddeddone" />
+ <propertyref name="core.pom" />
+ <propertyref name="root.pom" />
+ <propertyref name="parent.pom" />
+ <propertyref name="ui.pom" />
+ <propertyref name="remoting.pom" />
+ <propertyref name="gen.pom" />
+ <propertyref name="pdf.pom" />
+ <propertyref name="ioc.pom" />
+ <propertyref name="mail.pom" />
+ <propertyref name="debug.pom" />
+ <propertyref name="testng.jvmargs"/>
+ </propertyset>
+ </ant>
+ <pomfile name="example.pom" value="@{path}/pom.xml" />
+ <artifact:deploy file="@{path}/dist/jboss-seam-@{name}.ear" uniqueVersion="false">
+ <pom file="${example.pom}" />
+ <attach file="@{path}/resources/jboss-seam-@{name}-ds.xml" classifier="ds" type="xml" />
+ <remoteRepository refid="@{repositoryId}" />
+ </artifact:deploy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="deployExampleNoDs">
+ <attribute name="name" />
+ <attribute name="path" default="${seam.dir}/examples/@{name}" />
+ <attribute name="repositoryId" />
+ <sequential>
+ <ant dir="@{path}" target="archive" inheritall="false">
+ <propertyset>
+ <propertyref name="initpomsdone" />
+ <propertyref name="copyseamdone" />
+ <propertyref name="copyseamdependenciesdone" />
+ <propertyref name="copyjbossembeddeddone" />
+ <propertyref name="core.pom" />
+ <propertyref name="root.pom" />
+ <propertyref name="parent.pom" />
+ <propertyref name="ui.pom" />
+ <propertyref name="remoting.pom" />
+ <propertyref name="gen.pom" />
+ <propertyref name="pdf.pom" />
+ <propertyref name="ioc.pom" />
+ <propertyref name="mail.pom" />
+ <propertyref name="debug.pom" />
+ <propertyref name="testng.jvmargs"/>
+ </propertyset>
+ </ant>
+ <pomfile name="example.pom" value="@{path}/pom.xml" />
+ <artifact:deploy file="@{path}/dist/jboss-seam-@{name}.ear" uniqueVersion="false">
+ <pom file="${example.pom}" />
+ <remoteRepository refid="@{repositoryId}" />
+ </artifact:deploy>
+ </sequential>
+ </macrodef>
+
+ <target name="initdav">
+ <artifact:install-provider artifactId="wagon-webdav" version="1.0-beta-2"/>
+ </target>
+
</project>
\ No newline at end of file
1.18 +11 -5 jboss-seam/build/ci.build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ci.build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/ci.build.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- ci.build.xml 7 Dec 2007 16:45:15 -0000 1.17
+++ ci.build.xml 9 Dec 2007 02:24:32 -0000 1.18
@@ -2,6 +2,8 @@
<!-- Continuous integration related targets -->
<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" />
@@ -10,10 +12,6 @@
<artifact:remoteRepository id="snapshots.jboss.org" url="dav:https://snapshots.jboss.org/maven2" />
- <target name="initdav">
- <artifact:install-provider artifactId="wagon-webdav" version="1.0-beta-2" />
- </target>
-
<target name="deploySeamSnapshot" description="Deploy a Seam snapshot to snapshots.jboss.org" depends="initdav, initpoms">
<deploySnapshotPom pom="${root.pom}" />
<deploySnapshotPom pom="${parent.pom}" />
@@ -57,11 +55,20 @@
<ant target="deploySeamSnapshot" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
<property name="qualifier" value="-SNAPSHOT"/>
</ant>
+ <ant target="deployExamplesSnapshot" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
+ <property name="qualifier" value="-SNAPSHOT"/>
+ </ant>
<ant target="tests" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
<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>
+
<macrodef name="build">
<attribute name="target" />
<attribute name="testngjvmargs" default="" />
@@ -85,7 +92,6 @@
</sequential>
</macrodef>
-
<macrodef name="deploySnapshot">
<attribute name="pom" />
<attribute name="jar" />
1.20 +12 -28 jboss-seam/build/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/build.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- build.xml 6 Dec 2007 13:06:35 -0000 1.19
+++ build.xml 9 Dec 2007 02:24:32 -0000 1.20
@@ -13,25 +13,14 @@
<artifact:remoteRepository id="snapshots.jboss.org" url="dav:https://snapshots.jboss.org/maven2" />
<artifact:remoteRepository id="offline.repository.jboss.org" url="file:///${offline.repository.jboss.org}" />
- <target name="initdav">
- <artifact:install-provider artifactId="wagon-webdav" version="1.0-beta-2"/>
- </target>
-
<target name="deployLocal">
<pomfile name="pom.file" value="${pom}" />
<deployLocal pom="${pom.file}" jar="${jar}" />
</target>
<target name="deploySnapshot" description="Deploy a pom and jar to snapshots.jboss.org" depends="initdav">
- <input addproperty="username"
- message="JBoss.org username:" />
- <input addproperty="password"
- message="JBoss.org password:" />
-
<pomfile name="pom.file" value="${pom}" />
- <deploy pom="${pom.file}" jar="${jar}" repositoryId="snapshots.jboss.org">
- <authentication username="${username}" password="${password}" />
- </deploy>
+ <deploy pom="${pom.file}" jar="${jar}" repositoryId="snapshots.jboss.org" />
</target>
<target name="deployRelease" description="Deploy a jar (generating the pom) to snapshots.jboss.org" depends="initdav">
@@ -51,6 +40,9 @@
<deployWithSources pom="${pdf.pom}" jar="${lib.dir}/jboss-seam-pdf.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-pdf-sources.jar"/>
<deployWithSources pom="${remoting.pom}" jar="${lib.dir}/jboss-seam-remoting.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-remoting-sources.jar"/>
<deployWithSources pom="${ui.pom}" jar="${lib.dir}/jboss-seam-ui.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-ui-sources.jar"/>
+ <deployExample name="booking" repositoryId="offline.repository.jboss.org"/>
+ <deployExampleNoDs name="numberguess" repositoryId="offline.repository.jboss.org"/>
+ <deployExample name="dvd" path="${seam.dir}/examples/dvdstore" repositoryId="offline.repository.jboss.org"/>
</target>
<target name="deployLocalPom">
@@ -149,22 +141,14 @@
</target>
<target name="deployEmbeddedSnapshot" depends="initdav, shadeEmbedded">
- <input addproperty="username"
- message="JBoss.org username:" />
- <input addproperty="password"
- message="JBoss.org password:" />
- <deployWithAttachment pom="${embedded.poms.dir}/jboss-embedded.pom.xml" jar="${embedded.jars.dir}/jboss-embedded.jar" repositoryId="snapshots.jboss.org" attachment="${embedded.dir}/embedded-jboss-${embedded.version}.zip" unique="false">
- <authentication username="${username}" password="${password}" />
- </deployWithAttachment>
- <deploy pom="${embedded.poms.dir}/jboss-embedded-all.pom.xml" jar="${embedded.jars.dir}/jboss-embedded-all.jar" repositoryId="snapshots.jboss.org" unique="false">
- <authentication username="${username}" password="${password}" />
- </deploy>
- <deploy pom="${embedded.poms.dir}/hibernate-all.pom.xml" jar="${embedded.jars.dir}/hibernate-all.jar" repositoryId="snapshots.jboss.org" unique="false">
- <authentication username="${username}" password="${password}" />
- </deploy>
- <deploy pom="${embedded.poms.dir}/thirdparty-all.pom.xml" jar="${embedded.jars.dir}/thirdparty-all.jar" repositoryId="snapshots.jboss.org" unique="false">
- <authentication username="${username}" password="${password}" />
- </deploy>
+ <deployWithAttachment pom="${embedded.poms.dir}/jboss-embedded.pom.xml" jar="${embedded.jars.dir}/jboss-embedded.jar" repositoryId="snapshots.jboss.org" attachment="${embedded.dir}/embedded-jboss-${embedded.version}.zip" unique="false" />
+ <deploy pom="${embedded.poms.dir}/jboss-embedded-all.pom.xml" jar="${embedded.jars.dir}/jboss-embedded-all.jar" repositoryId="snapshots.jboss.org" unique="false" />
+ <deploy pom="${embedded.poms.dir}/hibernate-all.pom.xml" jar="${embedded.jars.dir}/hibernate-all.jar" repositoryId="snapshots.jboss.org" unique="false" />
+ <deploy pom="${embedded.poms.dir}/thirdparty-all.pom.xml" jar="${embedded.jars.dir}/thirdparty-all.jar" repositoryId="snapshots.jboss.org" unique="false" />
+ </target>
+
+ <target name="snapshotExample" depends="initdav">
+ <deployExample name="${name}" repositoryId="snapshots.jboss.org"/>
</target>
<macrodef name="offline">
More information about the jboss-cvs-commits
mailing list