From 607895204fcaf844cc986b2edb2ac5346af296ea Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Fri, 9 Oct 2009 15:33:13 +0000
Subject: [PATCH] INT-803 the 'cafe' and 'helloworld' samples now correctly
 include Spring context XML files in JAR

---
 spring-integration-samples/cafe/pom.xml       | 22 ++++++++++++-------
 spring-integration-samples/helloworld/pom.xml | 22 ++++++++++++-------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/spring-integration-samples/cafe/pom.xml b/spring-integration-samples/cafe/pom.xml
index 2dbcff50d1..5ecb6766fd 100644
--- a/spring-integration-samples/cafe/pom.xml
+++ b/spring-integration-samples/cafe/pom.xml
@@ -29,13 +29,19 @@
 			</plugin>
 		</plugins>
 		<resources>
-		<resource>
-			<filtering>false</filtering>
-			<directory>${basedir}/src/main/resources</directory>
-			<includes>
-				<include>META-INF/spring/*.xml</include>
-			</includes>
-		</resource>
-	</resources>
+			<resource>
+				<directory>${basedir}/src/main/java</directory>
+				<includes>
+					<include>**/*.xml</include>
+				</includes>
+			</resource>
+			<resource>
+				<filtering>false</filtering>
+				<directory>${basedir}/src/main/resources</directory>
+				<includes>
+					<include>META-INF/spring/*.xml</include>
+				</includes>
+			</resource>
+		</resources>
 	</build>
 </project>
\ No newline at end of file
diff --git a/spring-integration-samples/helloworld/pom.xml b/spring-integration-samples/helloworld/pom.xml
index ea890d860d..1e4ac4cd4e 100644
--- a/spring-integration-samples/helloworld/pom.xml
+++ b/spring-integration-samples/helloworld/pom.xml
@@ -30,14 +30,20 @@
 			</plugin>
 		</plugins>
 		<resources>
-		<resource>
-			<filtering>false</filtering>
-			<directory>${basedir}/src/main/resources</directory>
-			<includes>
-				<include>META-INF/spring/*.xml</include>
-			</includes>
-		</resource>
-	</resources>
+			<resource>
+				<directory>${basedir}/src/main/java</directory>
+				<includes>
+					<include>**/*.xml</include>
+				</includes>
+			</resource>
+			<resource>
+				<filtering>false</filtering>
+				<directory>${basedir}/src/main/resources</directory>
+				<includes>
+					<include>META-INF/spring/*.xml</include>
+				</includes>
+			</resource>
+		</resources>
 	</build>