From 91464927490fcccc5145dcbdc09f6b7671f0929d Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Wed, 28 Jul 2010 16:41:18 +0000
Subject: [PATCH] INT-1282 polished to accomodate recent refactoring changes
 related to IN-1229

---
 .../samples/jmx/JmxAdapterDemo-context.xml    |  6 ++--
 spring-integration-samples/loanshark/pom.xml  | 33 +++++++++++++++----
 .../META-INF/spring/integrationContext.xml    |  4 +--
 .../.settings/org.maven.ide.eclipse.prefs     |  4 +--
 4 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/spring-integration-samples/jmx/src/main/java/org/springframework/integration/samples/jmx/JmxAdapterDemo-context.xml b/spring-integration-samples/jmx/src/main/java/org/springframework/integration/samples/jmx/JmxAdapterDemo-context.xml
index cc8b33b8ed..4ef1364d55 100644
--- a/spring-integration-samples/jmx/src/main/java/org/springframework/integration/samples/jmx/JmxAdapterDemo-context.xml
+++ b/spring-integration-samples/jmx/src/main/java/org/springframework/integration/samples/jmx/JmxAdapterDemo-context.xml
@@ -30,8 +30,8 @@
 
 	<si:filter input-channel="seconds" expression="payload >= 10" output-channel="reset"/>
 
-	<jmx:operation-invoking-channel-adapter id="reset"
-			default-object-name="org.springframework.integration.samples.jmx:type=StopWatch,name=stopWatch"
-			default-operation-name="reset"/>
+	<jmx:operation-invoking-channel-adapter id="reset" 
+			object-name="org.springframework.integration.samples.jmx:type=StopWatch,name=stopWatch"
+			operation-name="reset"/>
 
 </beans>
\ No newline at end of file
diff --git a/spring-integration-samples/loanshark/pom.xml b/spring-integration-samples/loanshark/pom.xml
index 1114e627cb..4472161a69 100644
--- a/spring-integration-samples/loanshark/pom.xml
+++ b/spring-integration-samples/loanshark/pom.xml
@@ -11,6 +11,11 @@
 	<name>Spring Integration Loan Shark Sample</name>
 	<packaging>war</packaging>
 	<dependencies>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-entitymanager</artifactId>
+			<version>3.3.2.GA</version>
+		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
@@ -23,7 +28,7 @@
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
 			<version>2.5</version>
-			<scope>provided</scope>   
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<!-- available only in EBR. see <repositories> section at bottom -->
@@ -116,7 +121,9 @@
 			<version>1.0</version>
 		</dependency>
 		<dependency>
-			<!-- available only in JBoss repository. see <repositories> section below -->
+			<!--
+				available only in JBoss repository. see <repositories> section below
+			-->
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
 			<version>4.0.0.GA</version>
@@ -184,7 +191,10 @@
 			<version>3.1.0</version>
 		</dependency>
 		<dependency>
-			<!-- available only in glassfish repository. see <repositories> section below -->
+			<!--
+				available only in glassfish repository. see <repositories> section
+				below
+			-->
 			<groupId>javax.servlet.jsp.jstl</groupId>
 			<artifactId>jstl-api</artifactId>
 			<version>1.2</version>
@@ -240,7 +250,10 @@
 				<artifactId>aspectj-maven-plugin</artifactId>
 				<version>1.0</version>
 				<dependencies>
-					<!-- NB: You must use Maven 2.0.9 or above or these are ignored (see MNG-2972) -->
+					<!--
+						NB: You must use Maven 2.0.9 or above or these are ignored (see
+						MNG-2972)
+					-->
 					<dependency>
 						<groupId>org.aspectj</groupId>
 						<artifactId>aspectjrt</artifactId>
@@ -359,15 +372,21 @@
 			<id>repository.jboss</id>
 			<name>JBoss Repository</name>
 			<url>http://repository.jboss.org/maven2</url>
-			<releases><enabled>true</enabled></releases>
-			<snapshots><enabled>false</enabled></snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
 		</repository>
 		<repository>
 			<!-- necessary for jstl-api dependency -->
 			<id>repository.glassfish</id>
 			<name>Glassfish Repository</name>
 			<url>http://download.java.net/maven/glassfish</url>
-			<snapshots><enabled>false</enabled></snapshots>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
 		</repository>
 		<repository>
 			<id>repository.springframework.maven.release</id>
diff --git a/spring-integration-samples/loanshark/src/main/resources/META-INF/spring/integrationContext.xml b/spring-integration-samples/loanshark/src/main/resources/META-INF/spring/integrationContext.xml
index 646b004617..99f07301de 100644
--- a/spring-integration-samples/loanshark/src/main/resources/META-INF/spring/integrationContext.xml
+++ b/spring-integration-samples/loanshark/src/main/resources/META-INF/spring/integrationContext.xml
@@ -24,7 +24,7 @@
 		input-channel="transformedChannel"
 		ref="accumulator" />
 		
-	<bean id="accumulator" class="com.springframework.integration.loanbroker.samples.loanshark.biz.Accumulator" />
-	<bean id="transformer" class="com.springframework.integration.loanbroker.samples.loanshark.biz.SharkTransformer" />
+	<bean id="accumulator" class="com.springframework.integration.samples.loanbroker.loanshark.biz.Accumulator" />
+	<bean id="transformer" class="com.springframework.integration.samples.loanbroker.loanshark.biz.SharkTransformer" />
 		
 </beans>
diff --git a/spring-integration-samples/ws-inbound-gateway/.settings/org.maven.ide.eclipse.prefs b/spring-integration-samples/ws-inbound-gateway/.settings/org.maven.ide.eclipse.prefs
index 36f3af1cf1..3555c41515 100644
--- a/spring-integration-samples/ws-inbound-gateway/.settings/org.maven.ide.eclipse.prefs
+++ b/spring-integration-samples/ws-inbound-gateway/.settings/org.maven.ide.eclipse.prefs
@@ -1,9 +1,9 @@
-#Thu Feb 25 18:31:04 PST 2010
+#Wed Jul 28 12:38:49 EDT 2010
 activeProfiles=
 eclipse.preferences.version=1
 fullBuildGoals=process-test-resources
 includeModules=false
-resolveWorkspaceProjects=true
+resolveWorkspaceProjects=false
 resourceFilterGoals=process-resources resources\:testResources
 skipCompilerPlugin=true
 version=1