Publishing changes

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@209 50f2f4bb-b051-0410-bef5-90022cba6387

build-spring-framework/build.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="build-spring-webflow" default="precommit">
+<project name="build-spring-framework" default="precommit">
 
 	<path id="bundles">
 		<pathelement location="../org.springframework.instrument"/>
@@ -26,6 +26,6 @@
 	<import file="${basedir}/publish-top-level.xml"/>
 	<import file="${basedir}/../spring-build/multi-bundle/default.xml"/>
 
-	<target name="precommit" depends="clean,clean-integration,jar,test"/>
+	<target name="precommit" depends="clean,clean-integration,test"/>
 
 </project>

build-spring-framework/ivy.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="http://www.jayasoft.org/misc/ivy/samples/ivy.xsd">
-
-	<info organisation="org.springframework" module="build-spring-webflow" />
-
-	<configurations>
-		<conf name="default" extends="global" />
-		<conf name="global" visibility="private" />
-		<conf name="buildtime" visibility="private" />
-		<conf name="test" visibility="private" />
-	</configurations>
-	
-	<dependencies defaultconf="global->default">
-		<dependency org="org.springframework.aws" name="spring-aws-ant" rev="1.0.2"/>
-	</dependencies>
-</ivy-module>

build-spring-framework/package-top-level.xml

@@ -15,7 +15,7 @@
 			<property name="target.dir" value="${package.docs.dir}"/>
 		</ant>
 
-		<ant dir="../spring-framework-reference" target="doc" inheritAll="false">
+		<!--ant dir="../spring-framework-reference" target="doc" inheritAll="false">
 			<property name="package.output.dir" value="${package.output.dir}"/>
 			<propertyset>
 				<propertyref builtin="commandline"/>
@@ -29,7 +29,7 @@
 				<propertyref builtin="commandline"/>
 			</propertyset>
 			<property name="timestamp" value="${timestamp}"/>
-		</subant>
+		</subant-->
 
 		<copy todir="${package.output.dir}">
 			<fileset dir="${basedir}/resources"/>
@@ -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,9 +52,21 @@
 				file="${package.output.dir}/projects/build.properties"/>
 
 		<zip destfile="${package.output.file}">
-			<zipfileset dir="${package.dir}"/>
+			<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>
+		</zip>
+
+		<zip destfile="${artifacts.dir}/${package.basename}-with-dependencies.zip">
+			<zipfileset dir="${package.dir}"/>
+		</zip>
 	</target>
 
 </project>

build-spring-framework/publish-top-level.xml

@@ -4,4 +4,41 @@
 	<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-docs.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}"
+					toFile="${adjusted.release.type}/${project.key}/${package.file.name}" 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.file.name}"/>
+			</upload>
+			<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-docs.zip"
+					toFile="${adjusted.release.type}/${project.key}/${package.basename}-with-docs.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-docs.zip"/>
+			</upload>
+			<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">
+				<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"/>
+			</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"/>
+		</aws:s3>
+	</target>
 </project>

build-spring-framework/readme.txt

@@ -1,13 +1,13 @@
 This is where the master build that creates releases of Spring Framework resides.  The build system is based on spring-build, which is linked in using an SVN external to https://src.springframework.org/svn/spring-build.
 
 USERS
-- To build all Spring Web Flow projects, including samples:
+- To build all Spring Framework projects, including samples:
 
     1. From this directory, run:
        ant
         
 Build Pre-requisites:
-- javac 1.5 or > must be in your system path
+- javac 1.6 or > must be in your system path
 - ant 1.7 or > must be in your system path
 
 DEVELOPERS