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

Omaha #2914 - Remove dependency on PropertiesFactory in Python code

Browse source 
Change-Id: Ide392a03ae9dbf37010d6a5b353ab3e01dbc66ac

Former-commit-id: c309fde837e1c8e270df94f7da513c4387f27e94
This commit is contained in:
Greg Armendariz 2014-07-28 14:45:55 -05:00
parent 143e42b887
commit 41f808be1b
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cave/com.raytheon.uf.viz.radarapps.fsi/src/com/raytheon/uf/viz/radarapps/fsi/getFsiEnviron.py
View file

@ -17,6 +17,14 @@
# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
# further licensing information.
##
# SOFTWARE HISTORY
#
# Date Ticket# Engineer Description
# ------------ ---------- ----------- --------------------------
# 07/29/14 DR 2914 G. Armendariz Remove call to PropertiesFactory
#
import os
from com.raytheon.uf.common.message.response import ResponseMessageGeneric
from java.util import HashMap
@ -45,8 +53,8 @@ if not d.has_key('rssdHost'):
d['rssdHost'] = socket.gethostname()
if not d.has_key('lbOutputDir'):
from com.raytheon.uf.edex.core import PropertiesFactory
arch_dir = PropertiesFactory.getInstance().getEnvProperties().getEnvValue("ARCHIVEDIR")
from java.lang import System
arch_dir = System.getProperty("data.archive.root")
d['lbOutputDir'] = os.path.join(arch_dir, "radar", "fsi")
for k, v in d.items():

6
edexOsgi/com.raytheon.uf.edex.dissemination/utility/edex_static/base/dissemination/handleOUP.py
View file

@ -36,6 +36,7 @@
# 10/12/12 DR 15418 D. Friedman Use unique attachment file names
# 11/20/13 DR 16777 D. Friedman Add a test mode.
# 12/05/16 DR 16842 D. Friedman Do not set product ID on MhsMessage
# 07/29/14 DR 2914 G. Armendariz Remove call to PropertiesFactory
#
#
@ -63,9 +64,8 @@ for line in f:
ACTION_CODES[codeSplit[0]] = codeSplit[1]
f.close()
from com.raytheon.uf.edex.core.props import PropertiesFactory
env = PropertiesFactory.getInstance().getEnvProperties()
dataDir = env.getEnvValue("DEFAULTDATADIR")
from com.raytheon.uf.edex.core import EDEXUtil
dataDir = EDEXUtil.getEdexData();
OUT_DIR = dataDir + 'outgoing'
if not os.path.isdir(OUT_DIR):
os.mkdir(OUT_DIR)