From 939ac73a13ba37ea93faede9ddaa264b5b687d08 Mon Sep 17 00:00:00 2001
From: Nate Jensen <Nathan.Jensen@raytheon.com>
Date: Tue, 3 Mar 2015 16:33:57 -0600
Subject: [PATCH] Omaha #3978 fix http ebxml thrift service

Change-Id: I50e57fcafd472cbfd72fc911e863e118a62ab5ba

Former-commit-id: 6fca25e457989f4757999cfcce40ff9a3b1fc393
---
 .../res/spring/ebxml-thrift-client-route.xml  | 34 +++++++++++--------
 ...raytheon.uf.edex.registry.ebxml.properties |  3 +-
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client-route.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client-route.xml
index d8772cea28..daf0cb46a4 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client-route.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client-route.xml
@@ -4,21 +4,25 @@
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <camelContext id="ebxml-request-service-camel"
-		xmlns="http://camel.apache.org/schema/spring"
-		errorHandlerRef="errorHandler">
+        xmlns="http://camel.apache.org/schema/spring"
+        errorHandlerRef="errorHandler">    
+        
+        <propertyPlaceholder id="ebxmlThriftServiceProperties"
+                             location="classpath:com.raytheon.uf.edex.registry.ebxml.properties"/>    
+        
+        <restConfiguration component="jetty" host="0.0.0.0" port="{{ebxml.thrift.service.port}}" >
+            <endpointProperty key="disableStreamCache" value="{{ebxml.thrift.service.disableStreamCache}}" />
+            <endpointProperty key="chunked" value="{{ebxml.thrift.service.chunked}}" />
+        </restConfiguration>
 
-		<endpoint id="webServiceEndpoint"
-			uri="jetty:http://0.0.0.0:${ebxml.thrift.service.port}${HTTP_SERVER_PATH}?${ebxml.thrift.service.properties}" />
-
-		<route id="webServiceRoute" streamCache="false">
-			<from uri="webServiceEndpoint" />
-			<setBody>
-				<simple>
-					bodyAs(javax.servlet.http.HttpServletRequest)
-				</simple>
-			</setBody>
-			<bean ref="httpServiceExecutor" method="execute(${body}, ${in.header.CamelHttpServletResponse})"/>
-		</route>
-	</camelContext>
+        <rest path="{{env:HTTP_SERVER_PATH}}">
+            <post uri="/{format}">
+                <to uri="bean:httpServiceExecutor?method=execute(${body}, ${header.format}, ${in.header.accept-encoding}, ${in.header.CamelHttpServletResponse})" />
+            </post>
+            <post uri="/">
+                <to uri="bean:httpServiceExecutor?method=execute(${body}, ${in.header.content-type}, ${in.header.accept-encoding}, ${in.header.CamelHttpServletResponse})" />
+            </post>
+        </rest>
+    </camelContext>
 
 </beans>
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/resources/com.raytheon.uf.edex.registry.ebxml.properties b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/resources/com.raytheon.uf.edex.registry.ebxml.properties
index b8ce0532a8..0b5eaa9eb7 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/resources/com.raytheon.uf.edex.registry.ebxml.properties
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/resources/com.raytheon.uf.edex.registry.ebxml.properties
@@ -16,7 +16,8 @@ ebxml-notification-batch-size=200
 ebxml-webserver-max-threads=8
 # EBXML thrift service port
 ebxml.thrift.service.port=9588
-ebxml.thrift.service.properties=disableStreamCache=true&chunked=false&httpBindingRef=#binaryHttpBinding&matchOnUriPrefix=true
+ebxml.thrift.service.disableStreamCache=true
+ebxml.thrift.service.chunked=false
 # EBXML webserver port
 ebxml.registry.webserver.port=8082
 # EBXML registry host