From 98ce5a11ad193e6314eeafded0b378096dde426a Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 2 Jul 2009 16:14:24 +0000
Subject: [PATCH] Removed src dir from samples and moved the samples-copying
 into the main package build

---
 build-spring-integration/build.xml            |  1 -
 build-spring-integration/package-bundle.xml   | 16 +++++++++++++++
 .../build.xml                                 | 20 -------------------
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/build-spring-integration/build.xml b/build-spring-integration/build.xml
index c6bfd11157..59e0294cfe 100644
--- a/build-spring-integration/build.xml
+++ b/build-spring-integration/build.xml
@@ -15,7 +15,6 @@
 		<pathelement location="${basedir}/../org.springframework.integration.rmi"/>
 		<pathelement location="${basedir}/../org.springframework.integration.stream"/>
 		<pathelement location="${basedir}/../org.springframework.integration.ws"/>
-		<pathelement location="${basedir}/../org.springframework.integration.samples"/>
 	</path>
 
 	<property file="${basedir}/../build.properties"/>
diff --git a/build-spring-integration/package-bundle.xml b/build-spring-integration/package-bundle.xml
index df138977bf..e5c50ede81 100644
--- a/build-spring-integration/package-bundle.xml
+++ b/build-spring-integration/package-bundle.xml
@@ -12,6 +12,22 @@
 				<present targetdir="${package.dist.dir}"/>
 			</fileset>
 		</delete>
+		<mkdir dir="${package.output.dir}/samples" />
+		<copy todir="${package.output.dir}/samples">
+			<fileset dir="${basedir}/../org.springframework.integration.samples"> 
+				<include name="cafe/**" />
+				<include name="errorhandling/**"/>
+				<include name="filecopy/**"/>
+				<include name="helloworld/**"/>
+				<include name="jms/**"/>
+				<include name="oddeven/**"/>
+				<include name="quote/**"/>
+				<include name="ws/**"/>
+				<include name="xml/**"/>
+				<include name="pom.xml"/>
+				<include name="README.txt"/>
+			</fileset>
+		</copy>
 	</target>
 
 </project>
diff --git a/org.springframework.integration.samples/build.xml b/org.springframework.integration.samples/build.xml
index a18bea201a..b282dee7c9 100644
--- a/org.springframework.integration.samples/build.xml
+++ b/org.springframework.integration.samples/build.xml
@@ -2,7 +2,6 @@
 <project name="org.springframework.integration.samples">
 
 	<property file="${basedir}/../build.properties" />
-	<import file="${basedir}/../build-spring-integration/package-bundle.xml" />
 	<import file="${basedir}/../build-spring-integration/generate-pom.xml" />
 	<import file="${basedir}/../spring-build/standard/default.xml" />
 
@@ -12,25 +11,6 @@
 		</delete>
 	</target>
 
-	<target name="package" depends="package-bundle.package">
-		<mkdir dir="${package.output.dir}/samples" />
-		<copy todir="${package.output.dir}/samples">
-			<fileset dir="${basedir}"> 
-				<include name="cafe/**" />
-				<include name="errorhandling/**"/>
-				<include name="filecopy/**"/>
-				<include name="helloworld/**"/>
-				<include name="jms/**"/>
-				<include name="oddeven/**"/>
-				<include name="quote/**"/>
-				<include name="ws/**"/>
-				<include name="xml/**"/>
-				<include name="pom.xml"/>
-				<include name="README.txt"/>
-			</fileset>
-		</copy>
-	</target>
-
 </project>