xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env

Browse source 
Change-Id: I05abe29c7df0b22026547f2e89b5074281f1a7ea

Former-commit-id: 3aff99e787a7368f40cdd161581ead2d3552118c
This commit is contained in:
Max Schenkelberg 2014-08-26 11:32:20 -05:00
parent f478b42e61
commit 78b87b7a63
4 changed files with 6 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
edexOsgi/build.edex/esb/bin/setup.env
View file

@ -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}

2
edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client-route.xml
View file

@ -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" />

32
edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client.xml
View file

@ -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"/>

1
edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/webServiceBeans.xml
View file

@ -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" />