From 63f574e7419fb58ccb73cb7bedb94c05cd28e954 Mon Sep 17 00:00:00 2001
From: Ben Hale <bhale@vmware.com>
Date: Wed, 10 Feb 2010 11:38:33 +0000
Subject: [PATCH] Updated spring-build to see new maven targets

---
 build-spring-framework/package-top-level.xml | 13 ++++++-------
 build-spring-framework/publish-top-level.xml | 12 ++++++------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/build-spring-framework/package-top-level.xml b/build-spring-framework/package-top-level.xml
index 1d690f2f0fe..07863c71af3 100644
--- a/build-spring-framework/package-top-level.xml
+++ b/build-spring-framework/package-top-level.xml
@@ -40,7 +40,7 @@
 			<fileset dir="${basedir}/..">
 				<exclude name="*/target/**"/>
 				<exclude name="integration-repo/**"/>
-				<exclude name="ivy-cache/repository/org.apache.velocity/org.apache.velocity.docbookframework.dist/**"/>
+				<exclude name="ivy-cache/**"/>
 				<exclude name="spring-build/lib/docbook/**" />
 				<exclude name="**/*OLD*/**"/>
 			</fileset>
@@ -55,18 +55,17 @@
 		<zip destfile="${package.output.file}">
 			<zipfileset dir="${package.dir}">
 				<exclude name="${package.basename}/docs/**"/>
-				<exclude name="${package.basename}/projects/ivy-cache/**"/>
 			</zipfileset>
 		</zip>
 		
 		<zip destfile="${artifacts.dir}/${package.basename}-with-docs.zip">
-			<zipfileset dir="${package.dir}">
-				<exclude name="${package.basename}/projects/ivy-cache/**"/>
-			</zipfileset>
+			<zipfileset dir="${package.dir}"/>
 		</zip>
 
-		<zip destfile="${artifacts.dir}/${package.basename}-with-dependencies.zip">
-			<zipfileset dir="${package.dir}"/>
+		<zip destfile="${artifacts.dir}/${package.basename}-dependencies.zip">
+			<zipfileset dir="${basedir}/../ivy-cache/repository">
+				<exclude name="org.apache.velocity/org.apache.velocity.docbookframework.dist/**"/>
+			</zipfileset>
 		</zip>
 		
 	</target>
diff --git a/build-spring-framework/publish-top-level.xml b/build-spring-framework/publish-top-level.xml
index c3505a39b53..c6a6cbb49ef 100644
--- a/build-spring-framework/publish-top-level.xml
+++ b/build-spring-framework/publish-top-level.xml
@@ -7,7 +7,7 @@
 	<target name="publish-package" depends="aws.init">
 		<checksum file="${package.output.file}" algorithm="sha1"/>
 		<checksum file="${artifacts.dir}/${package.basename}-with-docs.zip" algorithm="sha1"/>
-		<checksum file="${artifacts.dir}/${package.basename}-with-dependencies.zip" algorithm="sha1"/>
+		<checksum file="${artifacts.dir}/${package.basename}-dependencies.zip" algorithm="sha1"/>
 		
 		<aws:s3 accessKey="${accessKey}" secretKey="${secretKey}">
 			<upload bucketName="dist.${bucket.basename}" file="${package.output.file}"
@@ -30,15 +30,15 @@
 			<upload bucketName="dist.${bucket.basename}" file="${artifacts.dir}/${package.basename}-with-docs.zip.sha1"
 					toFile="${adjusted.release.type}/${project.key}/${package.basename}-with-docs.zip.sha1" publicRead="true"/>
 
-			<upload bucketName="dist.${bucket.basename}" file="${artifacts.dir}/${package.basename}-with-dependencies.zip"
-					toFile="${adjusted.release.type}/${project.key}/${package.basename}-with-dependencies.zip" publicRead="true">
+			<upload bucketName="dist.${bucket.basename}" file="${artifacts.dir}/${package.basename}-dependencies.zip"
+					toFile="${adjusted.release.type}/${project.key}/${package.basename}-dependencies.zip" publicRead="true">
 				<metadata name="project.name" value="Spring Framework"/>
 				<metadata name="release.type" value="${release.type}"/>
 				<metadata name="bundle.version" value="${bundle.version}"/>
-				<metadata name="package.file.name" value="${package.basename}-with-dependencies.zip"/>
+				<metadata name="package.file.name" value="${package.basename}-dependencies.zip"/>
 			</upload>
-			<upload bucketName="dist.${bucket.basename}" file="${artifacts.dir}/${package.basename}-with-dependencies.zip.sha1"
-					toFile="${adjusted.release.type}/${project.key}/${package.basename}-with-dependencies.zip.sha1" publicRead="true"/>
+			<upload bucketName="dist.${bucket.basename}" file="${artifacts.dir}/${package.basename}-dependencies.zip.sha1"
+					toFile="${adjusted.release.type}/${project.key}/${package.basename}-dependencies.zip.sha1" publicRead="true"/>
 		</aws:s3>
 	</target>
 </project>