From 3ca59b550d982c1ae9bfe3235f6edbb3f24c565e Mon Sep 17 00:00:00 2001
From: Ben Hale <bhale@vmware.com>
Date: Thu, 21 Aug 2008 15:55:43 +0000
Subject: [PATCH] with-dependencies build

---
 build-spring-webflow/package-top-level.xml |  8 +++++++-
 build-spring-webflow/publish-top-level.xml | 17 ++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/build-spring-webflow/package-top-level.xml b/build-spring-webflow/package-top-level.xml
index 5bebf138..ebc93a34 100644
--- a/build-spring-webflow/package-top-level.xml
+++ b/build-spring-webflow/package-top-level.xml
@@ -38,8 +38,8 @@
 		<copy todir="${package.output.dir}/projects">
 			<fileset dir="${basedir}/..">
 				<exclude name="**/target/**"/>
-				<exclude name="ivy-cache/**"/>
 				<exclude name="integration-repo/**"/>
+				<exclude name="ivy-cache/repository/org.apache.velocity/org.apache.velocity.docbookframework.dist/**"/>
 				<exclude name="spring-build/lib/docbook/**" />
 				<exclude name="**/*OLD*/**"/>
 			</fileset>
@@ -52,6 +52,12 @@
 				file="${package.output.dir}/projects/build.properties"/>
 
 		<zip destfile="${package.output.file}">
+			<zipfileset dir="${package.dir}">
+				<exclude name="${package.basename}/projects/ivy-cache/**"/>
+			</zipfileset>
+		</zip>
+
+		<zip destfile="${artifacts.dir}/${package.basename}-with-dependencies.zip">
 			<zipfileset dir="${package.dir}"/>
 		</zip>
 	</target>
diff --git a/build-spring-webflow/publish-top-level.xml b/build-spring-webflow/publish-top-level.xml
index 1f39333b..366a7794 100644
--- a/build-spring-webflow/publish-top-level.xml
+++ b/build-spring-webflow/publish-top-level.xml
@@ -1,7 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="publish-top-level">
+<project name="publish-top-level" xmlns:aws="antlib:org.springframework.build.aws">
 
 	<target name="publish" depends="publish-multi-bundle.publish, publish-package"
 			description="Publish package, Ivy, and Maven artifacts"/>
 
+	<target name="publish-package" depends="aws.init">
+		<checksum file="${package.output.file}" algorithm="sha1"/>
+		<checksum file="${artifacts.dir}/${package.basename}-with-dependencies.zip" algorithm="sha1"/>
+		<aws:s3 accessKey="${accessKey}" secretKey="${secretKey}">
+			<upload bucketName="dist.${bucket.basename}" file="${package.output.file}"
+					toFile="${adjusted.release.type}/${project.key}/${package.file.name}" publicRead="true"/>
+			<upload bucketName="dist.${bucket.basename}" file="${package.output.file}.sha1"
+					toFile="${adjusted.release.type}/${project.key}/${package.file.name}.sha1" publicRead="true"/>
+			<upload bucketName="dist.${bucket.basename}" file="${artifacts.dir}/${package.basename}-with-dependencies.zip"
+					toFile="${adjusted.release.type}/${project.key}/${artifacts.dir}/${package.basename}-with-dependencies.zip" publicRead="true"/>
+			<upload bucketName="dist.${bucket.basename}" file="${artifacts.dir}/${package.basename}-with-dependencies.zip.sha1"
+					toFile="${adjusted.release.type}/${project.key}/${artifacts.dir}/${package.basename}-with-dependencies.zip.sha1" publicRead="true"/>
+		</aws:s3>
+	</target>
+
 </project>