From af2eafabbe610afc904544c6cd7dcc616d2b4920 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Fri, 28 May 2010 18:13:24 +0000
Subject: [PATCH] more minor tweaks; still experience some issues with
 deploying loanshark to tomcat within STS

---
 .../.settings/org.eclipse.wst.common.component       |  4 +---
 spring-integration-samples/loanshark/pom.xml         | 12 ++++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/spring-integration-samples/loanshark/.settings/org.eclipse.wst.common.component b/spring-integration-samples/loanshark/.settings/org.eclipse.wst.common.component
index 4fe5ca7bd4..7b21d54e66 100644
--- a/spring-integration-samples/loanshark/.settings/org.eclipse.wst.common.component
+++ b/spring-integration-samples/loanshark/.settings/org.eclipse.wst.common.component
@@ -186,10 +186,8 @@
     </dependent-module>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
-        <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
   </wb-module>
 </project-modules>
diff --git a/spring-integration-samples/loanshark/pom.xml b/spring-integration-samples/loanshark/pom.xml
index f63605cbe0..92cba59605 100644
--- a/spring-integration-samples/loanshark/pom.xml
+++ b/spring-integration-samples/loanshark/pom.xml
@@ -151,6 +151,14 @@
 			<artifactId>org.springframework.js</artifactId>
 			<version>2.0.8.RELEASE</version>
 			<exclusions>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>org.springframework.core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>org.springframework.beans</artifactId>
+				</exclusion>
 				<exclusion>
 					<groupId>org.springframework</groupId>
 					<artifactId>org.springframework.context</artifactId>
@@ -159,6 +167,10 @@
 					<groupId>org.springframework</groupId>
 					<artifactId>org.springframework.web</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>org.springframework.web.servlet</artifactId>
+				</exclusion>
 				<exclusion>
 					<groupId>org.apache.commons</groupId>
 					<artifactId>com.springsource.org.apache.commons.logging</artifactId>