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

Issue #1772 - remove references to the DEV_MODE jvm parameter

Browse source 
- removed ScriptLibraryManager.java

Change-Id: Ia373f431f0faac1020ee80962d20705bc3c6080e

Former-commit-id: 19b26c9f04 [formerly dd811f674b] [formerly 19b26c9f04 [formerly dd811f674b] [formerly 58316907ae [formerly 627fd3ccd5baa06d63f0e24b9824a5739d48e91a]]]
Former-commit-id: 58316907ae
Former-commit-id: 8c91869c8e [formerly 86c287bb33]
Former-commit-id: 39ff5c7945
This commit is contained in:
Bryan Kowal 2013-03-13 17:58:17 -05:00
parent 34a1c7b784
commit 851eb395f7
4 changed files with 43 additions and 192 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
edexOsgi/build.edex/esb/conf/res/base/attributeNames.xml
View file

@ -156,8 +156,6 @@
<GREEN>green</GREEN>
<JSLIBRARY>jsLibraryDir</JSLIBRARY>
<DEVMODE>edexDevMode</DEVMODE>
<LowLightVis>3</LowLightVis>
<IRDefault>7</IRDefault>

1
edexOsgi/build.edex/esb/conf/res/base/environment.xml
View file

@ -48,7 +48,6 @@
<shareDir>${env:edex.home}/data/share</shareDir>
<utilityDir>${env:edex.home}/data/utility</utilityDir>
<staticDir>${env:edex.home}/data/static</staticDir>
<edexDevMode>edex.dev.mode</edexDevMode>
<gfeSmartInitEnable>true</gfeSmartInitEnable>
<fxaDebugSaveBadTextFiles>false</fxaDebugSaveBadTextFiles>
<svcBackupDir>${env:edex.home}/../GFESuite/</svcBackupDir>

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

@ -84,69 +84,66 @@ wrapper.jvm.parameter.order.LAST=-classpath
# sets the Maximum Permanent Generation memory size
wrapper.java.additional.3=-XX:MaxPermSize=${MAX_PERM_SIZE}
# sets the JS dev mode flag into the System properties
wrapper.java.additional.4=-Dedex.dev.mode=${DEV_MODE}
# turn on JMX access to basic JVM instrumentation
wrapper.java.additional.5=-Dcom.sun.management.jmxremote
wrapper.java.additional.4=-Dcom.sun.management.jmxremote
# Enforces GMT to be used as the timezone
wrapper.java.additional.6=-Duser.timezone=GMT
wrapper.java.additional.5=-Duser.timezone=GMT
wrapper.java.additional.7=-XX:+UseConcMarkSweepGC
wrapper.java.additional.6=-XX:+UseConcMarkSweepGC
wrapper.java.additional.8=-XX:+CMSIncrementalMode
wrapper.java.additional.7=-XX:+CMSIncrementalMode
wrapper.java.additional.9=-Djava.net.preferIPv4Stack=true
wrapper.java.additional.10=-Ddb.addr=${DB_ADDR}
wrapper.java.additional.11=-Ddb.port=${DB_PORT}
wrapper.java.additional.12=-Dbroker.addr=${BROKER_ADDR}
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.13=-Ddc.db.name=${DC_DB_NAME}
wrapper.java.additional.14=-Dfxa.db.name=${FXA_DB_NAME}
wrapper.java.additional.15=-Dhm.db.name=${HM_DB_NAME}
wrapper.java.additional.16=-Dih.db.name=${IH_DB_NAME}
wrapper.java.additional.17=-Daw.site.identifier=${AW_SITE_IDENTIFIER}
wrapper.java.additional.18=-Ddata.archive.root=${DATA_ARCHIVE_ROOT}
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.19=-Djms.pool.min=${JMS_POOL_MIN}
wrapper.java.additional.20=-Djms.pool.max=${JMS_POOL_MAX}
wrapper.java.additional.21=-Ddb.metadata.pool.min=${METADATA_POOL_MIN}
wrapper.java.additional.22=-Ddb.metadata.pool.max=${METADATA_POOL_MAX}
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.23=-Dcom.sun.management.jmxremote.port=${EDEX_JMX_PORT}
wrapper.java.additional.24=-Dcom.sun.management.jmxremote.authenticate=false
wrapper.java.additional.25=-Dcom.sun.management.jmxremote.ssl=false
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.26=-DByteArrayOutputStreamPool.maxPoolSize=${SERIALIZE_POOL_MAX_SIZE}
wrapper.java.additional.27=-DByteArrayOutputStreamPool.initStreamSize=${SERIALIZE_STREAM_INIT_SIZE_MB}
wrapper.java.additional.28=-DByteArrayOutputStreamPool.maxStreamSize=${SERIALIZE_STREAM_MAX_SIZE_MB}
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.29=-Dpypies.server=${PYPIES_SERVER}
wrapper.java.additional.30=-Dpypies.maxConnections=${PYPIES_MAX_CONN}
wrapper.java.additional.28=-Dpypies.server=${PYPIES_SERVER}
wrapper.java.additional.29=-Dpypies.maxConnections=${PYPIES_MAX_CONN}
wrapper.java.additional.35=${PROFILER_PARAM_1}
wrapper.java.additional.30=${PROFILER_PARAM_1}
wrapper.java.additional.36=-Dlog4j.configuration=${LOG4J_CONF}
wrapper.java.additional.31=-Dlog4j.configuration=${LOG4J_CONF}
# moved these from environment.xml to setup.env
wrapper.java.additional.37=-Dhttp.server=${HTTP_SERVER}
wrapper.java.additional.38=-Djms.server=${JMS_SERVER}
wrapper.java.additional.39=-Ddatadelivery.server=${DATADELIVERY_SERVER}
wrapper.java.additional.40=-Debxml.registry.service=${EBXML_REGISTRY_SERVICE}
wrapper.java.additional.41=-Debxml.registry.lcm.service=${EBXML_REGISTRY_LCM_SERVICE}
wrapper.java.additional.42=-Debxml.registry.query.service=${EBXML_REGISTRY_QUERY_SERVICE}
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.43=-DHighMem=${HIGH_MEM_FLAG}
wrapper.java.additional.44=-Dmanagement.port=${MGMT_PORT}
wrapper.java.additional.38=-DHighMem=${HIGH_MEM_FLAG}
wrapper.java.additional.39=-Dmanagement.port=${MGMT_PORT}
wrapper.java.additional.45=-Dqpid.dest_syntax=BURL
wrapper.java.additional.46=-Dweb.port=8080
wrapper.java.additional.47=-Dconfidential.port=8443
wrapper.java.additional.48=-Dhttp.port=${HTTP_PORT}
wrapper.java.additional.49=-Dedex.arch=${EDEX_BITS}-bit
wrapper.java.additional.50=-Dedex.tmp=${TEMP_DIR}
wrapper.java.additional.51=-Dncf.bandwidth.manager.service=${NCF_BANDWIDTH_MANAGER_SERVICE}
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}
# Initial Java Heap Size (in MB)
wrapper.java.initmemory=${INIT_MEM}

