Omaha #3273 Remove all reference off DD env variables from setup.env
Former-commit-id:b2c4c45dfa[formerlyb9c930dd14] [formerlyf2b4bcfef1] [formerlydbf301b8c4[formerlyf2b4bcfef1[formerly 0ad525e949fc9cf9390909128b4c590034f00963]]] Former-commit-id:dbf301b8c4Former-commit-id: af3e7b05edf281db9e4c4e81a161457a1fb02a45 [formerlybc75b00731] Former-commit-id:537a57784c
This commit is contained in:
Dave Hladky
Gerrit Code Review
parent
008123b302
commit
9616a1ead4
7 changed files with 25 additions and 29 deletions
|
|
@ -25,19 +25,6 @@ export BROKER_ADDR=localhost
|
|||
# setup hdf5 connection if pypies is enabled
|
||||
export PYPIES_SERVER=http://localhost:9582
|
||||
|
||||
# Registry specific ports
|
||||
export EBXML_REGISTRY_WEBSERVER_HOME=/awips2/edex/webapps/registryEbxml/
|
||||
export EBXML_REGISTRY_WEBSERVER_PORT=8082
|
||||
export EBXML_THRIFT_SERVICE_PORT=9588
|
||||
# data delivery specific variables, used below in the localization section
|
||||
export NCF_HOST=165.92.30.69
|
||||
export NCF_ADDRESS=https://${NCF_HOST}:${EBXML_REGISTRY_WEBSERVER_PORT}
|
||||
export DATADELIVERY_HOST=localhost
|
||||
# Currently the registry is hosted on datadelivery, but this could be changed in the future
|
||||
export EBXML_REGISTRY_HOST=${DATADELIVERY_HOST}
|
||||
export EBXML_REGISTRY_FEDERATION_ENABLED=true
|
||||
export EBXML_REGISTRY_USER=
|
||||
|
||||
# moved here from environment.xml
|
||||
# these values are returned to clients that contact the localization service
|
||||
export HTTP_PORT=9581
|
||||
|
|
@ -46,11 +33,6 @@ export JMS_SERVER=tcp://${BROKER_ADDR}:5672
|
|||
export JMS_VIRTUALHOST=edex
|
||||
export JMS_CONNECTIONS_URL=http://${BROKER_ADDR}:8180/rest/connection/${JMS_VIRTUALHOST}
|
||||
export RADAR_SERVER=tcp://localhost:8813
|
||||
export DATADELIVERY_SERVER=http://${DATADELIVERY_HOST}:${EBXML_THRIFT_SERVICE_PORT}/services
|
||||
export EBXML_REGISTRY_SERVICE=http://${EBXML_REGISTRY_HOST}:${EBXML_THRIFT_SERVICE_PORT}/services
|
||||
export EBXML_REGISTRY_LCM_SERVICE=http://${EBXML_REGISTRY_HOST}:${EBXML_THRIFT_SERVICE_PORT}/lifecycleManager?WSDL
|
||||
export EBXML_REGISTRY_QUERY_SERVICE=http://${EBXML_REGISTRY_HOST}:${EBXML_THRIFT_SERVICE_PORT}/queryManager?WSDL
|
||||
export NCF_BANDWIDTH_MANAGER_SERVICE=http://${NCF_HOST}:${EBXML_THRIFT_SERVICE_PORT}/services
|
||||
|
||||
# set the AWIPS II shared directory
|
||||
export SHARE_DIR=/awips2/edex/data/share
|
||||
|
|
|
|||
|
|
@ -83,6 +83,7 @@ import com.raytheon.uf.common.util.ReflectionUtil;
|
|||
* Mar 31, 2014 2889 dhladky Added username for notification center tracking.
|
||||
* Apr 24, 2014 2992 dhladky fixed all objects in ebxml owned by NCF, bad.
|
||||
* 6/5/2014 1712 bphillip Registry now communicates over https
|
||||
* June 25, 2014 3273 dhladky Remove all DD environment variables from setup.env
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
|
|
@ -106,11 +107,11 @@ public final class RegistryUtil {
|
|||
public static final String defaultUser = "NCF";
|
||||
|
||||
static {
|
||||
if (System.getenv("EBXML_REGISTRY_HOST") != null
|
||||
&& System.getenv("EBXML_REGISTRY_WEBSERVER_PORT") != null) {
|
||||
if (System.getProperty("ebxml.registry.host") != null
|
||||
&& System.getProperty("ebxml.registry.webserver.port") != null) {
|
||||
LOCAL_REGISTRY_ADDRESS = "https://"
|
||||
+ System.getenv("EBXML_REGISTRY_HOST") + ":"
|
||||
+ System.getenv("EBXML_REGISTRY_WEBSERVER_PORT");
|
||||
+ System.getProperty("ebxml.registry.host") + ":"
|
||||
+ System.getProperty("ebxml.registry.webserver.port");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
|
||||
|
||||
<bean id="ebxmlFederationEnabled" class="java.lang.Boolean">
|
||||
<constructor-arg value="${EBXML_REGISTRY_FEDERATION_ENABLED}" />
|
||||
<constructor-arg value="${ebxml.registry.federation.enabled}" />
|
||||
</bean>
|
||||
|
||||
<bean id="ebxmlEmailEnabled" class="java.lang.Boolean">
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">
|
||||
|
||||
<endpoint id="ebxmlThriftService_from"
|
||||
uri="jetty:http://0.0.0.0:${EBXML_THRIFT_SERVICE_PORT}/services/thrift?disableStreamCache=true&chunked=false&httpBindingRef=#binaryHttpBinding" />
|
||||
uri="jetty:http://0.0.0.0:${ebxml.thrift.service.port}/services/thrift?disableStreamCache=true&chunked=false&httpBindingRef=#binaryHttpBinding" />
|
||||
|
||||
<route id="ebxmlThriftService">
|
||||
<from uri="ref:ebxmlThriftService_from" />
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
<entry key="enableTimestampCache" value="false" />
|
||||
<entry key="enableSamlOneTimeUseCache" value="false" />
|
||||
<entry key="action" value="Signature" />
|
||||
<entry key="user" value="${EBXML_REGISTRY_USER}" />
|
||||
<entry key="user" value="${ebxml.registry.user}" />
|
||||
<entry key="signaturePropRefId" value="propRef"/>
|
||||
<entry key="propRef" value-ref="encryptedPropertyLoader"/>
|
||||
<entry key="passwordCallbackClass"
|
||||
|
|
|
|||
|
|
@ -14,6 +14,19 @@ ebxml-notification-batch-size=200
|
|||
# This number must be >=5. As a general rule, the maximum number of connections should be:
|
||||
# 5+{registries this registry is replicating to/from}=max-threads
|
||||
ebxml-webserver-max-threads=8
|
||||
# EBXML thrift service port
|
||||
ebxml.thrift.service.port=9588
|
||||
# EBXML webserver port
|
||||
ebxml.registry.webserver.port=8082
|
||||
# EBXML registry host
|
||||
ebxml.registry.host=localhost
|
||||
# EBXML registry user
|
||||
ebxml.registry.user=localhost
|
||||
# EBXML federation enable flag
|
||||
ebxml.registry.federation.enabled=false
|
||||
# EBXML registry webserver home
|
||||
ebxml.registry.webserver.home=/awips2/edex/webapps/registryEbxml/
|
||||
|
||||
|
||||
####
|
||||
# Registry Web server IP access control configurations
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
</New>
|
||||
</Arg>
|
||||
<Set name="port">
|
||||
<SystemProperty name="EBXML_REGISTRY_WEBSERVER_PORT"
|
||||
<SystemProperty name="ebxml.registry.webserver.port"
|
||||
default="8082" />
|
||||
</Set>
|
||||
<Set name="maxIdleTime">30000</Set>
|
||||
|
|
@ -65,12 +65,12 @@
|
|||
<New class="org.eclipse.jetty.webapp.WebAppContext">
|
||||
<Set name="descriptor">WEB-INF/web.xml</Set>
|
||||
<Set name="resourceBase">
|
||||
<Env name="EBXML_REGISTRY_WEBSERVER_HOME" />
|
||||
<SystemProperty name="ebxml.registry.webserver.home" />
|
||||
</Set>
|
||||
<Set name="contextPath">/</Set>
|
||||
<Set name="parentLoaderPriority">true</Set>
|
||||
<Set name="war">
|
||||
<Env name="EBXML_REGISTRY_WEBSERVER_HOME" />
|
||||
<SystemProperty name="ebxml.registry.webserver.home" />
|
||||
</Set>
|
||||
<Set name="systemClasses">
|
||||
<Array type="java.lang.String">
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue