From 31fba9e27c3f4bd0f7dd6310b05fa058f34daee4 Mon Sep 17 00:00:00 2001
From: Gunnar Hillert <ghillert@vmware.com>
Date: Tue, 11 Dec 2012 10:49:07 -0500
Subject: [PATCH] INTSAMPLES-100 - Fix cafe-amqp JSON Serialization For
 reference see: https://jira.springsource.org/browse/INTSAMPLES-100

---
 .../spring/integration/amqp/cafeDemo-amqp-baristaCold-xml.xml | 2 +-
 .../spring/integration/amqp/cafeDemo-amqp-baristaHot-xml.xml  | 2 +-
 .../spring/integration/amqp/cafeDemo-amqp-operations-xml.xml  | 4 ++--
 .../META-INF/spring/integration/amqp/cafeDemo-amqp-xml.xml    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaCold-xml.xml b/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaCold-xml.xml
index d376353d..965c1c83 100644
--- a/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaCold-xml.xml
+++ b/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaCold-xml.xml
@@ -35,7 +35,7 @@
 		<int:service-activator method="prepareColdDrink">
 			<bean class="org.springframework.integration.samples.cafe.xml.Barista"/>
 		</int:service-activator>
-		<int:object-to-json-transformer />
+		<int:object-to-json-transformer content-type="text/x-json"/>
 	</int:chain>
 
 	<!-- rabbit exchanges, queues, and bindings used by this app -->
diff --git a/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaHot-xml.xml b/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaHot-xml.xml
index 8893a8b6..f5bd47ee 100644
--- a/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaHot-xml.xml
+++ b/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaHot-xml.xml
@@ -35,7 +35,7 @@
 		<int:service-activator method="prepareHotDrink">
 			<bean class="org.springframework.integration.samples.cafe.xml.Barista"/>
 		</int:service-activator>
-		<int:object-to-json-transformer />
+		<int:object-to-json-transformer content-type="text/x-json"/>
 	</int:chain>
 
 	<!-- rabbit exchanges, queues, and bindings used by this app -->
diff --git a/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-operations-xml.xml b/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-operations-xml.xml
index 63e4623e..4d1ca75c 100644
--- a/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-operations-xml.xml
+++ b/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-operations-xml.xml
@@ -37,7 +37,7 @@
 		<int:header name="ICED" expression="payload.isIced()"/>
 	</int:header-enricher>
 
-	<int:object-to-json-transformer id="drink-to-json" input-channel="drinks" output-channel="jsonDrinks" />
+	<int:object-to-json-transformer id="drink-to-json" input-channel="drinks" output-channel="jsonDrinks" content-type="text/x-json"/>
 
 	<int:router input-channel="jsonDrinks"  expression="headers.ICED ? 'coldDrinks' : 'hotDrinks'"/>
 
@@ -84,7 +84,7 @@
 		<int:header name="NUMBER" expression="payload.getOrderNumber()" />
 	</int:header-enricher>
 
-	<int:object-to-json-transformer id="delivery-to-json" input-channel="deliveries" output-channel="jsonDeliveries"/>
+	<int:object-to-json-transformer id="delivery-to-json" input-channel="deliveries" output-channel="jsonDeliveries" content-type="text/x-json"/>
 
 	<int:channel id="jsonDeliveries" />
 
diff --git a/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-xml.xml b/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-xml.xml
index 9675b997..2ba9c153 100644
--- a/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-xml.xml
+++ b/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-xml.xml
@@ -31,7 +31,7 @@
 		<int:header name="NUMBER" expression="payload.getNumber()"/>
 	</int:header-enricher>
 
-	<int:object-to-json-transformer input-channel="newOrders" output-channel="jsonNewOrders" />
+	<int:object-to-json-transformer input-channel="newOrders" output-channel="jsonNewOrders" content-type="text/x-json"/>
 
 	<int:channel id="jsonNewOrders" />