You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by cd...@apache.org on 2006/12/15 20:23:05 UTC

svn commit: r487628 - /portals/pluto/trunk/dist-build.xml

Author: cdoremus
Date: Fri Dec 15 11:23:05 2006
New Revision: 487628

URL: http://svn.apache.org/viewvc?view=rev&rev=487628
Log:
pluto.version now gotten from root pom.xml using the xmlProperty task in support of PLUTO-259.

Modified:
    portals/pluto/trunk/dist-build.xml

Modified: portals/pluto/trunk/dist-build.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/dist-build.xml?view=diff&rev=487628&r1=487627&r2=487628
==============================================================================
--- portals/pluto/trunk/dist-build.xml (original)
+++ portals/pluto/trunk/dist-build.xml Fri Dec 15 11:23:05 2006
@@ -17,26 +17,27 @@
 	Builds a binary and source distribution of Pluto 1.1, bundling it into zip, gzip and bzip2 files.
 	
 	Run the binary build using the command line:
-		ant -Dpluto.version=<version> -f dist-build.xml
+		ant -f dist-build.xml
 				
 	The binary distribution is done in the following way:
 	1. prepare-bin-dist: Downloads Tomcat from Apache and unzips it into a working directory. To this distribution, the
 		build:
 		a. Adds emptySessionPath="true" to server.xml.
-		b. Adds a pluto user with pluto role to tomcat-users.xml.
-		c. Adds a pluto role to the tomcat user in tomcat-users.xml.
+		b. Adds a pluto user with pluto and manager role to tomcat-users.xml.
+		c. Adds a pluto and manager role to the tomcat user in tomcat-users.xml.
 	2. run-maven: Runs 'mvn install' and 'mvn pluto:install' to create the	Pluto driver and testsuite 
 		and installs them into the Tomcat dist in the working directory.
 	3. Bundles up the altered Tomcat dist with Pluto into a zip, gzip and bzip2 file.
 	
 	Run the source build using the command line:
-		ant -Dpluto.version=<version> -f dist-build.xml src-dist	
+		ant -f dist-build.xml src-dist	
 
 	All built distributions end up in target/dist.				
 -->
 <project name="PlutoDistributions" default="bin-dist">
 
-	<property name="pluto.version" value="" description="Version of Pluto 1.1 to build (set on command line using '-Dpluto.version=&lt;version&gt;')"/>
+	<xmlproperty file="pom.xml"/>
+	<property name="pluto.version" value="${project.version}" description="Version of Pluto 1.1 to build (set on command line using '-Dpluto.version=&lt;version&gt;')"/>
 	<property name="tomcat.version" value="5.5.17" description="Version of Tomcat to deploy Pluto"/>
 
 	<property name="dist.basedir" value="target/dist" description="Base working directory"/>



Re: svn commit: r487628 - /portals/pluto/trunk/dist-build.xml

Posted by Elliot Metsger <em...@jhu.edu>.
Thanks Craig!!!! I thought there must have been a better way :-)

cdoremus@apache.org wrote:
> Author: cdoremus
> Date: Fri Dec 15 11:23:05 2006
> New Revision: 487628
> 
> URL: http://svn.apache.org/viewvc?view=rev&rev=487628
> Log:
> pluto.version now gotten from root pom.xml using the xmlProperty task in support of PLUTO-259.
> 
> Modified:
>     portals/pluto/trunk/dist-build.xml
> 
> Modified: portals/pluto/trunk/dist-build.xml
> URL: http://svn.apache.org/viewvc/portals/pluto/trunk/dist-build.xml?view=diff&rev=487628&r1=487627&r2=487628
> ==============================================================================
> --- portals/pluto/trunk/dist-build.xml (original)
> +++ portals/pluto/trunk/dist-build.xml Fri Dec 15 11:23:05 2006
> @@ -17,26 +17,27 @@
>  	Builds a binary and source distribution of Pluto 1.1, bundling it into zip, gzip and bzip2 files.
> 
>  	
> 
>  	Run the binary build using the command line:
> 
> -		ant -Dpluto.version=<version> -f dist-build.xml
> 
> +		ant -f dist-build.xml
> 
>  				
> 
>  	The binary distribution is done in the following way:
> 
>  	1. prepare-bin-dist: Downloads Tomcat from Apache and unzips it into a working directory. To this distribution, the
> 
>  		build:
> 
>  		a. Adds emptySessionPath="true" to server.xml.
> 
> -		b. Adds a pluto user with pluto role to tomcat-users.xml.
> 
> -		c. Adds a pluto role to the tomcat user in tomcat-users.xml.
> 
> +		b. Adds a pluto user with pluto and manager role to tomcat-users.xml.
> 
> +		c. Adds a pluto and manager role to the tomcat user in tomcat-users.xml.
> 
>  	2. run-maven: Runs 'mvn install' and 'mvn pluto:install' to create the	Pluto driver and testsuite 
> 
>  		and installs them into the Tomcat dist in the working directory.
> 
>  	3. Bundles up the altered Tomcat dist with Pluto into a zip, gzip and bzip2 file.
> 
>  	
> 
>  	Run the source build using the command line:
> 
> -		ant -Dpluto.version=<version> -f dist-build.xml src-dist	
> 
> +		ant -f dist-build.xml src-dist	
> 
>  
> 
>  	All built distributions end up in target/dist.				
> 
>  -->
> 
>  <project name="PlutoDistributions" default="bin-dist">
> 
>  
> 
> -	<property name="pluto.version" value="" description="Version of Pluto 1.1 to build (set on command line using '-Dpluto.version=&lt;version&gt;')"/>
> 
> +	<xmlproperty file="pom.xml"/>
> 
> +	<property name="pluto.version" value="${project.version}" description="Version of Pluto 1.1 to build (set on command line using '-Dpluto.version=&lt;version&gt;')"/>
> 
>  	<property name="tomcat.version" value="5.5.17" description="Version of Tomcat to deploy Pluto"/>
> 
>  
> 
>  	<property name="dist.basedir" value="target/dist" description="Base working directory"/>
>