143
edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/ScriptLibraryManager.java
View file

@ -1,143 +0,0 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.edex.uengine;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
import java.util.HashMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import com.raytheon.edex.util.Util;
import com.raytheon.uf.edex.core.props.EnvProperties;
import com.raytheon.uf.edex.core.props.PropertiesFactory;
/**
* Reads the .js files on the server side and returns them.
*
* <pre>
* SOFTWARE HISTORY
*
* Date PR# Engineer Description
* ----------- ---------- ------------ --------------------------
* Apr 5, 2007 njensen Initial Creation
*
* </PRE>
*
*/
public class ScriptLibraryManager
{
private static final transient Log logger = LogFactory.getLog(ScriptLibraryManager.class);
private static final String LIBRARY_KEY = "JSLIBRARY";
private static String libraryPath = null;
private static HashMap<String, String> libraries = new HashMap<String, String>();
private static final String DEVMODE_KEY = "DEVMODE";
private static String devMode = null;
/**
* Returns the JavaScript library with the specified name, e.g. util.js
* @param aLibraryName the name of the library to return
* @return the contents of the library
*/
public static String getLibrary(String aLibraryName)
{
boolean devMode = getDevMode();
String code = libraries.get(aLibraryName);
if(code == null || devMode)
{
try
{
code = loadLibrary(aLibraryName);
}
catch (IOException e)
{
logger.warn("Unable to load JavaScript library " + aLibraryName, e);
}
}
return code;
}
/**
* Reads in the specified library and stores it in the HashMap.
* @param aLibraryName the name of the library to read in
* @return the contents of the file
* @throws IOException
*/
private static String loadLibrary(String aLibraryName) throws IOException
{
logger.debug("Loading library: " + aLibraryName);
String eol = Util.EOL;
StringBuffer buffer = new StringBuffer();
String path = getLibraryDirectory() + aLibraryName;
FileReader fr = new FileReader(path);
BufferedReader reader = new BufferedReader(fr);
String line = "";
while(line != null)
{
buffer.append(line).append(eol);
line = reader.readLine();
}
reader.close();
fr.close();
String text = buffer.toString();
libraries.put(aLibraryName, text);
return text;
}
/**
* Gets the directory for js libraries from the EnvProperties
* @return the directory for server side js libraries
*/
private static String getLibraryDirectory()
{
if(libraryPath == null)
{
EnvProperties props = PropertiesFactory.getInstance().getEnvProperties();
libraryPath = props.getEnvValue(LIBRARY_KEY);
}
return libraryPath;
}
/**
*
* @return
*/
private static boolean getDevMode() {
if (devMode == null) {
EnvProperties props = PropertiesFactory.getInstance().getEnvProperties();
String key = props.getEnvValue(DEVMODE_KEY);
devMode = System.getProperty(key);
}
return devMode.equals("on");
}
}