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

Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables

Browse source 
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c

Former-commit-id: 281edabb772b68e80bf6a9456f3a8e19576ed7da
This commit is contained in:
Nate Jensen 2013-05-28 18:00:13 -05:00
parent 7c1e6e8b09
commit 82d6c03669
15 changed files with 32 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
edexOsgi/build.edex/esb/conf/spring/edex.xml
View file

@ -19,7 +19,7 @@
<!-- specify the connection to the broker (qpid) -->
<!-- MaxPrefetch set at 0, due to DataPool routers getting messages backed up behind long running tasks -->
<bean id="amqConnectionFactory" class="org.apache.qpid.client.AMQConnectionFactory">
<constructor-arg type="java.lang.String" value="amqp://guest:guest@/edex?brokerlist='tcp://${broker.addr}?retries='9999'&amp;connecttimeout='5000'&amp;connectdelay='5000''&amp;maxprefetch='0'&amp;sync_publish='all'&amp;sync_ack='true'"/>
<constructor-arg type="java.lang.String" value="amqp://guest:guest@/edex?brokerlist='tcp://${BROKER_ADDR}?retries='9999'&amp;connecttimeout='5000'&amp;connectdelay='5000''&amp;maxprefetch='0'&amp;sync_publish='all'&amp;sync_ack='true'"/>
</bean>
<bean id="jmsPooledConnectionFactory" class="com.raytheon.uf.common.jms.JmsPooledConnectionFactory">
@ -35,8 +35,8 @@
<bean id="genericThreadPool"
class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
<property name="corePoolSize" value="${jms.pool.min}" />
<property name="maxPoolSize" value="${jms.pool.max}" />
<property name="corePoolSize" value="${JMS_POOL_MIN}" />
<property name="maxPoolSize" value="${JMS_POOL_MAX}" />
<property name="queueCapacity" value="0" />
</bean>
@ -95,7 +95,7 @@
-->
<bean id="httpClient" class="com.raytheon.uf.common.comm.HttpClient" factory-method="getInstance">
<property name="maxConnectionsPerHost" value="${pypies.maxConnections}"/>
<property name="maxConnectionsPerHost" value="${PYPIES_MAX_CONN}"/>
<!-- value in milliseconds to allow socket to timeout, don't allow this to be zero, bad things could happen -->
<property name="socketTimeout" value="180000"/>
<property name="compressRequests" value="false"/>
@ -103,7 +103,7 @@
</bean>
<bean id="pypiesStoreProps" class="com.raytheon.uf.common.pypies.PypiesProperties">
<property name="address" value="${pypies.server}" />
<property name="address" value="${PYPIES_SERVER}" />
</bean>
<bean id="pypiesDataStoreFactory" class="com.raytheon.uf.common.pypies.PyPiesDataStoreFactory">
<constructor-arg ref="pypiesStoreProps" />
@ -211,9 +211,9 @@
<!-- Serialization Pool -->
<bean id="baosPool" class="com.raytheon.uf.common.util.ByteArrayOutputStreamPool" factory-method="getInstance">
<property name="maxPoolSize" value="${ByteArrayOutputStreamPool.maxPoolSize}"/>
<property name="initStreamSize" value="${ByteArrayOutputStreamPool.initStreamSize}"/>
<property name="maxStreamSize" value="${ByteArrayOutputStreamPool.maxStreamSize}"/>
<property name="maxPoolSize" value="${SERIALIZE_POOL_MAX_SIZE}"/>
<property name="initStreamSize" value="${SERIALIZE_STREAM_INIT_SIZE_MB}"/>
<property name="maxStreamSize" value="${SERIALIZE_STREAM_MAX_SIZE_MB}"/>
</bean>
<bean id="edexLocalizationObserver" class="com.raytheon.edex.utility.EDEXLocalizationNotificationObserver" factory-method="getInstance"/>

29
edexOsgi/build.edex/esb/conf/wrapper.conf
View file

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

2
edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-request.xml
View file

@ -9,7 +9,7 @@
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" />
uri="jetty:http://0.0.0.0:${HTTP_PORT}/services/subscribe?disableStreamCache=true" />
<!-- SubscriptionSrv routes -->
<route id="subscriptionHTTP">

