diff --git a/spring-integration-samples/osgi-inbound/src/META-INF/spring/osgi-inbound.xml b/spring-integration-samples/osgi-inbound/src/META-INF/spring/osgi-inbound.xml
index c8898e8ba0..d7f8873403 100644
--- a/spring-integration-samples/osgi-inbound/src/META-INF/spring/osgi-inbound.xml
+++ b/spring-integration-samples/osgi-inbound/src/META-INF/spring/osgi-inbound.xml
@@ -1,23 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:osgi="http://www.springframework.org/schema/osgi"
 	xmlns:integration="http://www.springframework.org/schema/integration"
-	xmlns:file="http://www.springframework.org/schema/integration/file"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
 		http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
-		http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd">
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+
+    <osgi:service id="inboundService" ref="inboundChannel"
+    		interface="org.springframework.integration.channel.SubscribableChannel"/>
+
+	<integration:publish-subscribe-channel id="inboundChannel"/>
 
 	<integration:gateway id="inboundGateway"
 			service-interface="org.springframework.integration.samples.osgi.inbound.InboundGateway" 
 			default-request-channel="inboundChannel"/>
 
-	<integration:publish-subscribe-channel id="inboundChannel"/>
-
-    <osgi:service id="inboundService" ref="inboundChannel"
-    		interface="org.springframework.integration.channel.SubscribableChannel"/>
-
 </beans>   
diff --git a/spring-integration-samples/osgi-inbound/src/org/springframework/integration/samples/osgi/inbound/InboundGateway.java b/spring-integration-samples/osgi-inbound/src/org/springframework/integration/samples/osgi/inbound/InboundGateway.java
index 0d0f2a5911..16dd20f384 100644
--- a/spring-integration-samples/osgi-inbound/src/org/springframework/integration/samples/osgi/inbound/InboundGateway.java
+++ b/spring-integration-samples/osgi-inbound/src/org/springframework/integration/samples/osgi/inbound/InboundGateway.java
@@ -26,6 +26,6 @@ import org.springframework.integration.file.FileHeaders;
  */
 public interface InboundGateway {
 
-	public File sendMessage(String message, @Header(FileHeaders.FILENAME)String filename);
+	public File sendMessage(String message, @Header(FileHeaders.FILENAME) String filename);
 
 }