Merge tag 'OB_14.4.1-21' into master_15.1.1

14.4.1-21


Former-commit-id: 77002144a1 [formerly f13fe9af9cb5278362da4b3c67c5997b8ecedd1a]
Former-commit-id: 7809af88b9

cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java

@@ -329,7 +329,9 @@ public class FogMonitor extends ObsMonitor implements IFogResourceListener {
      */
     @Override
     public void nullifyMonitor() {
+        if (zoneDialog != null) {
             monitor.removeMonitorListener(zoneDialog);
+        }
         ProductAlertObserver.removeObserver(OBS, this);
         monitor = null;
     }
@@ -380,9 +382,11 @@ public class FogMonitor extends ObsMonitor implements IFogResourceListener {
                 }
             }
         } else {
+            if (monitor != null) {
                 monitor.nullifyMonitor();
             }
         }
+    }
 
     /**
      * Gets the station Table Data.

deltaScripts/14.4.1/DR2587/nonNullTimes.sh

@@ -1,5 +1,12 @@
 #!/bin/bash
 
+PSQL="/awips2/psql/bin/psql"
+
+# vaa plugin was in rare occassions inserting records without a time which are then never purged
+${PSQL} -U awips -d metadata -c "delete from vaa_location where parentid in (select recordid from vaa_subpart where parentid in (select id from vaa where reftime is NULL))"
+${PSQL} -U awips -d metadata -c "delete from vaa_subpart where parentid in (select id from vaa where reftime is NULL)"
+${PSQL} -U awips -d metadata -c "delete from vaa where reftime is NULL"
+
 tables=$(psql -U awips -d metadata -tc "select table_name from information_schema.columns where column_name = 'reftime'")
 
 echo "Updating record tables to disallow null times"

deltaScripts/14.4.1/DR2714/removeOldSatTables.sh

@@ -10,7 +10,7 @@ PSQL="/awips2/psql/bin/psql"
 for table in satellite_creating_entities satellite_geostationary_positions satellite_physical_elements satellite_sector_ids satellite_sources satellite_units
 do
     echo Dropping table: $table
-    command="DROP TABLE $table"
+    command="DROP TABLE IF EXISTS $table"
     if ${PSQL} -U ${DBUSER} -d ${DBNAME} -c "$command"
     then
         echo $table dropped successfully

deltaScripts/14.4.1/DR3410/lonLatDoubleToReal.sh

@@ -19,6 +19,7 @@ function changeToReal {
 }
 
 msg="INFO: All columns changed successfully"
+${PSQL} -U awips -d metadata -c "drop table if exists bufrmos"
 
 for table in ${TABLES[*]}
 do

deltaScripts/14.4.1/DR3644/dropCcfpDataURI.sh

@@ -3,6 +3,8 @@
 
 PSQL="/awips2/psql/bin/psql"
 
+${PSQL} -U awips -d metadata -c "delete from ccfp where id in (select a.id from ccfp a, ccfp b where a.id < b.id and a.reftime = b.reftime and a.producttype = b.producttype and a.boxlat = b.boxlat and a.boxlong = b.boxlong)"
+
 # takes one arg: a table name
 # drops the datauri constraint and column if they exist
 function dropDatauri {
@@ -34,7 +36,7 @@ function dropDatauriAndAddConstraint {
 echo "INFO: Dropping ccfp dataURI columns."
 
 dropDatauriAndAddConstraint ccfp ccfp_reftime_producttype_boxlat_boxlong_key "(reftime, producttype, boxlat, boxlong)"
-${PSQL} -U awips -d metadata -c "DROP INDEX ccfp_reftimeindex;"
+${PSQL} -U awips -d metadata -c "DROP INDEX IF EXISTS ccfp_reftimeindex;"
 ${PSQL} -U awips -d metadata -c "CREATE INDEX ccfp_reftimeindex ON ccfp USING btree (reftime);"
 ${PSQL} -U awips -d metadata -c "VACUUM FULL ANALYZE ccfp"
 

deltaScripts/14.4.1/DR3722/dropTafDataURI.sh

@@ -34,7 +34,7 @@ function dropDatauriAndAddConstraint {
 echo "INFO: Dropping taf dataURI columns."
 
 dropDatauriAndAddConstraint taf taf_reftime_stationid_corindicator_amdindicator_issuetimestring_key "(reftime, stationid, corindicator, amdindicator, issue_timestring)"
-${PSQL} -U awips -d metadata -c "DROP INDEX taf_reftimeindex;"
+${PSQL} -U awips -d metadata -c "DROP INDEX IF EXISTS taf_reftimeindex;"
 ${PSQL} -U awips -d metadata -c "CREATE INDEX taf_reftimeindex ON taf USING btree (reftime);"
 ${PSQL} -U awips -d metadata -c "VACUUM FULL ANALYZE taf"
 

deltaScripts/14.4.1/DR3788/updateSatSpatial.sh

@@ -5,6 +5,7 @@ PSQL="/awips2/psql/bin/psql"
 
 echo "INFO: Updating satellite spatial table"
 
+${PSQL} -U awips -d metadata -q -c "delete from satellite_spatial where gid not in (select distinct coverage_gid from satellite)"
 ${PSQL} -U awips -d metadata -q -c "ALTER TABLE satellite_spatial DROP CONSTRAINT IF EXISTS uk_fdpq7gpkgi3r3k76j83x7axb1"
 ${PSQL} -U awips -d metadata -c "ALTER TABLE satellite_spatial ADD CONSTRAINT uk_fdpq7gpkgi3r3k76j83x7axb1 UNIQUE (minx, miny, dx, dy, nx, ny, crswkt)"
 ${PSQL} -U awips -d metadata -c "CREATE SEQUENCE satspatial_seq INCREMENT 1 MINVALUE 1 MAXVALUE 9223372036854775807 START 1 CACHE 1;"

edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/export_configuration

@@ -1,4 +1,36 @@
 #!/bin/bash
+
+##
+# 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.
+#
+##
+
+##
+#
+# SOFTWARE HISTORY
+# Date         Ticket#    Engineer    Description
+# ------------ ---------- ----------- --------------------------
+# Mar 23, 2015  #4308     dgilling    Export mixedCaseProductIds.txt.
+#
+##
+
+
 if [ ${#AWIPS_HOME} = 0 ]
 then
         path_to_script=`readlink -f $0`
@@ -71,6 +103,7 @@ log_msg 35
 log_msg Copying common site configuration for site ${CAPS_SITE} to temporary directory...
 cp -r ${LOCALIZATION_PATH}/common_static/site/${CAPS_SITE}/gfe $commonDest/site
 cp -r ${LOCALIZATION_PATH}/common_static/site/${CAPS_SITE}/vtec $commonDest/site
+cp -r ${LOCALIZATION_PATH}/common_static/site/${CAPS_SITE}/mixedCase $commonDest/site
 log_msg 40
 
 log_msg Copying edex site configuration for site ${CAPS_SITE} to temporary directory...

edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/proc_receive_config

@@ -28,6 +28,8 @@
 #    03/20/14        #2933         randerso       Changed PRDDIR and LOGDIR to use
 #                                                  Backup site's configuration 
 #    01/30/15        #17081        lshi           Added backup vtec
+#    03/23/15        #4308         dgilling       Import mixedCaseProductIds.txt.
+#
 ##############################################################################
 
 import_file=${1}
@@ -179,6 +181,8 @@ cp -r GFEconfig/cave_static/site/* ${cave_site_dest}
 # DR 17081
 log_msg 91
 cp -r GFEconfig/common_static/site/vtec ${common_site_dest}
+log_msg 92
+cp -r GFEconfig/common_static/site/mixedCase ${common_site_dest}
 log_msg 93
 # DR 16464
 cp -a GFEConfig/site/rsync_parms.${SITE_CAPS} ${rsync_parms_dest}.${SITE_CAPS}

edexOsgi/com.raytheon.uf.tools.gfesuite/deploy.xml

@@ -44,6 +44,10 @@
 		<istrue value="${client.build}"/>
 	</condition>
 	
+	<condition property="deploy.hti" value="yes">
+			<isfalse value="${client.build}"/>
+	</condition>
+	
 	<condition property="deploy.svcBackup" value="yes">
 		<and>
 			<isfalse value="${client.build}"/>
@@ -94,13 +98,12 @@
     	</copy>
 	</target>
 	
-	<target name="-deploy.hti" 
+	<target name="-deploy.hti" if="deploy.hti" 
 		description="Deploys HTI software to a specific directory">
 		<!-- copy the CLI tools to the deploy directory -->
 		<echo message="Copying in HTI files" />
 		<copy todir="${gfe.suite.hti}" overwrite="true">
 			<fileset dir="${basedir}/hti"/>
-			<filterset refid="installer.filter.set"/>
 		</copy>
 	</target>
 		

rpms/awips2.core/Installer.gfesuite-server/component.spec

@@ -99,6 +99,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(644,awips,fxalpha,775)
 %dir /awips2/GFESuite/nwps
 /awips2/GFESuite/nwps/*
+%defattr(775,awips,fxalpha,775)
+%dir /awips2/GFESuite/hti
+/awips2/GFESuite/hti/*
 %defattr(755,awips,fxalpha,755)
 %dir /awips2/GFESuite/bin
 /awips2/GFESuite/bin/*

rpms/awips2.core/Installer.ldm/component.spec

@@ -1,4 +1,4 @@
-%define _ldm_version 6.12.6
+%define _ldm_version 6.12.9
 %define _ldm_src_tar ldm-%{_ldm_version}.tar.gz
 # ldm-%{_ldm_version}.tar.gz is tarred up ldm-%{_ldm_version}/src dir after
 # ISG makes retrans changes
@@ -351,21 +351,21 @@ do
    fi
 done
 #if a remote CP site, copy over the filtered data configuration
-if [ ${_myHost} == "dx1" -o ${_myHost} == "dx2" ] ; then
-   case $SITE_IDENTIFIER in gum|hfo|pbp|vrh)
-      echo -e "\nInstalling ldmd.conf for $SITE_IDENTIFIER."
-      if ! scp /usr/local/ldm-%{_ldm_version}/etc/ldmd.conf.$SITE_IDENTIFIER cpsbn1:/usr/local/ldm/etc/ldmd.conf
-      then
-         echo "ERROR: Failed copy of ldmd.conf to cpsbn1"
-      fi
-
-      if ! scp /usr/local/ldm-%{_ldm_version}/etc/ldmd.conf.$SITE_IDENTIFIER cpsbn2:/usr/local/ldm/etc/ldmd.conf
-      then
-         echo "ERROR: Failed copy of ldmd.conf to cpsbn2"
-      fi
-      ;;
-   esac
-fi
+#if [ ${_myHost} == "dx1" -o ${_myHost} == "dx2" ] ; then
+#   case $SITE_IDENTIFIER in gum|hfo|pbp|vrh)
+#      echo -e "\nInstalling ldmd.conf for $SITE_IDENTIFIER."
+#      if ! scp /usr/local/ldm-%{_ldm_version}/etc/ldmd.conf.$SITE_IDENTIFIER cpsbn1:/usr/local/ldm/etc/ldmd.conf
+#      then
+#         echo "ERROR: Failed copy of ldmd.conf to cpsbn1"
+#      fi
+#
+#      if ! scp /usr/local/ldm-%{_ldm_version}/etc/ldmd.conf.$SITE_IDENTIFIER cpsbn2:/usr/local/ldm/etc/ldmd.conf
+#      then
+#         echo "ERROR: Failed copy of ldmd.conf to cpsbn2"
+#      fi
+#      ;;
+#   esac
+#fi
 
 # remove the extra configuration files
 rm -f /usr/local/ldm/etc/ldmd.conf.*