From 8fe7f60cadd53b915ba919b33eac0e5e1f139d98 Mon Sep 17 00:00:00 2001
From: Ben Hale <bhale@vmware.com>
Date: Thu, 1 Mar 2007 01:53:20 +0000
Subject: [PATCH] CI build updates for spring-webflow

---
 build-spring-webflow/build-continuous.xml | 4 ++--
 build-spring-webflow/build.xml            | 4 ++--
 common-build/common-targets.xml           | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build-spring-webflow/build-continuous.xml b/build-spring-webflow/build-continuous.xml
index bb318816..54982711 100644
--- a/build-spring-webflow/build-continuous.xml
+++ b/build-spring-webflow/build-continuous.xml
@@ -33,10 +33,10 @@
         <delete quiet="true" dir="${upload.tmp.dir}"/>
         <mkdir dir="${upload.tmp.dir}"/>
         <tstamp>
-            <format property="tstamp" pattern="yyyyMMdd-HHmm"/>
+            <format property="tstamp" pattern="yyyy-MM-dd"/>
         </tstamp>
         <move file="${target.release.dir}/${release.zip}"
-            tofile="${upload.tmp.dir}/spring-webflow-${release.version}-${tstamp}.zip"/>
+            tofile="${upload.tmp.dir}/spring-webflow-${release.version}-${tstamp}-${build.number}.zip"/>
     </target>
     
     <target name="upload" depends="upload-binaries"/>
diff --git a/build-spring-webflow/build.xml b/build-spring-webflow/build.xml
index 84988737..badc1478 100644
--- a/build-spring-webflow/build.xml
+++ b/build-spring-webflow/build.xml
@@ -88,14 +88,14 @@ to see a list of all relevant targets.
 		</ivy:buildlist>
 
 		<tstamp>
-			<format property="build.timestamp" pattern="yyyyMMddHHmmss" />
+			<format property="internal.build.timestamp" pattern="yyyyMMddHHmmss" />
 		</tstamp>
 		<tstamp>
 			<format property="TSTAMPCOL" pattern="hh:mm" />
 		</tstamp>
 
 		<!-- default the release version (used in release archive zips) to the current timestamp -->
-		<property name="release.version" value="${build.timestamp}" />
+		<property name="release.version" value="${internal.build.timestamp}" />
 
 		<!-- root of build hierarchy -->
 		<property name="target.dir" value="${basedir}/target" />
diff --git a/common-build/common-targets.xml b/common-build/common-targets.xml
index ae073e43..70f814ab 100644
--- a/common-build/common-targets.xml
+++ b/common-build/common-targets.xml
@@ -59,14 +59,14 @@
 
   <target name="init.pre">
 
-    <!-- we default project.version to be ${project.base.version}-${build.timestamp}
+    <!-- we default project.version to be ${project.base.version}-${internal.build.timestamp}
        where project.base.version defaults to 1.0-dev.
        
        An importing project or master build should override project.base.version.
        For a release build which doesn't need the build timestamp, should override
        project.version itself to just be equal to ${project.base.version} -->
     <tstamp>
-      <format property="build.timestamp" pattern="yyyyMMddHHmmss" />
+      <format property="internal.build.timestamp" pattern="yyyyMMddHHmmss" />
     </tstamp>
     <tstamp>
       <format property="TSTAMPCOL" pattern="hh:mm" />
@@ -80,7 +80,7 @@
     <property name="project.webapp.name" value="${ant.project.name}" />
   	<property name="project.title" value="${project.name}" />
    	<property name="project.base.version" value="1.0-dev" />
-    <property name="project.version" value="${project.base.version}-${build.timestamp}" />
+    <property name="project.version" value="${project.base.version}-${internal.build.timestamp}" />
 	<property name="project.copyright" value="Copyright &#169; 2004-2007. All Rights Reserved."/>
   	
     <property environment="myenv" />