Issue #18 - fix port conflicts that prevented multiple instances of edex request from starting; fix a problem that prevented the selected http port in setup.env from propogating throughout the edex instances.
Former-commit-id: 6b206773eff05abf20ecc87b27e96c47b67ba600
This commit is contained in:
Bryan Kowal
parent
e0e8e6d00a
commit
2ed20e107d
12 changed files with 39 additions and 13 deletions
|
|
@ -118,6 +118,9 @@ wrapper.java.additional.39=-DHighMem=%HIGH_MEM_FLAG%
|
|||
wrapper.java.additional.40=-Dmanagement.port=%MGMT_PORT%
|
||||
|
||||
wrapper.java.additional.41=-Dqpid.dest_syntax=BURL
|
||||
wrapper.java.additional.42=-Djetty.port=8081
|
||||
wrapper.java.additional.43=-Dconfidential.port=8443
|
||||
wrapper.java.additional.44=-Dhttp.port=%HTTP_PORT%
|
||||
|
||||
# Initial Java Heap Size (in MB)
|
||||
wrapper.java.initmemory=%INIT_MEM%
|
||||
|
|
|
|||
|
|
@ -24,7 +24,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_SERVER=http://localhost:9581/services
|
||||
export HTTP_PORT=9581
|
||||
export HTTP_SERVER=http://localhost:${HTTP_PORT}/services
|
||||
export JMS_SERVER=tcp://localhost:5672
|
||||
export RADAR_SERVER=tcp://localhost:8813
|
||||
|
||||
|
|
|
|||
|
|
@ -10,9 +10,12 @@
|
|||
<camelContext id="subscription-camel"
|
||||
xmlns="http://camel.apache.org/schema/spring"
|
||||
errorHandlerRef="errorHandler">
|
||||
<endpoint id="subscriptionHTTP_from"
|
||||
uri="jetty:http://0.0.0.0:${http.port}/services/subscribe?disableStreamCache=true" />
|
||||
|
||||
<!-- SubscriptionSrv routes -->
|
||||
<route id="subscriptionHTTP">
|
||||
<from uri="jetty:http://0.0.0.0:9581/services/subscribe?disableStreamCache=true" />
|
||||
<from uri="ref:subscriptionHTTP_from" />
|
||||
<bean ref="subscription" method="processRequest"/>
|
||||
<bean ref="serializationUtil" method="marshalToXml" />
|
||||
</route>
|
||||
|
|
|
|||
|
|
@ -22,10 +22,10 @@
|
|||
<property name="connectors">
|
||||
<list>
|
||||
<bean id="Connector" class="org.eclipse.jetty.server.nio.SelectChannelConnector">
|
||||
<property name="port" value="8080"/>
|
||||
<property name="port" value="${jetty.port}"/>
|
||||
<property name="maxIdleTime" value="30000"/>
|
||||
<property name="acceptors" value="2"/>
|
||||
<property name="confidentialPort" value="8443"/>
|
||||
<property name="confidentialPort" value="${confidential.port}"/>
|
||||
</bean>
|
||||
</list>
|
||||
</property>
|
||||
|
|
@ -61,15 +61,19 @@
|
|||
</bean>
|
||||
|
||||
<camelContext id="uengine-camel" xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">
|
||||
<endpoint id="uEngineHttpThrift_from"
|
||||
uri="jetty:http://0.0.0.0:${http.port}/services/pyproductthrift?disableStreamCache=true&chunked=false&httpBindingRef=#binaryHttpBinding" />
|
||||
<endpoint id="uEngineHttpJaxb_from"
|
||||
uri="jetty:http://0.0.0.0:${http.port}/services/pyproductjaxb" />
|
||||
|
||||
<!-- UEngine routes -->
|
||||
<route id="uEngineHttpThrift">
|
||||
<from uri="jetty:http://0.0.0.0:9581/services/pyproductthrift?disableStreamCache=true&chunked=false&httpBindingRef=#binaryHttpBinding" />
|
||||
<from uri="ref:uEngineHttpThrift_from" />
|
||||
<bean ref="uEngine" method="executePython" />
|
||||
<bean ref="serializationUtil" method="transformToThrift" />
|
||||
</route>
|
||||
<route id="uEngineHttpJaxb">
|
||||
<from uri="jetty:http://0.0.0.0:9581/services/pyproductjaxb" />
|
||||
<from uri="ref:uEngineHttpJaxb_from" />
|
||||
<bean ref="uEngine" method="executePython" />
|
||||
<bean ref="serializationUtil" method="marshalToXml" />
|
||||
</route>
|
||||
|
|
|
|||
|
|
@ -9,8 +9,11 @@
|
|||
xmlns="http://camel.apache.org/schema/spring"
|
||||
errorHandlerRef="errorHandler">
|
||||
|
||||
<endpoint id="thriftService_from"
|
||||
uri="jetty:http://0.0.0.0:${http.port}/services/thrift?disableStreamCache=true&chunked=false&httpBindingRef=#binaryHttpBinding" />
|
||||
|
||||
<route id="thriftService">
|
||||
<from uri="jetty:http://0.0.0.0:9581/services/thrift?disableStreamCache=true&chunked=false&httpBindingRef=#binaryHttpBinding" />
|
||||
<from uri="ref:thriftService_from" />
|
||||
<bean ref="routeWrapper" method="executeThrift"/>
|
||||
</route>
|
||||
|
||||
|
|
|
|||
|
|
@ -19,9 +19,13 @@
|
|||
|
||||
<camelContext id="mpeFieldGenReq-context"
|
||||
xmlns="http://camel.apache.org/schema/spring"
|
||||
errorHandlerRef="errorHandler">
|
||||
errorHandlerRef="errorHandler">
|
||||
|
||||
<endpoint id="mpeHttp_from"
|
||||
uri="jetty:http://0.0.0.0:${http.port}/services/mpeFieldGenHttpService?disableStreamCache=true" />
|
||||
|
||||
<route id="mpeHttp">
|
||||
<from uri="jetty:http://0.0.0.0:9581/services/mpeFieldGenHttpService?disableStreamCache=true" />
|
||||
<from uri="ref:mpeHttp_from" />
|
||||
<doTry>
|
||||
<bean ref="mpeFieldGenService" method="process" />
|
||||
<doCatch>
|
||||
|
|
|
|||
|
|
@ -5,9 +5,13 @@
|
|||
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
|
||||
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
|
||||
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
|
||||
<camelContext id="textdbsrv-request-camel" xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">
|
||||
<camelContext id="textdbsrv-request-camel" xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">
|
||||
|
||||
<endpoint id="textdbsrvXml_from"
|
||||
uri="jetty:http://0.0.0.0:${http.port}/services/textdbsrv?disableStreamCache=true" />
|
||||
|
||||
<route id="textdbsrvXml">
|
||||
<from uri="jetty:http://0.0.0.0:9581/services/textdbsrv?disableStreamCache=true" />
|
||||
<from uri="ref:textdbsrvXml_from" />
|
||||
<bean ref="serializationUtil" method="unmarshalFromXml" />
|
||||
<bean ref="textdbsrv" method="processMessage" />
|
||||
<bean ref="serializationUtil" method="marshalToXml" />
|
||||
|
|
|
|||
|
|
@ -54,9 +54,13 @@
|
|||
</property>
|
||||
</bean>
|
||||
|
||||
<camelContext id="nceppurge-camel" xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">
|
||||
<camelContext id="nceppurge-camel" xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">
|
||||
|
||||
<endpoint id="nceppurgeHttp_from"
|
||||
uri="jetty:http://0.0.0.0:${http.port}/services/purgePlugin" />
|
||||
|
||||
<route id="nceppurgeHttp">
|
||||
<from uri="jetty:http://0.0.0.0:9581/services/purgePlugin" />
|
||||
<from uri="ref:nceppurgeHttp_from" />
|
||||
<bean ref="purgeutil" method="purgeAllTable" />
|
||||
|
||||
</route>
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Add table
Reference in a new issue