diff --git a/spring-integration-samples/pom.xml b/spring-integration-samples/pom.xml
index d4d2f8caf3..32d8017624 100644
--- a/spring-integration-samples/pom.xml
+++ b/spring-integration-samples/pom.xml
@@ -10,7 +10,7 @@
 	<name>Spring Integration Samples</name>
 	<properties>
 		<release.version>2.0.0.BUILD-SNAPSHOT</release.version>
-		<spring.framework.version>3.0.0.RELEASE</spring.framework.version>
+		<spring.framework.version>3.0.2.RELEASE</spring.framework.version>
 	</properties>
 	<modules>
 		<module>cafe</module>
@@ -20,7 +20,7 @@
 		<module>jms</module>
 		<module>oddeven</module>
 		<module>quote</module>
-		<module>ws</module>
+		<module>ws-outbound-gateway</module>
 		<module>xml</module>
 	</modules>
 
@@ -175,6 +175,5 @@
 			<url>http://repository.springsource.com/maven/bundles/snapshot</url>
 		</repository>
 	</repositories>
-	
 
 </project>
diff --git a/spring-integration-samples/ws-inbound-gateway/pom.xml b/spring-integration-samples/ws-inbound-gateway/pom.xml
index 55462e0732..7e3572f707 100644
--- a/spring-integration-samples/ws-inbound-gateway/pom.xml
+++ b/spring-integration-samples/ws-inbound-gateway/pom.xml
@@ -18,6 +18,11 @@
 			<version>${spring.framework.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>jivesoftware</groupId>
+			<artifactId>smackx</artifactId>
+			<version>3.1.0</version>
+		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
diff --git a/spring-integration-samples/ws/.classpath b/spring-integration-samples/ws-outbound-gateway/.classpath
similarity index 100%
rename from spring-integration-samples/ws/.classpath
rename to spring-integration-samples/ws-outbound-gateway/.classpath
diff --git a/spring-integration-samples/ws/.project b/spring-integration-samples/ws-outbound-gateway/.project
similarity index 93%
rename from spring-integration-samples/ws/.project
rename to spring-integration-samples/ws-outbound-gateway/.project
index ad57c89c3d..9730b83f00 100644
--- a/spring-integration-samples/ws/.project
+++ b/spring-integration-samples/ws-outbound-gateway/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ws</name>
+	<name>ws-outbound-gateway</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/spring-integration-samples/ws/pom.xml b/spring-integration-samples/ws-outbound-gateway/pom.xml
similarity index 91%
rename from spring-integration-samples/ws/pom.xml
rename to spring-integration-samples/ws-outbound-gateway/pom.xml
index 0a18347b69..f59ec1a239 100644
--- a/spring-integration-samples/ws/pom.xml
+++ b/spring-integration-samples/ws-outbound-gateway/pom.xml
@@ -6,8 +6,8 @@
 		<version>2.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>ws</groupId>
-	<artifactId>ws</artifactId>
+	<groupId>ws-outbound-gateway</groupId>
+	<artifactId>ws-outbound-gateway</artifactId>
 	<version>2.0.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
diff --git a/spring-integration-samples/ws/src/main/java/log4j.xml b/spring-integration-samples/ws-outbound-gateway/src/main/java/log4j.xml
similarity index 100%
rename from spring-integration-samples/ws/src/main/java/log4j.xml
rename to spring-integration-samples/ws-outbound-gateway/src/main/java/log4j.xml
diff --git a/spring-integration-samples/ws/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java b/spring-integration-samples/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java
similarity index 100%
rename from spring-integration-samples/ws/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java
rename to spring-integration-samples/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java
diff --git a/spring-integration-samples/ws/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml b/spring-integration-samples/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
similarity index 100%
rename from spring-integration-samples/ws/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
rename to spring-integration-samples/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml