From 78b87b7a63862a7f41720ff9e2e00279f25161a2 Mon Sep 17 00:00:00 2001
From: Max Schenkelberg <max.schenkelberg@raytheon.com>
Date: Tue, 26 Aug 2014 11:32:20 -0500
Subject: [PATCH] Omaha #3541 Fixed ebxml copy of request service endpoint and
 moved http service path to setup.env

Change-Id: I05abe29c7df0b22026547f2e89b5074281f1a7ea

Former-commit-id: 3aff99e787a7368f40cdd161581ead2d3552118c
---
 edexOsgi/build.edex/esb/bin/setup.env         |  3 +-
 .../res/spring/ebxml-thrift-client-route.xml  |  2 +-
 .../res/spring/ebxml-thrift-client.xml        | 32 ++-----------------
 .../web/webServiceBeans.xml                   |  1 +
 4 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/edexOsgi/build.edex/esb/bin/setup.env b/edexOsgi/build.edex/esb/bin/setup.env
index 55ea535fa6..f4a72c0da1 100644
--- a/edexOsgi/build.edex/esb/bin/setup.env
+++ b/edexOsgi/build.edex/esb/bin/setup.env
@@ -28,7 +28,8 @@ export PYPIES_SERVER=http://localhost:9582
 # moved here from environment.xml
 # these values are returned to clients that contact the localization service
 export HTTP_PORT=9581
-export HTTP_SERVER=http://localhost:${HTTP_PORT}/services
+export HTTP_SERVER_PATH=/services
+export HTTP_SERVER=http://localhost:${HTTP_PORT}${HTTP_SERVER_PATH}
 export JMS_SERVER=tcp://${BROKER_ADDR}:5672
 export JMS_VIRTUALHOST=edex
 export JMS_CONNECTIONS_URL=http://${BROKER_ADDR}:8180/rest/connection/${JMS_VIRTUALHOST}
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 47e8c72fcf..d72e240bbf 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
@@ -8,7 +8,7 @@
 		errorHandlerRef="errorHandler">
 
 		<endpoint id="webServiceEndpoint"
-			uri="jetty:http://0.0.0.0:${ebxml.thrift.service.port}${edex.requestsrv.http.path}?${edex.requestsrv.http.properties}" />
+			uri="jetty:http://0.0.0.0:${ebxml.thrift.service.port}${HTTP_SERVER_PATH}?${edex.requestsrv.http.properties}" />
 
 		<route id="webServiceRoute" streamCache="false">
 			<from uri="webServiceEndpoint" />
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client.xml
index e96969b820..ced6b51490 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client.xml
@@ -2,36 +2,8 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
   
-  <bean id="handlerRegistry" class="com.raytheon.uf.edex.requestsrv.HandlerRegistry" factory-method="getInstance"/>
-  
-  <!-- TODO: Need better way of using plugin spring files, copy pasted from request-service spring XML files for WEB context -->
-    <bean id="binaryHttpBinding" class="com.raytheon.uf.edex.esb.camel.http.BinaryHttpBinding"/>
-    
-    <bean id="serializingStreamExecutor" class="com.raytheon.uf.edex.requestsrv.serialization.SerializingStreamExecutor"
-          factory-method="getInstance"/>
-
-	<bean id="thriftStreamSerializer" class="com.raytheon.uf.edex.requestsrv.serialization.thrift.ThriftStreamSerializer"/>
-
-	<bean factory-bean="serializingStreamExecutor" factory-method="registerMultiple">
-		<constructor-arg ref="thriftStreamSerializer" />
-		<constructor-arg>
-			<list>
-				<value>thrift</value>
-				<value>application/thrift</value>
-			</list>
-		</constructor-arg>
-	</bean>
-    
-    <bean id="limitingStreamExecutor" class="com.raytheon.uf.edex.requestsrv.serialization.ByteLimitingStreamExecutor">
-    	<constructor-arg ref="serializingStreamExecutor"/>
-    	<constructor-arg value="${edex.requestsrv.byteLimitInMB}"/>
-    	<property name="limitOutput" value="false"/>
-    </bean>
-            
-	<bean id="httpServiceExecutor" class="com.raytheon.uf.edex.requestsrv.http.HttpRequestServiceExecutor">
-		<!-- TODO: We are streaming to the HttpServletResponse directly in http service route, don't believe we need limiting anymore -->
-		<constructor-arg ref="limitingStreamExecutor"/>
-	</bean>
+    <!-- EBXML does not include edex.xml spring where handlerRegistry is defined -->
+    <bean id="handlerRegistry" class="com.raytheon.uf.edex.requestsrv.HandlerRegistry" factory-method="getInstance"/>
 
     <bean factory-bean="handlerRegistry" factory-method="register">
         <constructor-arg value="com.raytheon.uf.common.registry.IRegistryRequest"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/webServiceBeans.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/webServiceBeans.xml
index 08695daa72..362c8448c2 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/webServiceBeans.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/webServiceBeans.xml
@@ -27,6 +27,7 @@
 	<import resource="file:///${edex.home}/conf/spring/edex-db.xml" />
 	<import resource="classpath:res/spring/edex-security.xml" />
 	<import resource="classpath:res/spring/eventbus-common.xml" />
+	<import resource="classpath:res/spring/request-service-common.xml" />
 	<import resource="classpath:res/spring/ebxml.xml" />
 	<import resource="classpath:res/spring/ebxml-validator-plugins.xml" />
 	<import resource="classpath:res/spring/ebxml-querytypes.xml" />