From 64031c05ea80ad46a83f15273236dba3897be8ff Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Fri, 17 Jul 2009 00:18:34 +0000
Subject: [PATCH] updated OSGi examples, removed the bridge and added reply
 message

---
 .../inbound-adapter-osgi/src/META-INF/MANIFEST.MF         | 3 +--
 .../src/META-INF/spring/context-osgi-in.xml               | 6 +++---
 .../samples/inbound/InboundDemoBundleActivator.java       | 5 +++--
 .../integration/samples/inbound/InboundGateway.java       | 8 ++++----
 .../src/META-INF/spring/context-osgi-out.xml              | 6 ++----
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/spring-integration-samples/inbound-adapter-osgi/src/META-INF/MANIFEST.MF b/spring-integration-samples/inbound-adapter-osgi/src/META-INF/MANIFEST.MF
index 3c9af1f88d..ddd0b6c932 100644
--- a/spring-integration-samples/inbound-adapter-osgi/src/META-INF/MANIFEST.MF
+++ b/spring-integration-samples/inbound-adapter-osgi/src/META-INF/MANIFEST.MF
@@ -11,5 +11,4 @@ Import-Package: org.eclipse.osgi.framework.console;version="1.0.0",
 Import-Library: org.aspectj;version="[1.6.2, 2.0.0)",
  org.springframework.spring;version="[2.5.6.A, 3.1.0)"
 Import-Bundle: org.springframework.integration;version="[1.0.3,1.0.4)",
- org.springframework.integration.file;version="[1.0.3,1.0.4)"
-
+ org.springframework.integration.file;version="[1.0.3,1.0.4)"    
diff --git a/spring-integration-samples/inbound-adapter-osgi/src/META-INF/spring/context-osgi-in.xml b/spring-integration-samples/inbound-adapter-osgi/src/META-INF/spring/context-osgi-in.xml
index 14a076e633..26e2028d84 100644
--- a/spring-integration-samples/inbound-adapter-osgi/src/META-INF/spring/context-osgi-in.xml
+++ b/spring-integration-samples/inbound-adapter-osgi/src/META-INF/spring/context-osgi-in.xml
@@ -11,11 +11,11 @@
 	xmlns:integration="http://www.springframework.org/schema/integration"
 	xmlns:file="http://www.springframework.org/schema/integration/file">
 
-
 	<integration:gateway id="inboundGateway" service-interface="org.springframework.integration.samples.inbound.InboundGateway"
 	                     default-request-channel="inChannel"/>
 	
 	<integration:publish-subscribe-channel id="inChannel"/>
 	 
-    <osgi:service id="inboundService" ref="inChannel" interface="org.springframework.integration.channel.SubscribableChannel"/>
-</beans>
+    <osgi:service  id="inboundService" ref="inChannel" interface="org.springframework.integration.channel.SubscribableChannel" />
+ 
+</beans>   
diff --git a/spring-integration-samples/inbound-adapter-osgi/src/org/springframework/integration/samples/inbound/InboundDemoBundleActivator.java b/spring-integration-samples/inbound-adapter-osgi/src/org/springframework/integration/samples/inbound/InboundDemoBundleActivator.java
index 1b660eccae..982f8d5493 100644
--- a/spring-integration-samples/inbound-adapter-osgi/src/org/springframework/integration/samples/inbound/InboundDemoBundleActivator.java
+++ b/spring-integration-samples/inbound-adapter-osgi/src/org/springframework/integration/samples/inbound/InboundDemoBundleActivator.java
@@ -15,6 +15,7 @@
  */
 package org.springframework.integration.samples.inbound;
 
+import java.io.File;
 import java.util.Dictionary;
 import java.util.Hashtable;
 
@@ -77,8 +78,8 @@ public class InboundDemoBundleActivator implements BundleActivator, CommandProvi
 		Assert.notNull(message, "You must provide message as first argument");
 		Assert.notNull(fileName, "You must proivi a file name as second argument");
 		ci.println("Sending message: '" + message + "'");
-		gateway.sendMessage(message, fileName);
-		ci.println("Message sent!");
+		File file = gateway.sendMessage(message, fileName);
+		ci.println("Message sent and its contents are written to: " + file.getAbsolutePath());
 	}
 
 }
diff --git a/spring-integration-samples/inbound-adapter-osgi/src/org/springframework/integration/samples/inbound/InboundGateway.java b/spring-integration-samples/inbound-adapter-osgi/src/org/springframework/integration/samples/inbound/InboundGateway.java
index 58d3c8037c..8239126f45 100644
--- a/spring-integration-samples/inbound-adapter-osgi/src/org/springframework/integration/samples/inbound/InboundGateway.java
+++ b/spring-integration-samples/inbound-adapter-osgi/src/org/springframework/integration/samples/inbound/InboundGateway.java
@@ -15,15 +15,15 @@
  */
 package org.springframework.integration.samples.inbound;
 
+import java.io.File;
+
 import org.springframework.integration.annotation.Header;
 import org.springframework.integration.file.FileHeaders;
+
 /**
- * Simple BundleActivator which will register ServiceListener which will listen for 
- * ApplicationContext published event. Once event is received, HelloWorldDemo will be executed.
- * 
  * @author Oleg Zhurakousky
  */
 public interface InboundGateway {
 
-	public void sendMessage(String message, @Header(FileHeaders.FILENAME)String fileName);
+	public File sendMessage(String message, @Header(FileHeaders.FILENAME)String fileName);
 }
diff --git a/spring-integration-samples/outbound-adapter-osgi/src/META-INF/spring/context-osgi-out.xml b/spring-integration-samples/outbound-adapter-osgi/src/META-INF/spring/context-osgi-out.xml
index 0182654644..3fc8d5117e 100644
--- a/spring-integration-samples/outbound-adapter-osgi/src/META-INF/spring/context-osgi-out.xml
+++ b/spring-integration-samples/outbound-adapter-osgi/src/META-INF/spring/context-osgi-out.xml
@@ -12,10 +12,8 @@
 	xmlns:file="http://www.springframework.org/schema/integration/file">
 
 	
-	<osgi:reference id="filesInService" interface="org.springframework.integration.channel.SubscribableChannel"/>
-
-	<integration:bridge input-channel="filesInService" output-channel="filesOut"/>
+	<osgi:reference  id="filesInService" interface="org.springframework.integration.channel.SubscribableChannel" cardinality="0..1"/>
 	
-	<file:outbound-channel-adapter id="filesOut" directory="${java.io.tmpdir}/spring-integration-samples/output" delete-source-files="true" />
+	<file:outbound-gateway request-channel="filesInService" id="filesOut" directory="${java.io.tmpdir}/spring-integration-samples/output" delete-source-files="true" />
 
 </beans>