From 82d6c03669a4ea68b2853fbb18b3ea244203dae8 Mon Sep 17 00:00:00 2001 From: Nate Jensen Date: Tue, 28 May 2013 18:00:13 -0500 Subject: [PATCH] Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c Former-commit-id: 281edabb772b68e80bf6a9456f3a8e19576ed7da --- edexOsgi/build.edex/esb/conf/spring/edex.xml | 16 +++++----- edexOsgi/build.edex/esb/conf/wrapper.conf | 29 ------------------- .../res/spring/subscription-request.xml | 2 +- .../res/spring/gfe-spring.xml | 2 +- .../gfe/server/handler/GetClientsHandler.java | 2 +- .../res/spring/uengine-request.xml | 4 +-- .../edex/services/GetServersHandler.java | 8 ++--- .../res/spring/auth-request.xml | 4 +-- .../bandwidth-datadelivery-wfo-router.xml | 2 +- .../res/spring/request-router.xml | 12 ++++---- .../res/spring/management-common.xml | 2 +- .../res/spring/ohd-request.xml | 2 +- .../res/spring/ebxml-constants.xml | 4 +-- .../res/spring/textdbsrv-request.xml | 2 +- .../res/spring/purgeutil-request.xml | 2 +- 15 files changed, 32 insertions(+), 61 deletions(-) diff --git a/edexOsgi/build.edex/esb/conf/spring/edex.xml b/edexOsgi/build.edex/esb/conf/spring/edex.xml index 173b1dfb62..c624f4542b 100644 --- a/edexOsgi/build.edex/esb/conf/spring/edex.xml +++ b/edexOsgi/build.edex/esb/conf/spring/edex.xml @@ -19,7 +19,7 @@ - + @@ -35,8 +35,8 @@ - - + + @@ -95,7 +95,7 @@ --> - + @@ -103,7 +103,7 @@ - + @@ -211,9 +211,9 @@ - - - + + + diff --git a/edexOsgi/build.edex/esb/conf/wrapper.conf b/edexOsgi/build.edex/esb/conf/wrapper.conf index 18d79ee9bd..71bb0de6aa 100644 --- a/edexOsgi/build.edex/esb/conf/wrapper.conf +++ b/edexOsgi/build.edex/esb/conf/wrapper.conf @@ -97,57 +97,28 @@ wrapper.java.additional.7=-XX:+CMSIncrementalMode wrapper.java.additional.8=-Djava.net.preferIPv4Stack=true wrapper.java.additional.9=-Ddb.addr=${DB_ADDR} wrapper.java.additional.10=-Ddb.port=${DB_PORT} -wrapper.java.additional.11=-Dbroker.addr=${BROKER_ADDR} wrapper.java.additional.12=-Ddc.db.name=${DC_DB_NAME} wrapper.java.additional.13=-Dfxa.db.name=${FXA_DB_NAME} wrapper.java.additional.14=-Dhm.db.name=${HM_DB_NAME} wrapper.java.additional.15=-Dih.db.name=${IH_DB_NAME} wrapper.java.additional.16=-Daw.site.identifier=${AW_SITE_IDENTIFIER} -wrapper.java.additional.17=-Ddata.archive.root=${DATA_ARCHIVE_ROOT} -wrapper.java.additional.18=-Djms.pool.min=${JMS_POOL_MIN} -wrapper.java.additional.19=-Djms.pool.max=${JMS_POOL_MAX} wrapper.java.additional.20=-Ddb.metadata.pool.min=${METADATA_POOL_MIN} wrapper.java.additional.21=-Ddb.metadata.pool.max=${METADATA_POOL_MAX} -wrapper.java.additional.22=-Dcom.sun.management.jmxremote.port=${EDEX_JMX_PORT} -wrapper.java.additional.23=-Dcom.sun.management.jmxremote.authenticate=false -wrapper.java.additional.24=-Dcom.sun.management.jmxremote.ssl=false - -wrapper.java.additional.25=-DByteArrayOutputStreamPool.maxPoolSize=${SERIALIZE_POOL_MAX_SIZE} -wrapper.java.additional.26=-DByteArrayOutputStreamPool.initStreamSize=${SERIALIZE_STREAM_INIT_SIZE_MB} -wrapper.java.additional.27=-DByteArrayOutputStreamPool.maxStreamSize=${SERIALIZE_STREAM_MAX_SIZE_MB} - -wrapper.java.additional.28=-Dpypies.server=${PYPIES_SERVER} -wrapper.java.additional.29=-Dpypies.maxConnections=${PYPIES_MAX_CONN} - wrapper.java.additional.30=${PROFILER_PARAM_1} wrapper.java.additional.31=-Dlog4j.configuration=${LOG4J_CONF} -# moved these from environment.xml to setup.env -wrapper.java.additional.32=-Dhttp.server=${HTTP_SERVER} -wrapper.java.additional.33=-Djms.server=${JMS_SERVER} -wrapper.java.additional.34=-Ddatadelivery.server=${DATADELIVERY_SERVER} -wrapper.java.additional.35=-Debxml.registry.service=${EBXML_REGISTRY_SERVICE} -wrapper.java.additional.36=-Debxml.registry.lcm.service=${EBXML_REGISTRY_LCM_SERVICE} -wrapper.java.additional.37=-Debxml.registry.query.service=${EBXML_REGISTRY_QUERY_SERVICE} - wrapper.java.additional.38=-DHighMem=${HIGH_MEM_FLAG} -wrapper.java.additional.39=-Dmanagement.port=${MGMT_PORT} wrapper.java.additional.40=-Dqpid.dest_syntax=BURL wrapper.java.additional.41=-Dweb.port=8080 wrapper.java.additional.42=-Dconfidential.port=8443 -wrapper.java.additional.43=-Dhttp.port=${HTTP_PORT} wrapper.java.additional.44=-Dedex.arch=${EDEX_BITS}-bit -wrapper.java.additional.45=-Dedex.tmp=${TEMP_DIR} -wrapper.java.additional.46=-Dncf.bandwidth.manager.service=${NCF_BANDWIDTH_MANAGER_SERVICE} wrapper.java.additional.52=-DinitializeHibernatables=true wrapper.java.additional.53=-Dorg.apache.camel.jmx.disabled=true -wrapper.java.additional.54=-DebxmlFederationEnabled=${EBXML_REGISTRY_FEDERATION_ENABLED} -wrapper.java.additional.55=-DebxmlSubscriptionsEnabled=${EBXML_REGISTRY_SUBSCRIPTIONS_ENABLED} # Initial Java Heap Size (in MB) wrapper.java.initmemory=${INIT_MEM} diff --git a/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-request.xml b/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-request.xml index 0b43faa2a6..9a9685cc57 100644 --- a/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-request.xml +++ b/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-request.xml @@ -9,7 +9,7 @@ xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler"> + uri="jetty:http://0.0.0.0:${HTTP_PORT}/services/subscribe?disableStreamCache=true" /> diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml index 7fa8302e12..d5b79a87fb 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml @@ -131,7 +131,7 @@ - + diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetClientsHandler.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetClientsHandler.java index 41bdc7b7ef..25001c5896 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetClientsHandler.java +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetClientsHandler.java @@ -104,7 +104,7 @@ public class GetClientsHandler implements IRequestHandler { PythonScript ps = scriptCache.get(); HashMap argsHash = new HashMap(); - argsHash.put("brokerHost", System.getProperty("broker.addr")); + argsHash.put("brokerHost", System.getenv("BROKER_ADDR")); try { Object obj = ps.execute("getConnections", argsHash); if (obj instanceof String[]) { diff --git a/edexOsgi/com.raytheon.edex.productsrv/res/spring/uengine-request.xml b/edexOsgi/com.raytheon.edex.productsrv/res/spring/uengine-request.xml index c36ca116b7..5882a19aca 100644 --- a/edexOsgi/com.raytheon.edex.productsrv/res/spring/uengine-request.xml +++ b/edexOsgi/com.raytheon.edex.productsrv/res/spring/uengine-request.xml @@ -63,9 +63,9 @@ + uri="jetty:http://0.0.0.0:${HTTP_PORT}/services/pyproductthrift?disableStreamCache=true&chunked=false&httpBindingRef=#binaryHttpBinding" /> + uri="jetty:http://0.0.0.0:${HTTP_PORT}/services/pyproductjaxb" /> diff --git a/edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/GetServersHandler.java b/edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/GetServersHandler.java index 7d9be2b7d2..ead823087b 100644 --- a/edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/GetServersHandler.java +++ b/edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/GetServersHandler.java @@ -28,7 +28,6 @@ import com.raytheon.uf.common.localization.msgs.GetServersRequest; import com.raytheon.uf.common.localization.msgs.GetServersResponse; import com.raytheon.uf.common.serialization.comm.IRequestHandler; import com.raytheon.uf.common.util.registry.GenericRegistry; -import com.raytheon.uf.edex.core.props.PropertiesFactory; /** * Handler class for retrieving the http and jms servers from the @@ -43,6 +42,7 @@ import com.raytheon.uf.edex.core.props.PropertiesFactory; * Sep 12, 2012 1167 djohnson Add datadelivery servers. * Jan 14, 2013 1469 bkowal No longer includes the hdf5 data directory * in the response. + * May 28, 2013 1989 njensen Uses env variables instead of system props * * * @@ -59,9 +59,9 @@ public class GetServersHandler extends GenericRegistry public GetServersResponse handleRequest(GetServersRequest request) throws Exception { GetServersResponse response = new GetServersResponse(); - String httpServer = System.getProperty("http.server"); - String jmsServer = System.getProperty("jms.server"); - String pypiesServer = System.getProperty("pypies.server"); + String httpServer = System.getenv("HTTP_SERVER"); + String jmsServer = System.getenv("JMS_SERVER"); + String pypiesServer = System.getenv("PYPIES_SERVER"); logger.info("http.server=" + httpServer); logger.info("jms.server=" + jmsServer); diff --git a/edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-request.xml b/edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-request.xml index 0ba0f12f97..02938261ee 100644 --- a/edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-request.xml +++ b/edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-request.xml @@ -10,7 +10,7 @@ errorHandlerRef="errorHandler"> + uri="jetty:http://0.0.0.0:${HTTP_PORT}/services/thrift?disableStreamCache=true&chunked=false&httpBindingRef=#binaryHttpBinding" /> @@ -29,6 +29,6 @@ - + \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo-router.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo-router.xml index fd01e1db8c..dbdc26c66b 100644 --- a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo-router.xml +++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo-router.xml @@ -4,7 +4,7 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd"> - + - + - + @@ -28,23 +28,23 @@ - + - + - + - + \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.management/res/spring/management-common.xml b/edexOsgi/com.raytheon.uf.edex.management/res/spring/management-common.xml index 8938f062e1..beac1c5238 100644 --- a/edexOsgi/com.raytheon.uf.edex.management/res/spring/management-common.xml +++ b/edexOsgi/com.raytheon.uf.edex.management/res/spring/management-common.xml @@ -38,7 +38,7 @@ autoStartup="true"> + uri="jetty:http://0.0.0.0:${MGMT_PORT}/services/edexMgmt?disableStreamCache=true" /> diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-request.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-request.xml index ca7a370a77..c5079dc65c 100644 --- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-request.xml +++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-request.xml @@ -21,7 +21,7 @@ errorHandlerRef="errorHandler"> + uri="jetty:http://0.0.0.0:${HTTP_PORT}/services/mpeFieldGenHttpService?disableStreamCache=true" /> 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 a03a3603ee..ff6e4b5004 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 @@ -6,11 +6,11 @@ http://www.springframework.org/schema/tx/spring-tx.xsd"> - + - + diff --git a/edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml b/edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml index ad4b721939..342c0c1afb 100644 --- a/edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml +++ b/edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml @@ -6,7 +6,7 @@ + uri="jetty:http://0.0.0.0:${HTTP_PORT}/services/textdbsrv?disableStreamCache=true" /> diff --git a/ncep/gov.noaa.nws.ncep.edex.purgeutil/res/spring/purgeutil-request.xml b/ncep/gov.noaa.nws.ncep.edex.purgeutil/res/spring/purgeutil-request.xml index 962361a080..259c433be6 100644 --- a/ncep/gov.noaa.nws.ncep.edex.purgeutil/res/spring/purgeutil-request.xml +++ b/ncep/gov.noaa.nws.ncep.edex.purgeutil/res/spring/purgeutil-request.xml @@ -55,7 +55,7 @@ + uri="jetty:http://0.0.0.0:${HTTP_PORT}/services/purgePlugin" />