[jboss-cvs] jboss-seam/build ...

Peter Muir peter at bleepbleep.org.uk
Fri Aug 17 10:03:01 EDT 2007


  User: pmuir   
  Date: 07/08/17 10:03:01

  Modified:    build          gen.pom.xml mail.pom.xml ioc.pom.xml
                        debug.pom.xml pdf.pom.xml core.pom.xml build.xml
                        remoting.pom.xml
  Added:       build          utilities.xml
  Log:
  More dependency management
  
  Revision  Changes    Path
  1.3       +1 -1      jboss-seam/build/gen.pom.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: gen.pom.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/gen.pom.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- gen.pom.xml	16 Aug 2007 10:53:39 -0000	1.2
  +++ gen.pom.xml	17 Aug 2007 14:03:01 -0000	1.3
  @@ -8,7 +8,7 @@
   	<parent>
   		<groupId>org.jboss.seam</groupId>
   		<artifactId>jboss-seam</artifactId>
  -		<version>2.0.0.BETA</version>
  +		<version>@seam.version@</version>
   	</parent>
   
   	<dependencies>
  
  
  
  1.3       +1 -1      jboss-seam/build/mail.pom.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: mail.pom.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/mail.pom.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- mail.pom.xml	16 Aug 2007 10:53:39 -0000	1.2
  +++ mail.pom.xml	17 Aug 2007 14:03:01 -0000	1.3
  @@ -8,7 +8,7 @@
   	<parent>
   		<groupId>org.jboss.seam</groupId>
   		<artifactId>jboss-seam</artifactId>
  -		<version>2.0.0.BETA</version>
  +		<version>@seam.version@</version>
   	</parent>
   
   	<dependencies>
  
  
  
  1.3       +1 -1      jboss-seam/build/ioc.pom.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ioc.pom.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/ioc.pom.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ioc.pom.xml	16 Aug 2007 10:53:39 -0000	1.2
  +++ ioc.pom.xml	17 Aug 2007 14:03:01 -0000	1.3
  @@ -8,7 +8,7 @@
   	<parent>
   		<groupId>org.jboss.seam</groupId>
   		<artifactId>jboss-seam</artifactId>
  -		<version>2.0.0.BETA</version>
  +		<version>@seam.version@</version>
   	</parent>
   
   	<dependencies>
  
  
  
  1.3       +1 -1      jboss-seam/build/debug.pom.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: debug.pom.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/debug.pom.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- debug.pom.xml	16 Aug 2007 10:53:39 -0000	1.2
  +++ debug.pom.xml	17 Aug 2007 14:03:01 -0000	1.3
  @@ -8,7 +8,7 @@
   	<parent>
   		<groupId>org.jboss.seam</groupId>
   		<artifactId>jboss-seam</artifactId>
  -		<version>2.0.0.BETA</version>
  +		<version>@seam.version@</version>
   	</parent>
   
   	<dependencies>
  
  
  
  1.5       +1 -1      jboss-seam/build/pdf.pom.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: pdf.pom.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/pdf.pom.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- pdf.pom.xml	16 Aug 2007 10:53:39 -0000	1.4
  +++ pdf.pom.xml	17 Aug 2007 14:03:01 -0000	1.5
  @@ -8,7 +8,7 @@
   	<parent>
   		<groupId>org.jboss.seam</groupId>
   		<artifactId>jboss-seam</artifactId>
  -		<version>2.0.0.BETA</version>
  +		<version>@seam.version@</version>
   	</parent>
   
   	<dependencies>
  
  
  
  1.6       +1 -1      jboss-seam/build/core.pom.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: core.pom.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/core.pom.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- core.pom.xml	16 Aug 2007 10:53:39 -0000	1.5
  +++ core.pom.xml	17 Aug 2007 14:03:01 -0000	1.6
  @@ -8,7 +8,7 @@
   	<parent>
   		<groupId>org.jboss.seam</groupId>
   		<artifactId>jboss-seam</artifactId>
  -		<version>2.0.0.BETA</version>
  +		<version>@seam.version@</version>
   	</parent>
   
   	<!-- 
  
  
  
  1.10      +39 -42    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.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- build.xml	16 Aug 2007 10:53:39 -0000	1.9
  +++ build.xml	17 Aug 2007 14:03:01 -0000	1.10
  @@ -1,47 +1,45 @@
   <?xml version="1.0"?>
   <project name="Seam2 Build Utilities" basedir="." default="help" xmlns:artifact="urn:maven-artifact-ant">
  +
   	<path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks.jar" />
   	<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
   
  -	<artifact:remoteRepository id="local.repository" url="file://${basedir}/repository" />
  +	<property name="classes.dir" value="../classes" />
  +	<property name="seam.dir" value="${basedir}/../" />
  +	
  +	<property file="${seam.dir}/build.properties" />
  +
  +	<import file="utilities.xml" />
   
   	<target name="deployLocal" description="Deploy a pom and jar to local (development) repository">
  -		<echo message="Deploying ${pom.groupId}.${pom.artifactId} to local repository" />
  -		<artifact:deploy file="${jar}">
  -			<pom file="@{pom}" />
  -			<remoteRepository refid="local.repository" />
  -		</artifact:deploy>
  +		<pomfile name="pom.file" value="${pom}" />
  +		<deployLocal pom="${pom.file}" jar="${jar}" />
   	</target>
   
  -	<target name="deployLocalPomOnly" description="Deploy a pom to the (development) repository">
  -		<echo message="Deploying ${pom.groupId}.${pom.artifactId} to local repository (pom only)" />
  -		<artifact:deploy>
  -			<pom file="@{pom}" />
  -			<remoteRepository refid="local.repository" />
  -		</artifact:deploy>
  +	<target name="deployLocalPom" description="Deploy a pom to the (development) repository">
  +		<deployLocal pom="${pom}" />
   	</target>
   
  -	<target name="deployLocalJarOnly" description="Deploy a jar (generating the pom) to local (development) repository">
  -		<echo message="Deploying ${pom.groupId}.${pom.artifactId} to local repository (generating pom)" />
  -		<artifact:deploy file="${pom}">
  -			<remoteRepository refid="local.repository" />
  -		</artifact:deploy>
  +	<target name="deployLocalJar" description="Deploy a jar (generating the pom) to local (development) repository">
  +		<deployLocal jar="${jar}" />
   	</target>
   	
  -	<target name="deployProfiles" description="Deploy all profiles to the local (development) repository">
  -		<deployProfile pom="profiles/seam-ajax4jsf.pom.xml" />
  -		<deployProfile pom="profiles/seam-drools.pom.xml" />
  -		<deployProfile pom="profiles/seam-facelets.pom.xml" />
  -		<deployProfile pom="profiles/seam-gwt.pom.xml" />
  -		<deployProfile pom="profiles/seam-hibernate-search.pom.xml" />
  -		<deployProfile pom="profiles/seam-jboss-cache.pom.xml" />
  -		<deployProfile pom="profiles/seam-jbpm-jpdl.pom.xml" />
  -		<deployProfile pom="profiles/seam-jbpm-jpdl-tomcat.pom.xml" />
  -		<deployProfile pom="profiles/seam-jcaptcha.pom.xml" />
  -		<deployProfile pom="profiles/seam-quartz.pom.xml" />
  -		<deployProfile pom="profiles/seam-richfaces.pom.xml" />
  -		<deployProfile pom="profiles/seam-spring.pom.xml" />
  -		<deployProfile pom="profiles/seam-urlrewrite.pom.xml" />
  +	<target name="installProfiles" description="Deploy all profiles to the local (development) repository">
  +		<installProfile pom="profiles/seam-ajax.pom.xml" />
  +		<installProfile pom="profiles/seam-async-timer-quartz.pom.xml" />
  +		<installProfile pom="profiles/seam-cache.pom.xml" />
  +		<installProfile pom="profiles/seam-captcha.pom.xml" />
  +		<installProfile pom="profiles/seam-ejb3.pom.xml" />
  +		<installProfile pom="profiles/seam-facelets.pom.xml" />
  +		<installProfile pom="profiles/seam-gwt.pom.xml" />
  +		<installProfile pom="profiles/seam-jpa.pom.xml" />
  +		<installProfile pom="profiles/seam-jpdl.pom.xml" />
  +		<installProfile pom="profiles/seam-jpdl-tomcat.pom.xml" />
  +		<installProfile pom="profiles/seam-richfaces.pom.xml" />
  +		<installProfile pom="profiles/seam-rules.pom.xml" />
  +		<installProfile pom="profiles/seam-search.pom.xml" />
  +		<installProfile pom="profiles/seam-spring.pom.xml" />
  +		<installProfile pom="profiles/seam-urlrewrite.pom.xml" />
   	</target>
   		
   	<target name="help">
  @@ -57,17 +55,16 @@
   		<echo>Deploy a jar and generate a basic pom:</echo>
   		<echo>   ant deployLocal -Dpom=jboss-el.pom.xml -Djar=jboss-el.jar</echo>
   		<echo />
  -		<echo>Deploy all profiles to local repository:</echo>
  -		<echo>   ant deployProfiles</echo>
  +		<echo>installProfile all profiles to ~/.m2/repository:</echo>
  +		<echo>   ant installProfileProfiles</echo>
   	</target>
   	
  -	<macrodef name="deployProfile">
  +	<macrodef name="installProfile">
   		<attribute name="pom"/>
   		<sequential>
  -			<artifact:deploy>
  -				<pom file="@{pom}"/>
  -				<remoteRepository refid="local.repository" />
  -			</artifact:deploy>
  +			<pomfile name="pomfile" value="@{pom}" />
  +			<install pom="${pomfile}" />
   		</sequential>
   	</macrodef>
  +	
   </project>
  \ No newline at end of file
  
  
  
  1.4       +1 -1      jboss-seam/build/remoting.pom.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: remoting.pom.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/remoting.pom.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- remoting.pom.xml	16 Aug 2007 10:53:39 -0000	1.3
  +++ remoting.pom.xml	17 Aug 2007 14:03:01 -0000	1.4
  @@ -8,7 +8,7 @@
   	<parent>
   		<groupId>org.jboss.seam</groupId>
   		<artifactId>jboss-seam</artifactId>
  -		<version>2.0.0.BETA</version>
  +		<version>@seam.version@</version>
   	</parent>
   
   	<dependencies>
  
  
  
  1.1      date: 2007/08/17 14:03:01;  author: pmuir;  state: Exp;jboss-seam/build/utilities.xml
  
  Index: utilities.xml
  ===================================================================
  <?xml version="1.0"?>
  <project basedir="." xmlns:artifact="urn:maven-artifact-ant">
  	
  	<artifact:remoteRepository id="local.repository" url="file://${seam.dir}/build/repository" />
  
  	<macrodef name="pomfile">
  		<attribute name="name" />
  		<attribute name="value" />
  		<sequential>
  			<mkdir dir="${classes.dir}/poms" />
  			<copy file="@{value}" tofile="${classes.dir}/poms/@{name}" overwrite="on">
  				<filterset>
  					<filter token="seam.version" value="${version}.${patchlevel}" />
  					<filter token="seam.dir" value="${version}.${patchlevel}" />
  				</filterset>
  			</copy>
  			<property name="@{name}" value="${classes.dir}/poms/@{name}" />
  		</sequential>
  	</macrodef>
  
  	<macrodef name="dependencies">
  		<attribute name="id" />
  		<attribute name="scope" />
  		<attribute name="pom" />
  		<sequential>
  			<artifact:dependencies pathId="@{scope}.@{id}.path" filesetId="@{scope}.@{id}.fileset" versionsId="@{scope}.@{id}.versions" useScope="@{scope}">
  				<pom file="@{pom}" />
  				<remoterepository refid="local.repository" />
  			</artifact:dependencies>
  		</sequential>
  	</macrodef>
  
  	<macrodef name="install">
  		<attribute name="pom" default="" />
  		<attribute name="jar" default="" />
  		<sequential>
  			<artifact:install file="@{jar}">
  				<pom file="@{pom}" />
  			</artifact:install>
  		</sequential>
  	</macrodef>
  
  	<macrodef name="deploy">
  		<attribute name="pom" default="" />
  		<attribute name="jar" default="" />
  		<attribute name="repositoryId" default="" />
  		<sequential>
  			<artifact:deploy file="@{jar}">
  				<pom file="@{pom}" />
  				<remoteRepository refId="@{repositoryId}" />
  			</artifact:deploy>
  		</sequential>
  	</macrodef>
  
  	<macrodef name="deployLocal">
  		<attribute name="pom" default="" />
  		<attribute name="jar" default="" />
  		<sequential>
  			<deploy pom="@{pom}" jar="@{jar}" repositoryId="local.repository" />
  		</sequential>
  	</macrodef>
  	
  	<pomfile name="seam.pom" value="${seam.dir}/pom.xml" />
  	<install pom="${seam.pom}" />
  
  </project>
  
  



More information about the jboss-cvs-commits mailing list