2
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
View file

@ -131,7 +131,7 @@
<!-- Beans to define a custom jms connection which will allow a durable subscription -->
<bean id="gfeNotifyConnectionFactory" class="org.apache.qpid.client.AMQConnectionFactory">
<constructor-arg type="java.lang.String" value="amqp://guest:guest@gfeNotify/edex?brokerlist='tcp://${broker.addr}?retries='9999'&amp;connecttimeout='5000'&amp;connectdelay='5000''&amp;maxprefetch='0'&amp;sync_publish='all'&amp;sync_ack='true'"/>
<constructor-arg type="java.lang.String" value="amqp://guest:guest@gfeNotify/edex?brokerlist='tcp://${BROKER_ADDR}?retries='9999'&amp;connecttimeout='5000'&amp;connectdelay='5000''&amp;maxprefetch='0'&amp;sync_publish='all'&amp;sync_ack='true'"/>
</bean>
<bean id="gfeNotifyPooledConnectionFactory" class="com.raytheon.uf.common.jms.JmsPooledConnectionFactory">

2
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetClientsHandler.java
View file

@ -104,7 +104,7 @@ public class GetClientsHandler implements IRequestHandler<GetClientsRequest> {
PythonScript ps = scriptCache.get();
HashMap<String, Object> argsHash = new HashMap<String, Object>();
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[]) {

4
edexOsgi/com.raytheon.edex.productsrv/res/spring/uengine-request.xml
View file

@ -63,9 +63,9 @@
<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&amp;chunked=false&amp;httpBindingRef=#binaryHttpBinding" />
uri="jetty:http://0.0.0.0:${HTTP_PORT}/services/pyproductthrift?disableStreamCache=true&amp;chunked=false&amp;httpBindingRef=#binaryHttpBinding" />
<endpoint id="uEngineHttpJaxb_from"
uri="jetty:http://0.0.0.0:${http.port}/services/pyproductjaxb" />
uri="jetty:http://0.0.0.0:${HTTP_PORT}/services/pyproductjaxb" />
<!-- UEngine routes -->
<route id="uEngineHttpThrift" streamCache="false">

8
edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/GetServersHandler.java
View file

@ -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
*
* </pre>
*
@ -59,9 +59,9 @@ public class GetServersHandler extends GenericRegistry<String, String>
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);

4
edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-request.xml
View file

@ -10,7 +10,7 @@
errorHandlerRef="errorHandler">
<endpoint id="thriftService_from"
uri="jetty:http://0.0.0.0:${http.port}/services/thrift?disableStreamCache=true&amp;chunked=false&amp;httpBindingRef=#binaryHttpBinding" />
uri="jetty:http://0.0.0.0:${HTTP_PORT}/services/thrift?disableStreamCache=true&amp;chunked=false&amp;httpBindingRef=#binaryHttpBinding" />
<route id="thriftService" streamCache="false">
<from uri="ref:thriftService_from" />
@ -29,6 +29,6 @@
<bean factory-bean="serverLocationRegistry" factory-method="register">
<constructor-arg ref="requestServerKey" />
<constructor-arg value="${http.server}" />
<constructor-arg value="${HTTP_SERVER}" />
</bean>
</beans>

2
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo-router.xml
View file

@ -4,7 +4,7 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
<bean id="ncfBandwidthManagerServiceRouter" class="com.raytheon.uf.edex.auth.RemoteServerRequestRouter">
<constructor-arg value="${ncf.bandwidth.manager.service}" />
<constructor-arg value="${NCF_BANDWIDTH_MANAGER_SERVICE}" />
</bean>
<bean id="registerNcfBandwidthManagerServiceRouter"

12
edexOsgi/com.raytheon.uf.edex.datadelivery.request/res/spring/request-router.xml
View file

