From 2f1ed2015f4f4a06ed721f53a55e9d0db679edaf Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Mon, 24 Jan 2011 11:14:29 +0000
Subject: [PATCH] SWF-1446 Make it easy to install Maven-central style
 dependencies locally

---
 build-spring-webflow/publish-artifact.xml  | 12 ++++++++++++
 build-spring-webflow/publish-top-level.xml |  4 ++++
 readme.txt                                 | 15 ++++++++++++++-
 spring-binding/build.xml                   |  1 +
 spring-js/build.xml                        |  1 +
 spring-webflow-library/build.xml           |  2 ++
 spring-webflow-samples/readme.txt          |  7 +++----
 spring-webflow/build.xml                   |  1 +
 spring-webflow/pom.xml                     | 19 ++++++++++++++++---
 9 files changed, 54 insertions(+), 8 deletions(-)
 create mode 100644 build-spring-webflow/publish-artifact.xml

diff --git a/build-spring-webflow/publish-artifact.xml b/build-spring-webflow/publish-artifact.xml
new file mode 100644
index 00000000..e8159d09
--- /dev/null
+++ b/build-spring-webflow/publish-artifact.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="publish-bundle" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:maven="antlib:org.apache.maven.artifact.ant">
+
+	<target name="publish-maven-central-local" depends="maven.init">
+		<property name="maven.central.repository" value="s3://maven.springframework.org/${adjusted.release.type}"/>
+		<maven:install file="${jar.output.file}">
+			<pom file="${local.pom.output.file}"/>
+			<attach file="${source-jar.output.file}" classifier="sources"/>
+		</maven:install>
+	</target>
+
+</project>
diff --git a/build-spring-webflow/publish-top-level.xml b/build-spring-webflow/publish-top-level.xml
index c882de6f..9b04354b 100644
--- a/build-spring-webflow/publish-top-level.xml
+++ b/build-spring-webflow/publish-top-level.xml
@@ -29,5 +29,9 @@
 					toFile="${adjusted.release.type}/${project.key}/${package.basename}-with-dependencies.zip.sha1" publicRead="true"/>
 		</aws:s3>
 	</target>
+	
+	<target name="publish-maven-central-local">
+		<all-bundles target="publish-maven-central-local"/>
+	</target>	
 
 </project>
diff --git a/readme.txt b/readme.txt
index 70f5a8eb..cbfc5bed 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,9 +1,9 @@
 Contained in this directory are the Spring Web Flow (SWF) related project sources.
 
 DIRECTORIES
+-----------
 
 1. build-spring-webflow - Contains the metadata needed to build the SWF projects using spring-build.
-                          To build all projects, simply run 'ant' (version 1.7 or >) in this directory.
 
 2. spring-build - A linked in SVN external to Spring's master build system. 
                   Used to power the build for all Spring projects.
@@ -19,3 +19,16 @@ DIRECTORIES
 7. spring-faces - Spring's JavaServerFaces integration module, which includes Web Flow & JavaScript support.
 
 8. spring-webflow-samples - The Spring Web Flow sample applications, illustrating the framework in action.
+
+
+BUILDING
+--------
+
+To build all projects, cd to build-spring-webflow and run the following with ant (version 1.7 or >):
+
+ant clean clean-integration jar
+
+To install all jars as local Maven dependencies:
+
+ant clean clean-integration jar publish-maven-central-local
+
diff --git a/spring-binding/build.xml b/spring-binding/build.xml
index 34b1b8e5..86df9f50 100644
--- a/spring-binding/build.xml
+++ b/spring-binding/build.xml
@@ -3,6 +3,7 @@
 
 	<property file="${basedir}/../build.properties"/>
 	<import file="${basedir}/../build-spring-webflow/package-bundle.xml"/>
+	<import file="${basedir}/../build-spring-webflow/publish-artifact.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
 
 </project>
diff --git a/spring-js/build.xml b/spring-js/build.xml
index 7512923f..c1bbcd67 100644
--- a/spring-js/build.xml
+++ b/spring-js/build.xml
@@ -3,6 +3,7 @@
 
 	<property file="${basedir}/../build.properties"/>
 	<import file="${basedir}/../build-spring-webflow/package-bundle.xml"/>
+	<import file="${basedir}/../build-spring-webflow/publish-artifact.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
 
 </project>
diff --git a/spring-webflow-library/build.xml b/spring-webflow-library/build.xml
index 4c0948de..5f8f79b7 100644
--- a/spring-webflow-library/build.xml
+++ b/spring-webflow-library/build.xml
@@ -6,6 +6,8 @@
 
 	<target name="publish-maven-central"/>
 
+	<target name="publish-maven-central-local"/>
+
 	<target name="install-maven-central"/>
 
 </project>
diff --git a/spring-webflow-samples/readme.txt b/spring-webflow-samples/readme.txt
index 897b4e26..087587d8 100644
--- a/spring-webflow-samples/readme.txt
+++ b/spring-webflow-samples/readme.txt
@@ -13,11 +13,10 @@ Sample pre-requisites:
 * JDK 1.5 or > must be installed and in your system path
 * Ant 1.7 or > must be installed and in your system path
 
-To build the samples:
----------------------
-Running 'mvn package' from the this directory builds all samples.
+Build Samples with Maven Central Dependencies:
+----------------------------------------------
+Run 'mvn package' from the this directory to build all samples against Maven central dependencies.
 You can find .war files under the appropriate '<sample>/target' directory.
-Samples can be built individually by running 'mvn package' from the sample sub-directory.
 
 To import the samples into Eclipse:
 -----------------------------------
diff --git a/spring-webflow/build.xml b/spring-webflow/build.xml
index 53c2796d..2e162434 100644
--- a/spring-webflow/build.xml
+++ b/spring-webflow/build.xml
@@ -3,6 +3,7 @@
 
 	<property file="${basedir}/../build.properties"/>
 	<import file="${basedir}/../build-spring-webflow/package-bundle.xml"/>
+	<import file="${basedir}/../build-spring-webflow/publish-artifact.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
 
 </project>
diff --git a/spring-webflow/pom.xml b/spring-webflow/pom.xml
index 43efb2f5..00ff7799 100644
--- a/spring-webflow/pom.xml
+++ b/spring-webflow/pom.xml
@@ -225,13 +225,26 @@
 				</executions>
 			</plugin>
 		</plugins>
-		<testResources>
-			<testResource>
+		<resources>
+			<resource>
+				<filtering>false</filtering>
 				<directory>src/main/java</directory>
 				<includes>
 					<include>**/*.xsd</include>
 				</includes>
-			</testResource>
+				<excludes>
+					<exclude>**/.svn/**</exclude>
+				</excludes>
+			</resource>
+			<resource>
+				<filtering>false</filtering>
+				<directory>src/main/resources</directory>
+				<includes>
+					<include>META-INF/spring.*</include>
+				</includes>
+			</resource>
+		</resources>
+		<testResources>
 			<testResource>
 				<directory>src/test/java</directory>
 				<includes>