From 9616a1ead4eca934e3f2d18aef35c0ce0bc580f3 Mon Sep 17 00:00:00 2001 From: Dave Hladky Date: Wed, 25 Jun 2014 16:58:54 -0500 Subject: [PATCH] Omaha #3273 Remove all reference off DD env variables from setup.env Former-commit-id: b2c4c45dfadd8b3ee1e2021d24d04f1a2e7bc3ff [formerly b9c930dd142384e6129d2526cc59945033b18fa8] [formerly f2b4bcfef1d03ad0cc573baf48df60722c2682c1] [formerly dbf301b8c48e52d160736f994ea76dc6e63654f7 [formerly f2b4bcfef1d03ad0cc573baf48df60722c2682c1 [formerly 0ad525e949fc9cf9390909128b4c590034f00963]]] Former-commit-id: dbf301b8c48e52d160736f994ea76dc6e63654f7 Former-commit-id: af3e7b05edf281db9e4c4e81a161457a1fb02a45 [formerly bc75b0073176823bd57374f695fd75dcb5722b36] Former-commit-id: 537a57784cdd3c7bc575f202bbefa192f12bfe81 --- edexOsgi/build.edex/esb/bin/setup.env | 18 ------------------ .../uf/common/registry/ebxml/RegistryUtil.java | 9 +++++---- .../res/spring/ebxml-constants.xml | 2 +- .../res/spring/ebxml-thrift-client-route.xml | 2 +- .../res/spring/ebxml-webservices.xml | 4 ++-- ....raytheon.uf.edex.registry.ebxml.properties | 13 +++++++++++++ .../web/etc/jettyServer.xml | 6 +++--- 7 files changed, 25 insertions(+), 29 deletions(-) diff --git a/edexOsgi/build.edex/esb/bin/setup.env b/edexOsgi/build.edex/esb/bin/setup.env index d6823a20c3..55ea535fa6 100644 --- a/edexOsgi/build.edex/esb/bin/setup.env +++ b/edexOsgi/build.edex/esb/bin/setup.env @@ -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 diff --git a/edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml/RegistryUtil.java b/edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml/RegistryUtil.java index 3dd269f15a..e7d4d24808 100644 --- a/edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml/RegistryUtil.java +++ b/edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml/RegistryUtil.java @@ -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 * * * @@ -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"); } } diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-constants.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-constants.xml index be6689edf1..6d79ee7089 100644 --- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-constants.xml +++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-constants.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd"> - + 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 58774ace37..b857b3f542 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 @@ -7,7 +7,7 @@ xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler"> + uri="jetty:http://0.0.0.0:${ebxml.thrift.service.port}/services/thrift?disableStreamCache=true&chunked=false&httpBindingRef=#binaryHttpBinding" /> diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webservices.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webservices.xml index 0429c7d8d4..107da3bc9c 100644 --- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webservices.xml +++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webservices.xml @@ -29,7 +29,7 @@ - + - \ No newline at end of file + 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 c1fd7bfee6..f26830c61a 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 @@ -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 diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/etc/jettyServer.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/etc/jettyServer.xml index 785fd2a55a..0af53852c7 100644 --- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/etc/jettyServer.xml +++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/etc/jettyServer.xml @@ -45,7 +45,7 @@ - 30000 @@ -65,12 +65,12 @@ WEB-INF/web.xml - + / true - +