@ -7,11 +7,11 @@
http://www.springframework.org/schema/util/spring-util-2.5.xsd">
<bean id="requestDataDeliveryRouter" class="com.raytheon.uf.edex.auth.RemoteServerRequestRouter">
<constructor-arg value="${datadelivery.server}" />
<constructor-arg value="${DATADELIVERY_SERVER}" />
</bean>
<bean id="requestRegistryRouter" class="com.raytheon.uf.edex.auth.RemoteServerRequestRouter">
<constructor-arg value="${ebxml.registry.service}" />
<constructor-arg value="${EBXML_REGISTRY_SERVICE}" />
</bean>
<!-- Registers the IRequestRouter handler for data delivery -->
@ -28,23 +28,23 @@
<!-- Registry service location registration -->
<bean factory-bean="serverLocationRegistry" factory-method="register">
<constructor-arg ref="ebxmlRegistryServiceKey" />
<constructor-arg value="${ebxml.registry.service}" />
<constructor-arg value="${EBXML_REGISTRY_SERVICE}" />
</bean>
<bean factory-bean="serverLocationRegistry" factory-method="register">
<constructor-arg ref="ebxmlLcmServiceKey" />
<constructor-arg value="${ebxml.registry.lcm.service}" />
<constructor-arg value="${EBXML_REGISTRY_LCM_SERVICE}" />
</bean>
<bean factory-bean="serverLocationRegistry" factory-method="register">
<constructor-arg ref="ebxmlQueryServiceKey" />
<constructor-arg value="${ebxml.registry.query.service}" />
<constructor-arg value="${EBXML_REGISTRY_QUERY_SERVICE}" />
</bean>
<!-- Data Delivery server location registration -->
<bean factory-bean="serverLocationRegistry" factory-method="register">
<constructor-arg ref="dataDeliveryServerKey" />
<constructor-arg value="${datadelivery.server}" />
<constructor-arg value="${DATADELIVERY_SERVER}" />
</bean>
</beans>

2
edexOsgi/com.raytheon.uf.edex.management/res/spring/management-common.xml
View file

@ -38,7 +38,7 @@
autoStartup="true">
<endpoint id="managementEndpoint"
uri="jetty:http://0.0.0.0:${management.port}/services/edexMgmt?disableStreamCache=true" />
uri="jetty:http://0.0.0.0:${MGMT_PORT}/services/edexMgmt?disableStreamCache=true" />
<route id="managementService">
<from ref="managementEndpoint" />

2
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-request.xml
View file

@ -21,7 +21,7 @@
errorHandlerRef="errorHandler">
<endpoint id="mpeHttp_from"
uri="jetty:http://0.0.0.0:${http.port}/services/mpeFieldGenHttpService?disableStreamCache=true" />
uri="jetty:http://0.0.0.0:${HTTP_PORT}/services/mpeFieldGenHttpService?disableStreamCache=true" />
<route id="mpeHttp">
<from uri="ref:mpeHttp_from" />

4
edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-constants.xml
View file

@ -6,11 +6,11 @@
http://www.springframework.org/schema/tx/spring-tx.xsd">
<bean id="ebxmlFederationEnabled" class="java.lang.Boolean">
<constructor-arg value="${ebxmlFederationEnabled}" />
<constructor-arg value="${EBXML_REGISTRY_FEDERATION_ENABLED}" />
</bean>
<bean id="ebxmlSubscriptionsEnabled" class="java.lang.Boolean">
<constructor-arg value="${ebxmlSubscriptionsEnabled}" />
<constructor-arg value="${EBXML_REGISTRY_SUBSCRIPTIONS_ENABLED}" />
</bean>
<bean id="ebxmlEmailEnabled" class="java.lang.Boolean">

2
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
View file

@ -6,7 +6,7 @@
<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" />
uri="jetty:http://0.0.0.0:${HTTP_PORT}/services/textdbsrv?disableStreamCache=true" />
<route id="textdbsrvXml">
<from uri="ref:textdbsrvXml_from" />

2
ncep/gov.noaa.nws.ncep.edex.purgeutil/res/spring/purgeutil-request.xml
View file

@ -55,7 +55,7 @@
<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" />
uri="jetty:http://0.0.0.0:${HTTP_PORT}/services/purgePlugin" />
<route id="nceppurgeHttp">
<from uri="ref:nceppurgeHttp_from" />