From 48d42794cc6fe80c12491f12c28ea1d0461a90a9 Mon Sep 17 00:00:00 2001 From: Michael James Date: Wed, 13 Sep 2017 11:24:57 -0600 Subject: [PATCH] localization rpm siteConfig.py moved form edex_static to common_static --- .../site/OAX/gfe/config/siteConfig.py | 20 ++++++------ .../site/OAX/config/gfe/siteConfig.py | 31 ------------------- .../Installer.localization/component.spec | 4 +-- .../config/gfe/localConfig.py | 0 .../config/gfe/siteConfig.py | 0 5 files changed, 12 insertions(+), 43 deletions(-) delete mode 100755 localization/localization/utility/edex_static/site/OAX/config/gfe/siteConfig.py rename rpms/awips2.core/Installer.localization/utility/{edex_static => siteconfig}/config/gfe/localConfig.py (100%) rename rpms/awips2.core/Installer.localization/utility/{edex_static => siteconfig}/config/gfe/siteConfig.py (100%) diff --git a/localization/localization/utility/common_static/site/OAX/gfe/config/siteConfig.py b/localization/localization/utility/common_static/site/OAX/gfe/config/siteConfig.py index d784636ba9..c87a8a9061 100755 --- a/localization/localization/utility/common_static/site/OAX/gfe/config/siteConfig.py +++ b/localization/localization/utility/common_static/site/OAX/gfe/config/siteConfig.py @@ -1,19 +1,19 @@ ## # 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 +# 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 -# +# 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. ## @@ -22,7 +22,7 @@ import os, socket -GFESUITE_HOME = os.environ['EDEX_HOME']+"/../GFESuite" +GFESUITE_HOME = "/awips2/GFESuite" GFESUITE_SERVER = "localhost" GFESUITE_PORT = '98000000' GFESUITE_SITEID = 'OAX' diff --git a/localization/localization/utility/edex_static/site/OAX/config/gfe/siteConfig.py b/localization/localization/utility/edex_static/site/OAX/config/gfe/siteConfig.py deleted file mode 100755 index c87a8a9061..0000000000 --- a/localization/localization/utility/edex_static/site/OAX/config/gfe/siteConfig.py +++ /dev/null @@ -1,31 +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. -## -#THIS FILE GENERATED AUTOMATICALLY DURING GFE INSTALL ** - -import os, socket - - -GFESUITE_HOME = "/awips2/GFESuite" -GFESUITE_SERVER = "localhost" -GFESUITE_PORT = '98000000' -GFESUITE_SITEID = 'OAX' -GFESUITE_PRDDIR = GFESUITE_HOME+"/products" -GFESUITE_LOGDIR = GFESUITE_HOME+"/logs/"+GFESUITE_SITEID -GFESUITE_MHSID = 'OAX' diff --git a/rpms/awips2.core/Installer.localization/component.spec b/rpms/awips2.core/Installer.localization/component.spec index ea2081df4d..f37f096e8a 100644 --- a/rpms/awips2.core/Installer.localization/component.spec +++ b/rpms/awips2.core/Installer.localization/component.spec @@ -106,9 +106,9 @@ do grep -rl 'LATITUDE' $CAVE_DIR | xargs sed -i 's/LATITUDE/'$lat'/g' grep -rl 'LONGITUDE' $CAVE_DIR | xargs sed -i 's/LONGITUDE/'$lon'/g' # EDEX - EDEX_DIR=$UTIL/edex_static/site/$site + EDEX_DIR=$UTIL/common_static/site/$site mkdir -p $EDEX_DIR - cp -R $BUILD_DIR/utility/edex_static/* $EDEX_DIR/ + cp -R $BUILD_DIR/utility/siteconfig/* $EDEX_DIR/ grep -rl 'XXX' $EDEX_DIR | xargs sed -i 's/XXX/'$site'/g' done diff --git a/rpms/awips2.core/Installer.localization/utility/edex_static/config/gfe/localConfig.py b/rpms/awips2.core/Installer.localization/utility/siteconfig/config/gfe/localConfig.py similarity index 100% rename from rpms/awips2.core/Installer.localization/utility/edex_static/config/gfe/localConfig.py rename to rpms/awips2.core/Installer.localization/utility/siteconfig/config/gfe/localConfig.py diff --git a/rpms/awips2.core/Installer.localization/utility/edex_static/config/gfe/siteConfig.py b/rpms/awips2.core/Installer.localization/utility/siteconfig/config/gfe/siteConfig.py similarity index 100% rename from rpms/awips2.core/Installer.localization/utility/edex_static/config/gfe/siteConfig.py rename to rpms/awips2.core/Installer.localization/utility/siteconfig/config/gfe/siteConfig.py