From d1ac39f631063d869d13c49a03efee15f3b86c65 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Fri, 9 Oct 2009 15:41:12 +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       | 26 ++++++++++++-------
 .../errorhandling/pom.xml                     |  4 +--
 spring-integration-samples/filecopy/pom.xml   |  4 +--
 spring-integration-samples/helloworld/pom.xml | 26 ++++++++++++-------
 spring-integration-samples/jms/pom.xml        |  4 +--
 spring-integration-samples/oddeven/pom.xml    |  4 +--
 spring-integration-samples/pom.xml            |  4 +--
 spring-integration-samples/quote/pom.xml      |  4 +--
 spring-integration-samples/ws/pom.xml         |  4 +--
 spring-integration-samples/xml/pom.xml        |  4 +--
 10 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/spring-integration-samples/cafe/pom.xml b/spring-integration-samples/cafe/pom.xml
index fdaef72c42..ce395e4ee1 100644
--- a/spring-integration-samples/cafe/pom.xml
+++ b/spring-integration-samples/cafe/pom.xml
@@ -2,12 +2,12 @@
   <parent>
     <artifactId>spring-integration-samples</artifactId>
     <groupId>org.springframework.integration</groupId>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>cafe</groupId>
   <artifactId>cafe</artifactId>
-  <version>1.0.3</version>
+  <version>1.0.4</version>
   <dependencies>
 		<dependency>
 			<groupId>org.eclipse.osgi</groupId>
@@ -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/errorhandling/pom.xml b/spring-integration-samples/errorhandling/pom.xml
index d568f774d8..c330dbcff8 100644
--- a/spring-integration-samples/errorhandling/pom.xml
+++ b/spring-integration-samples/errorhandling/pom.xml
@@ -2,10 +2,10 @@
   <parent>
     <artifactId>spring-integration-samples</artifactId>
     <groupId>org.springframework.integration</groupId>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>errorhandling</groupId>
   <artifactId>errorhandling</artifactId>
-  <version>1.0.3</version>
+  <version>1.0.4</version>
 </project>
\ No newline at end of file
diff --git a/spring-integration-samples/filecopy/pom.xml b/spring-integration-samples/filecopy/pom.xml
index 59e19f1338..9b768c4352 100644
--- a/spring-integration-samples/filecopy/pom.xml
+++ b/spring-integration-samples/filecopy/pom.xml
@@ -2,10 +2,10 @@
   <parent>
     <artifactId>spring-integration-samples</artifactId>
     <groupId>org.springframework.integration</groupId>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>filecopy</groupId>
   <artifactId>filecopy</artifactId>
-  <version>1.0.3</version>
+  <version>1.0.4</version>
 </project>
\ No newline at end of file
diff --git a/spring-integration-samples/helloworld/pom.xml b/spring-integration-samples/helloworld/pom.xml
index 017cd5bbdf..fada47a202 100644
--- a/spring-integration-samples/helloworld/pom.xml
+++ b/spring-integration-samples/helloworld/pom.xml
@@ -3,12 +3,12 @@
 	<parent>
 		<artifactId>spring-integration-samples</artifactId>
 		<groupId>org.springframework.integration</groupId>
-		<version>1.0.3</version>
+		<version>1.0.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>helloworld</groupId>
 	<artifactId>helloworld</artifactId>
-	<version>1.0.3</version>
+	<version>1.0.4</version>
 	<dependencies>
 		<dependency>
 			<groupId>org.eclipse.osgi</groupId>
@@ -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>
 	
 	
diff --git a/spring-integration-samples/jms/pom.xml b/spring-integration-samples/jms/pom.xml
index 0ed613d54a..30b280fe6e 100644
--- a/spring-integration-samples/jms/pom.xml
+++ b/spring-integration-samples/jms/pom.xml
@@ -3,12 +3,12 @@
 	<parent>
 		<artifactId>spring-integration-samples</artifactId>
 		<groupId>org.springframework.integration</groupId>
-		<version>1.0.3</version>
+		<version>1.0.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>jms</groupId>
 	<artifactId>jms</artifactId>
-	<version>1.0.3</version>
+	<version>1.0.4</version>
 	<dependencies>
 		<dependency>
 			<groupId>javax.jms</groupId>
diff --git a/spring-integration-samples/oddeven/pom.xml b/spring-integration-samples/oddeven/pom.xml
index 6a3525aa3b..07b041a0a1 100644
--- a/spring-integration-samples/oddeven/pom.xml
+++ b/spring-integration-samples/oddeven/pom.xml
@@ -2,10 +2,10 @@
   <parent>
     <artifactId>spring-integration-samples</artifactId>
     <groupId>org.springframework.integration</groupId>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>oddeven</groupId>
   <artifactId>oddeven</artifactId>
-  <version>1.0.3</version>
+  <version>1.0.4</version>
 </project>
\ No newline at end of file
diff --git a/spring-integration-samples/pom.xml b/spring-integration-samples/pom.xml
index 28746e05d2..a48e852154 100644
--- a/spring-integration-samples/pom.xml
+++ b/spring-integration-samples/pom.xml
@@ -5,11 +5,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration</groupId>
 	<artifactId>spring-integration-samples</artifactId>
-	<version>1.0.3</version>
+	<version>1.0.4</version>
 	<packaging>pom</packaging>
 	<name>Spring Integration Samples</name>
 	<properties>
-		<release.version>1.0.3.RELEASE</release.version>
+		<release.version>1.0.4.RELEASE</release.version>
 	</properties>
 	<modules>
 		<module>cafe</module>
diff --git a/spring-integration-samples/quote/pom.xml b/spring-integration-samples/quote/pom.xml
index 51016cdb12..dd8979a370 100644
--- a/spring-integration-samples/quote/pom.xml
+++ b/spring-integration-samples/quote/pom.xml
@@ -2,10 +2,10 @@
   <parent>
     <artifactId>spring-integration-samples</artifactId>
     <groupId>org.springframework.integration</groupId>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>quote</groupId>
   <artifactId>quote</artifactId>
-  <version>1.0.3</version>
+  <version>1.0.4</version>
 </project>
\ No newline at end of file
diff --git a/spring-integration-samples/ws/pom.xml b/spring-integration-samples/ws/pom.xml
index 628ec319d4..ddefcdac6f 100644
--- a/spring-integration-samples/ws/pom.xml
+++ b/spring-integration-samples/ws/pom.xml
@@ -3,12 +3,12 @@
 	<parent>
 		<artifactId>spring-integration-samples</artifactId>
 		<groupId>org.springframework.integration</groupId>
-		<version>1.0.3</version>
+		<version>1.0.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ws</groupId>
 	<artifactId>ws</artifactId>
-	<version>1.0.3</version>
+	<version>1.0.4</version>
 	<dependencies>
 		<dependency>
 			<groupId>javax.xml.soap</groupId>
diff --git a/spring-integration-samples/xml/pom.xml b/spring-integration-samples/xml/pom.xml
index b326ab6254..4427e242bd 100644
--- a/spring-integration-samples/xml/pom.xml
+++ b/spring-integration-samples/xml/pom.xml
@@ -2,10 +2,10 @@
   <parent>
     <artifactId>spring-integration-samples</artifactId>
     <groupId>org.springframework.integration</groupId>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>xml</groupId>
   <artifactId>xml</artifactId>
-  <version>1.0.3</version>
+  <version>1.0.4</version>
 </project>
\ No newline at end of file