From 63ff338dda9b118242ded892d202c6541324972f Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Mon, 1 Feb 2010 19:59:05 +0000
Subject: [PATCH] with dependencies distribution added

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2898 50f2f4bb-b051-0410-bef5-90022cba6387
---
 build-spring-framework/package-top-level.xml | 8 ++++----
 build-spring-framework/publish-top-level.xml | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build-spring-framework/package-top-level.xml b/build-spring-framework/package-top-level.xml
index 333e7d40185..1d690f2f0fe 100644
--- a/build-spring-framework/package-top-level.xml
+++ b/build-spring-framework/package-top-level.xml
@@ -40,8 +40,7 @@
 			<fileset dir="${basedir}/..">
 				<exclude name="*/target/**"/>
 				<exclude name="integration-repo/**"/>
-				<exclude name="ivy-cache/**"/>
-				<!--exclude name="ivy-cache/repository/org.apache.velocity/org.apache.velocity.docbookframework.dist/**"/-->
+				<exclude name="ivy-cache/repository/org.apache.velocity/org.apache.velocity.docbookframework.dist/**"/>
 				<exclude name="spring-build/lib/docbook/**" />
 				<exclude name="**/*OLD*/**"/>
 			</fileset>
@@ -66,9 +65,10 @@
 			</zipfileset>
 		</zip>
 
-		<!--zip destfile="${artifacts.dir}/${package.basename}-with-dependencies.zip">
+		<zip destfile="${artifacts.dir}/${package.basename}-with-dependencies.zip">
 			<zipfileset dir="${package.dir}"/>
-		</zip-->
+		</zip>
+		
 	</target>
 
 </project>
diff --git a/build-spring-framework/publish-top-level.xml b/build-spring-framework/publish-top-level.xml
index 8a8c042921f..c3505a39b53 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}-with-dependencies.zip" algorithm="sha1"/>
 		
 		<aws:s3 accessKey="${accessKey}" secretKey="${secretKey}">
 			<upload bucketName="dist.${bucket.basename}" file="${package.output.file}"
@@ -30,7 +30,7 @@
 			<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"
+			<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">
 				<metadata name="project.name" value="Spring Framework"/>
 				<metadata name="release.type" value="${release.type}"/>
@@ -38,7 +38,7 @@
 				<metadata name="package.file.name" value="${package.basename}-with-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"/-->
+					toFile="${adjusted.release.type}/${project.key}/${package.basename}-with-dependencies.zip.sha1" publicRead="true"/>
 		</aws:s3>
 	</target>
 </project>