Merge remote-tracking branch 'origin/unidata_18.1.1' into windows_18.1.1

awips_install.sh

@@ -2,7 +2,7 @@
 # about:  AWIPS install manager
 # devorg: Unidata Program Center
 # author: <mjames@ucar.edu>
-# use: ./install.sh (--cave|--edex|--database|--ingest|--help)
+# use: ./awips_install.sh (--cave|--edex|--database|--ingest|--help)
 
 dir="$( cd "$(dirname "$0")" ; pwd -P )"
 

build/README.md

@@ -6,7 +6,7 @@
 
 We create and use the Docker image unidata/awips-ade to build the two RHEL binary distributions of AWIPS (RPMS). The directory **awips2-builds/build/awips-ade/** contains Dockerfiles for 64-bit EL6 and EL7 CentOS.
 
-    ./build/awips-ade/docker_build.sh ${os_version}
+    ./build/awips-ade/awips-ade.sh ${os_version}
 
 where **${os_version}** is either *el6* or *el7*.
 
@@ -14,8 +14,8 @@ ADE Docker images will be named with the latest major release and OS version
 
     docker images
     REPOSITORY              TAG           IMAGE ID        CREATED       SIZE
-    unidata/awips-ade       17.1.1-el6    77ea90df5919    16 min ago    4.13GB
+    unidata/awips-ade       18.1.1-el6    77ea90df5919    16 min ago    4.13GB
-    unidata/awips-ade       17.1.1-el7    f030be21eda9    23 min ago    3.95GB
+    unidata/awips-ade       18.1.1-el7    f030be21eda9    23 min ago    3.95GB
 
 ## Build AWIPS RPMs
 

build/awips-ade/Dockerfile.awips-ade.el7

@@ -1,27 +1,12 @@
-FROM awips-devel:el7
+FROM unidata/awips-devel:el7
 ENV VERSION 18.1.1
 ENV RELEASE 1
 MAINTAINER Michael James <mjames@ucar.edu>
 
 USER root
 
-RUN yum update yum -y
-
 RUN groupadd fxalpha && useradd -G fxalpha awips
 
-RUN yum groupinstall "Development tools" -y
-RUN yum install epel-release -y
-RUN yum clean all -y
-
-ENV systemDeps="wget rsync git net-tools"
-ENV rpmDeps="gcc gcc-c++ rpm-build readline-devel createrepo"
-ENV qpidDeps="boost-devel cmake make ruby libuuid-devel"
-ENV pythonDeps="tk-devel tcl-devel atlas-devel compat-libf2c-34 libgfortran geos-devel libpng-devel freetype"
-ENV awipsDeps="netcdf netcdf-devel hdf5-devel lzo-devel bzip2-devel qt-devel"
-ENV httpDeps="autoconf findutils libselinux-devel libxml2-devel lua-devel openldap-devel openssl-devel pcre-devel pkgconfig perl zlib-devel apr-util-devel apr-devel"
-
-RUN yum install $systemDeps $rpmDeps $qpidDeps $pythonDeps $awipsDeps $httpDeps -y
-
 RUN wget -O /etc/yum.repos.d/awips2.repo https://www.unidata.ucar.edu/software/awips2/doc/el7-dev.repo
 RUN yum -y clean all
 RUN yum groupinstall awips2-ade -y

build/awips-ade/Dockerfile.awips-devel.el7

@@ -0,0 +1,23 @@
+FROM centos:7
+ENV VERSION 18.1.1
+ENV RELEASE 1
+MAINTAINER Michael James <mjames@ucar.edu>
+
+USER root
+
+RUN yum update yum -y
+
+RUN yum groupinstall "Development tools" -y
+RUN yum install epel-release -y
+RUN yum clean all -y
+
+ENV systemDeps="wget rsync git net-tools"
+ENV rpmDeps="gcc gcc-c++ rpm-build readline-devel createrepo"
+ENV qpidDeps="boost-devel cmake make ruby libuuid-devel"
+ENV pythonDeps="tk-devel tcl-devel atlas-devel compat-libf2c-34 libgfortran geos-devel libpng-devel freetype"
+ENV awipsDeps="netcdf netcdf-devel hdf5-devel lzo-devel bzip2-devel qt-devel"
+ENV httpDeps="autoconf findutils libselinux-devel libxml2-devel lua-devel openldap-devel openssl-devel pcre-devel pkgconfig perl zlib-devel apr-util-devel apr-devel"
+
+RUN yum install $systemDeps $rpmDeps $qpidDeps $pythonDeps $awipsDeps $httpDeps -y
+
+ENTRYPOINT ["/bin/bash"]

build/buildEnvironment.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Version
 export AWIPSII_VERSION="18.1.1"
-export AWIPSII_RELEASE="1"
+export AWIPSII_RELEASE="4"
 # Author
 export AWIPSII_BUILD_VENDOR="UCAR"
 export AWIPSII_BUILD_SITE="Unidata"

build/edex-ingest/Dockerfile.edex

@@ -1,16 +0,0 @@
-FROM centos:7
-ENV VERSION 18.1.1
-ENV RELEASE 1
-MAINTAINER Michael James <mjames@ucar.edu>
-USER root
-
-RUN yum update yum -y
-RUN groupadd fxalpha && useradd -G fxalpha awips
-RUN yum install epel-release wget -y
-RUN yum clean all -y
-RUN wget -O /etc/yum.repos.d/awips2.repo https://www.unidata.ucar.edu/software/awips2/doc/el7-dev.repo
-RUN wget https://www.unidata.ucar.edu/software/awips2/install.sh
-RUN chmod +x install.sh
-RUN ./install.sh --ingest
-
-ENTRYPOINT ["/bin/bash"]

build/edex-ingest/docker_build.sh

@@ -1,15 +0,0 @@
-#!/bin/bash -v
-dir="$( cd "$(dirname "$0")" ; pwd -P )"
-pushd $dir
-. ../buildEnvironment.sh
-
-existing=$(sudo docker images |grep edex-ingest | grep $1 | awk '{ print $3 }')
-if [ ! -z "$existing" ]; then
-   sudo docker rmi $existing
-fi
-pushd /awips2/repo/awips2-builds/build/edex-ingest
-sudo docker build -t unidata/edex-ingest -f Dockerfile.edex .
-dockerID=$(sudo docker images | grep edex-ingest | grep latest | awk '{print $3}' | head -1 )
-sudo docker tag $dockerID unidata/edex-ingest:${AWIPSII_VERSION}
-sudo docker rmi unidata/edex-ingest:latest
-sudo docker push unidata/edex-ingest

build/rsync.cave

@@ -0,0 +1,45 @@
+edexOsgi/* cave/* localization/*
+javaUtilities/* rpms pythonPackages 
+*.pdf
+../awips2-nativelib/*
+../awips2-core/common/* 
+../awips2-core/edex/* 
+../awips2-core/features/* 
+../awips2-core/viz/*
+../awips2-core-foss/lib/*
+../awips2-foss/lib/*
+../awips2-hazards/edex/*
+../awips2-hazards/common/*
+../awips2-hazards/viz/*
+../awips2-ncep/common/* 
+../awips2-ncep/viz/* 
+../awips2-ncep/features/* 
+../awips2-ncep/edex/* 
+../awips2-goesr/edexOsgi/* 
+../awips2-goesr/cave/* 
+../awips2-unidata/*
+../python-awips
+../awips2-cimss/viz/*
+../awips2-cimss/edex/*
+../awips2-cimss/features/*
+../awips2-cimss/common/*
+../awips2-data-delivery/common/*
+../awips2-data-delivery/edex/*
+../awips2-data-delivery/features/*
+../awips2-data-delivery/viz/*
+../awips2-drawing/viz/*
+../awips2-drawing/features/*
+../awips2-gsd/viz/*
+../awips2-gsd/features/*
+../awips2-nasa/edex/*
+../awips2-ogc/foss/*
+../awips2-ogc/edex/*
+../awips2-ogc/features/*
+../awips2-ohd/edex/*
+../awips2-ohd/apps/*
+../awips2-ohd/features/*
+../awips2-ohd/lib/*
+../awips2-swpc/common/*
+../awips2-swpc/edex/*
+../awips2-swpc/viz/*
+../awips2-swpc/features/*

build/rsync.dirs

@@ -10,10 +10,6 @@ javaUtilities/* rpms pythonPackages
 ../awips2-foss/lib/*
 ../awips2-rpm/foss
 ../awips2-rpm/installers
-../awips2-nws/common/* 
-../awips2-nws/viz/* 
-../awips2-nws/features/*
-../awips2-nws/edex/* 
 ../awips2-hazards/edex/*
 ../awips2-hazards/common/*
 ../awips2-hazards/viz/*
@@ -29,10 +25,6 @@ javaUtilities/* rpms pythonPackages
 ../awips2-cimss/edex/*
 ../awips2-cimss/features/*
 ../awips2-cimss/common/*
-../awips2-collaboration/viz/*
-../awips2-collaboration/features/*
-../awips2-collaboration/common/*
-../awips2-collaboration/foss/*
 ../awips2-data-delivery/common/*
 ../awips2-data-delivery/edex/*
 ../awips2-data-delivery/features/*

build/setup.sh

@@ -21,13 +21,17 @@ if [ $rpmname = "buildCAVE" ]; then
   for dn in `cat build/repos| grep -v static| grep -v nativelib |grep -v awips2-rpm`
   do
     echo $dn
-    if [ -d /awips2/repo/$dn ]; then		dirs+=" -v /awips2/repo/${dn}:/awips2/repo/${dn} ";fi
+    if [ -d /awips2/repo/$dn ]; then
+      dirs+=" -v /awips2/repo/${dn}:/awips2/repo/${dn} "
+    fi
   done
 else
   for dn in `cat build/repos`
   do
     echo $dn
-    if [ -d /awips2/repo/$dn ]; then		dirs+=" -v /awips2/repo/${dn}:/awips2/repo/${dn} ";fi
+    if [ -d /awips2/repo/$dn ]; then
+       dirs+=" -v /awips2/repo/${dn}:/awips2/repo/${dn} "
+    fi
   done
 fi
 

cave/build/features.txt

@@ -2,13 +2,11 @@ com.raytheon.uf.common.base.feature
 com.raytheon.uf.viz.dataplugin.obs.feature
 com.raytheon.uf.viz.sounding.feature
 com.raytheon.uf.viz.cots.feature
-com.raytheon.uf.viz.registry.feature
 com.raytheon.uf.viz.common.core.feature
 com.raytheon.uf.viz.dataplugins.feature
 com.raytheon.viz.feature.awips
 com.raytheon.uf.viz.application.feature
 com.raytheon.uf.viz.base.feature
-com.raytheon.uf.viz.archive.feature
 com.raytheon.uf.viz.gisdatastore.feature
 com.raytheon.viz.dataaccess.feature
 com.raytheon.uf.viz.localization.perspective.feature
@@ -21,7 +19,6 @@ com.raytheon.uf.viz.kml.export.feature
 com.raytheon.viz.radar.feature
 com.raytheon.uf.viz.grid.feature
 com.raytheon.uf.viz.displays.feature
-com.raytheon.viz.hydro.feature
 com.raytheon.uf.viz.d2d.damagepath.feature
 com.raytheon.uf.viz.d2d.xy.feature
 com.raytheon.viz.volumebrowser.feature
@@ -31,7 +28,6 @@ com.raytheon.uf.viz.npp.feature
 com.raytheon.uf.viz.vtec.feature
 com.raytheon.viz.text.feature
 com.raytheon.viz.warngen.feature
-com.raytheon.viz.gfe.feature
 com.raytheon.uf.viz.d2d.ui.awips.feature
 com.raytheon.uf.viz.d2d.gfe.feature
 com.raytheon.uf.viz.ncep.dataplugins.feature
@@ -46,19 +42,6 @@ com.raytheon.uf.viz.ncep.npp.feature
 com.raytheon.uf.viz.ncep.perspective.feature
 com.raytheon.uf.viz.d2d.skewt.feature
 gov.noaa.gsd.viz.ensemble.feature
-gov.noaa.nws.mdl.viz.awipsref.feature
-gov.noaa.nws.obs.viz.geodata.feature
-com.raytheon.uf.viz.server.edex.feature
-com.raytheon.uf.viz.dat.feature
-com.raytheon.uf.viz.datadelivery.feature
 edu.wisc.ssec.cimss.viz.convectprob.feature
 gov.noaa.nws.mdl.viz.boundaryTool.common.feature
 com.raytheon.uf.viz.satellite.goesr.feature
-com.raytheon.uf.viz.ohd.feature
-com.raytheon.uf.viz.scan.feature
-edu.ucar.unidata.uf.viz.feature
-gov.noaa.nws.ncep.swpc.viz.feature
-gov.noaa.nws.ocp.uf.viz.gisdatastore.feature
-gov.noaa.nws.ocp.viz.climate.feature
-gov.noaa.nws.ocp.viz.firewx.feature
-gov.noaa.nws.ocp.viz.psh.feature

cave/build/p2-build.xml

@@ -148,9 +148,6 @@
 			<param name="feature" value="com.raytheon.viz.feature.awips" />
 			<param name="omit" value="true" />
 		</antcall>
-		<!-- 
-			we will still build this for the MSFT Windows CAVE. 
-		-->
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.common.base.feature" />
 		</antcall>
@@ -181,9 +178,6 @@
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.dataplugins.feature" />
 		</antcall>
-		<antcall target="p2.build.repo">
-			<param name="feature" value="com.raytheon.uf.viz.dat.feature" />
-		</antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.d2d.core.feature" />
 		</antcall>
@@ -217,15 +211,9 @@
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.ncep.core.feature" />
 		</antcall>
-		<antcall target="p2.build.repo">
-			<param name="feature" value="com.raytheon.uf.viz.aviation.advisory.feature" />
-		</antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.ncep.dataplugins.feature" />
 		</antcall>
-		<antcall target="p2.build.repo">
-			<param name="feature" value="com.raytheon.viz.hydro.feature" />
-		</antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.d2d.xy.feature" />
 		</antcall>
@@ -235,9 +223,6 @@
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.ncep.nsharp.feature" />
 		</antcall>
-		<antcall target="p2.build.repo">
-			<param name="feature" value="com.raytheon.uf.viz.archive.feature" />
-		</antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.alertview.feature" />
 		</antcall>
@@ -247,12 +232,6 @@
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.thinclient.feature" />
 		</antcall>
-		<antcall target="p2.build.repo">
-			<param name="feature" value="com.raytheon.uf.viz.registry.feature" />
-		</antcall>
-		<antcall target="p2.build.repo">
-			<param name="feature" value="com.raytheon.uf.viz.datadelivery.feature" />
-		</antcall>
         	<antcall target="p2.build.repo">
         		<param name="feature" value="com.raytheon.uf.viz.npp.feature" />
         	</antcall>
@@ -274,18 +253,27 @@
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.acarssounding.feature" />
 		</antcall>
-		<antcall target="p2.build.repo">
-			<param name="feature" value="com.raytheon.uf.viz.d2d.gfe.feature" />
-		</antcall>
-		<antcall target="p2.build.repo">
-			<param name="feature" value="com.raytheon.uf.viz.gisdatastore.feature" />
-		</antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.d2d.ui.awips.feature" />
 		</antcall>
         	<antcall target="p2.build.repo">
         		<param name="feature" value="com.raytheon.uf.viz.d2d.damagepath.feature" />
         	</antcall>
+		<antcall target="p2.build.repo">
+			<param name="feature" value="com.raytheon.uf.viz.satellite.goesr.feature" />
+		</antcall>
+		<antcall target="p2.build.repo">
+			<param name="feature" value="gov.noaa.gsd.viz.ensemble.feature" />
+		</antcall>
+        	<antcall target="p2.build.repo">
+        		<param name="feature" value="com.raytheon.uf.viz.vtec.feature" />
+        	</antcall>
+        	<antcall target="p2.build.repo">
+        		<param name="feature" value="com.raytheon.viz.dataaccess.feature" />
+        	</antcall>
+		<antcall target="p2.build.repo">
+			<param name="feature" value="com.raytheon.uf.viz.d2d.gfe.feature" />
+		</antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature" value="edu.wisc.ssec.cimss.viz.convectprob.feature" />
 		</antcall>
@@ -293,11 +281,9 @@
 			<param name="feature" value="gov.noaa.nws.mdl.viz.boundaryTool.common.feature" />
 		</antcall>
 		<antcall target="p2.build.repo">
-			<param name="feature" value="com.raytheon.uf.viz.satellite.goesr.feature" />
+			<param name="feature" value="com.raytheon.uf.viz.gisdatastore.feature" />
-		</antcall>
-		<antcall target="p2.build.repo">
-			<param name="feature" value="gov.noaa.gsd.viz.ensemble.feature" />
 		</antcall>
+	<!--
 		<antcall target="p2.build.repo">
 			<param name="feature" value="gov.noaa.nws.mdl.viz.awipsref.feature" />
 		</antcall>
@@ -307,21 +293,15 @@
 		<antcall target="p2.build.repo">
 			<param name="feature" value="gov.noaa.nws.ocp.uf.viz.gisdatastore.feature" />
 		</antcall>
+        	<antcall target="p2.build.repo">
+        		<param name="feature" value="com.raytheon.uf.viz.server.edex.feature" />
+        	</antcall>
         	<antcall target="p2.build.repo">
         		<param name="feature" value="com.raytheon.uf.viz.ohd.feature" />
         	</antcall>
         	<antcall target="p2.build.repo">
         		<param name="feature" value="com.raytheon.uf.viz.scan.feature" />
         	</antcall>
-        	<antcall target="p2.build.repo">
-        		<param name="feature" value="com.raytheon.uf.viz.server.edex.feature" />
-        	</antcall>
-        	<antcall target="p2.build.repo">
-        		<param name="feature" value="com.raytheon.uf.viz.vtec.feature" />
-        	</antcall>
-        	<antcall target="p2.build.repo">
-        		<param name="feature" value="com.raytheon.viz.dataaccess.feature" />
-        	</antcall>
         	<antcall target="p2.build.repo">
         		<param name="feature" value="edu.ucar.unidata.uf.viz.feature" />
         	</antcall>
@@ -340,6 +320,7 @@
         	<antcall target="p2.build.repo">
         		<param name="feature" value="gov.noaa.nws.ocp.viz.psh.feature" />
         	</antcall>
+	-->
 		<antcall target="cleanup.features" />
 	</target>
 

cave/build/static/linux/cave/caveEnvironment/bin/MonitorTestMode_script

@@ -1,9 +0,0 @@
-#!/bin/sh
-export DISPLAY=":0.0"
-export FXA_HOME=/awips2/cave/caveEnvironment
-export TMCP_HOME=/awips2/cave/caveEnvironment
-
-$FXA_HOME/bin/MonitorTestMode >& /dev/null &
-
-
-

cave/build/static/linux/cave/caveEnvironment/bin/runTMCP

@@ -1,64 +0,0 @@
-#!/bin/sh
-
-# determine where the script is being ran from.
-path_to_script=`readlink -f $0`
-RUN_FROM_DIR=`dirname ${path_to_script}`
-BASE_ENV_DIR=`dirname ${RUN_FROM_DIR}`
-
-#DR 18113 rehost. /awips2/fxa/... Has kicked the bit-bucket.
-export TMCP_HOME=/awips2/cave/caveEnvironment
-export FXA_HOME=/awips2/cave/caveEnvironment
-
-if [ ! -n "${TMCP_HOME}" ]
-then
-   echo -e "\e[1;31mTMCP_HOME is not set.\e[m"
-   echo -e "\e[0;32mSetting TMCP_HOME to '${BASE_ENV_DIR}'.\e[m"
-   export TMCP_HOME=${BASE_ENV_DIR}
-else
-   echo "TMCP_HOME is '${TMCP_HOME}'"
-fi
-
-if [ ! -n "${FXA_HOME}" ]
-then
-   echo -e "\e[1;31mFXA_HOME is not set.\e[m"
-   echo -e "\e[0;32mSetting FXA_HOME to '${BASE_ENV_DIR}'.\e[m"
-   export FXA_HOME=${BASE_ENV_DIR} 
-else
-   echo "FXA_HOME is '${FXA_HOME}'"
-fi
-
-# determine if 'FXA_WARNGEN_PRODUCT_ID' needs to be set
-HOST=`uname -n`
-TMP_HOST_NUMBER=`uname -n | awk '{print substr($1, 3, 1);}'`
-ALT_HOST_PART=`uname -n | awk '{print substr($1, 3, length($1) - 1);}'`
-ALT_HOST="xt"${ALT_HOST_PART}
-ping -c 1 -w 1 ${ALT_HOST} >/dev/null 2>/dev/null
-RC=`echo $?`
-
-if [ "${RC}" = "0" ]
-then
-   if [ ! -n "${FXA_WARNGEN_PRODUCT_ID}" ]
-   then
-      echo -e "\e[1;31mFXA_WARNGEN_PRODUCT_ID is not set.\e[m"
-      echo -e "\e[0;32mSetting FXA_WARNGEN_PRODUCT_ID to '${TMP_HOST_NUMBER}'.\e[m"
-      export FXA_WARNGEN_PRODUCT_ID=${TMP_HOST_NUMBER}
-   else
-      echo "FXA_WARNGEN_PRODUCT_ID is '${FXA_WARNGEN_PRODUCT_ID}'."
-   fi
-else
-   echo -e  "\e[1;31mPartner host \""${ALT_HOST}"\" is unreachable by network!\e[m"
-   echo  ${ALT_HOME} 
-   echo
-fi
-
-export LD_LIBRARY_PATH=$TMCP_HOME/lib:$LD_LIBRARY_PATH
-
-# for TMCP logs
-if [ ! -d $HOME/caveData/tmcpLogs ]; then
-   mkdir -p $HOME/caveData/tmcpLogs
-fi
-export LOG_DIR=$HOME/caveData/tmcpLogs
-
-
-$TMCP_HOME/bin/tmcp
-

cave/build/static/linux/cave/caveEnvironment/bin/showBanner_script

@@ -1,10 +0,0 @@
-#!/bin/sh
-export DISPLAY=:0.0
-export FXA_HOME=/awips2/cave/caveEnvironment
-if [ $6 = "kde" ]
-then
-    kstart --alldesktops $FXA_HOME/bin/showBanner $2 $3 $4 $5 &
-else
-    $FXA_HOME/bin/showBanner $2 $3 $4 $5 &
-fi
-

cave/com.raytheon.uf.viz.cwat/plugin.xml

@@ -29,16 +29,4 @@
             resourceType="PLAN_VIEW"/>
    </extension>
    
-      <!-- for making CWAT available on Localization Perspective in CAVE: 2012-05-14 from DHladky -->
-   
-   <extension
-       point="com.raytheon.uf.viz.localization.perspective.localizationpath">
-    <path
-          application="D2D"
-          localizationType="common_static"
-          name="CWAT"
-          recursive="true"
-          value="cwat">
-    </path>
-   </extension>
 </plugin>

cave/com.raytheon.uf.viz.d2d.ui.popupskewt/plugin.xml

@@ -20,16 +20,6 @@
     -->
 <?eclipse version="3.3"?>
 <plugin>
-   <extension
-       point="com.raytheon.uf.viz.localization.perspective.localizationpath">
-       <path
-          application="D2D"
-          localizationType="CAVE_STATIC"
-          name="Cloud Height"
-          value="cloudheight" 
-          recursive="true">
-       </path>
-   </extension>
    <extension
    		point="com.raytheon.viz.ui.displayCustomizer">
    		<displayCustomizer

cave/com.raytheon.uf.viz.d2d.ui/plugin.xml

@@ -559,7 +559,8 @@
                id="applications">
             <command
                   commandId="com.raytheon.viz.warngen.gui.WarngenAction"
-                  label="Warngen">
+                  label="Warngen"
+                  mode="FORCE_TEXT">
                <visibleWhen>
                   <and>
                      <reference
@@ -587,6 +588,21 @@
                   </reference>
                </visibleWhen>
             </command>
+            
+            <command
+                  commandId="gov.noaa.nws.ncep.viz.actions.dataManager"
+                  icon="icons/terminal.png"
+                  id="gov.noaa.nws.ncep.viz.actions.dataManager"
+                  label="GEMPAK"
+                  mode="FORCE_TEXT"
+                  style="push"
+                  tooltip="GEMPAK Data">
+               <visibleWhen>
+                  <reference
+                        definitionId="com.raytheon.uf.viz.d2d.ui.inD2DActionSet">
+                  </reference>
+               </visibleWhen>
+            </command>
 			<command
                   commandId="com.raytheon.uf.viz.productbrowser.productBrowser"
 				  icon="icons/plus.png"

cave/com.raytheon.uf.viz.damagepath/plugin.xml

@@ -9,12 +9,6 @@
             name="New Tornado Damage Path"
             sortID="4">
       </contextualMenu>
-      <contextualMenu
-            actionClass="com.raytheon.uf.viz.damagepath.ExportToLdadAction"
-            capabilityClass="com.raytheon.uf.viz.damagepath.DamagePathLayer"
-            name="Export to LDAD"
-            sortID="5">
-      </contextualMenu>
       <contextualMenu
             actionClass="com.raytheon.uf.viz.damagepath.ExportDamagePathAction"
             capabilityClass="com.raytheon.uf.viz.damagepath.DamagePathLayer"
@@ -29,15 +23,4 @@
       </contextualMenu>
    </extension>
    
-   <extension
-         point="com.raytheon.uf.viz.localization.perspective.localizationpath">
-      <path
-            application="D2D"
-            extensionFilter=".xml"
-            localizationType="COMMON_STATIC"
-            name="Damage Path"
-            recursive="false"
-            value="damagepath">
-      </path>
-   </extension>
 </plugin>

cave/com.raytheon.uf.viz.damagepath/src/com/raytheon/uf/viz/damagepath/ExportToLdadAction.java

@@ -1,128 +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.uf.viz.damagepath;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.apache.commons.lang3.StringUtils;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.geotools.data.simple.SimpleFeatureCollection;
-
-import com.raytheon.uf.common.damagepath.request.ExportToLdadRequest;
-import com.raytheon.uf.common.json.JsonException;
-import com.raytheon.uf.common.json.geo.SimpleGeoJsonService;
-import com.raytheon.uf.common.serialization.comm.IServerRequest;
-import com.raytheon.uf.common.status.IUFStatusHandler;
-import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.core.localization.LocalizationManager;
-import com.raytheon.uf.viz.core.requests.ThriftClient;
-import com.raytheon.viz.ui.cmenu.AbstractRightClickAction;
-
-/**
- * Legend right-click action to take the current {@code DamagePathLayer} data
- * and export it to LDAD in GeoJSON format.
- * 
- * <pre>
- * 
- * SOFTWARE HISTORY
- * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- -------------------------- 
- * Jun 08, 2015  #4355     dgilling    Initial creation
- * Jun 18, 2015  #4354     dgilling    Support FeatureCollections so each 
- *                                     polygon can have its own properties.
- * Mar 11, 2016  #5288     dgilling    Rewrite to spawn async Job.
- * 
- * </pre>
- * 
- * @author dgilling
- * @version 1.0
- */
-
-public class ExportToLdadAction extends AbstractRightClickAction {
-
-    private static class ExportDamagePathToLdadJob extends Job {
-
-        private static final String PLUGIN_ID = "com.raytheon.uf.viz.damagepath";
-
-        private final DamagePathLayer<?> layer;
-
-        protected ExportDamagePathToLdadJob(DamagePathLayer<?> layer) {
-            super("Exporting Damage Path to LDAD");
-            this.layer = layer;
-        }
-
-        @Override
-        protected IStatus run(IProgressMonitor monitor) {
-            try (ByteArrayOutputStream outStream = new ByteArrayOutputStream()) {
-                SimpleFeatureCollection featureCollection = layer
-                        .buildFeatureCollection();
-
-                new SimpleGeoJsonService().serialize(featureCollection,
-                        outStream);
-                byte[] jsonData = outStream.toByteArray();
-
-                try {
-                    String siteID = LocalizationManager.getInstance()
-                            .getCurrentSite();
-                    IServerRequest request = new ExportToLdadRequest(siteID,
-                            jsonData);
-                    String errorMsg = (String) ThriftClient
-                            .sendRequest(request);
-                    if (StringUtils.isNotEmpty(errorMsg)) {
-                        String msg = "Could not export damage path data to LDAD: "
-                                + errorMsg;
-                        statusHandler.error(msg);
-                        return new Status(IStatus.ERROR, PLUGIN_ID, msg);
-                    }
-                } catch (VizException e) {
-                    String msg = "Error processing ExportToLdadRequest.";
-                    statusHandler.error(msg, e);
-                    return new Status(IStatus.ERROR, PLUGIN_ID, msg, e);
-                }
-            } catch (JsonException | IOException e) {
-                String msg = "Error serializing Damage Path data to GeoJSON.";
-                statusHandler.error(msg, e);
-                return new Status(IStatus.ERROR, PLUGIN_ID, msg, e);
-            }
-
-            statusHandler.info("Damage Path successfully exported.");
-            return Status.OK_STATUS;
-        }
-    }
-
-    protected static final transient IUFStatusHandler statusHandler = UFStatus
-            .getHandler(ExportToLdadAction.class);
-
-    public ExportToLdadAction() {
-        super("Export to LDAD");
-    }
-
-    @Override
-    public void run() {
-        new ExportDamagePathToLdadJob((DamagePathLayer<?>) getSelectedRsc())
-                .schedule();
-    }
-}

cave/com.raytheon.uf.viz.grib/src/com/raytheon/uf/viz/grib/wizard/save/GribWizardSave.java

@@ -61,7 +61,9 @@ public abstract class GribWizardSave {
 
         GridModel model = data.getOrCreateModel();
         String centerName = GribTableLookup.getInstance()
-                .getTableValue(-1, -1, "0", model.getCenter()).toString();
+        		.getTableValue(model.getCenter(), Integer.parseInt(model.getSubCenter()),
+        				"0", model.getCenter()).toString();
+        
         if (centerName == null || centerName.isEmpty()) {
             centerName = "UNK";
         } else {

cave/com.raytheon.uf.viz.grid.radar/localization/parameterMapping/radar/RadarProductCodes.xml

@@ -1,27 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an incremental override file, indicating that the files
-        at different localization levels will be combined. 
-    -->
 <parameterList>
     <parameter abbrev="RR" productCodes="153 94 20 19" />
     <parameter abbrev="RRV" productCodes="154 99 27 25" />

cave/com.raytheon.uf.viz.grid.radar/localization/volumebrowser/VbSources/radar.xml

@@ -1,27 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an incremental override file, indicating that the files
-        at different localization levels will be combined. 
-    -->
 <vbSourceList>
     <vbSource key="radar" name="Radar" category="Volume" />
 </vbSourceList>

cave/com.raytheon.uf.viz.grid.radar/src/com/raytheon/uf/viz/grid/radar/RadarProductCodeMapping.java

@@ -49,6 +49,7 @@ import com.raytheon.viz.grid.xml.ParameterMapping;
  * Mar 22, 2010  4473     rjpeter   Initial creation
  * Nov 07, 2361  2361     njensen   Use JAXBManager for XML
  * Aug 15, 2017  6332     bsteffen  Move to viz.grid.radar plugin
+ * Oct 31, 2018           mjames    Remove site and user-level files
  * 
  * </pre>
  * 
@@ -75,26 +76,10 @@ public class RadarProductCodeMapping {
                         LocalizationLevel.BASE),
                 "/parameterMapping/radar/RadarProductCodes.xml");
 
-        File siteFile = pm.getFile(
-                pm.getContext(LocalizationType.CAVE_STATIC,
-                        LocalizationLevel.SITE),
-                "/parameterMapping/radar/RadarProductCodes.xml");
-
-        File userFile = pm.getFile(
-                pm.getContext(LocalizationType.CAVE_STATIC,
-                        LocalizationLevel.USER),
-                "/parameterMapping/radar/RadarProductCodes.xml");
-
         try {
             JAXBManager jaxb = new JAXBManager(ParameterList.class);
             loadParameters(baseFile, jaxb);
 
-            if (siteFile.exists()) {
-                loadParameters(siteFile, jaxb);
-            }
-            if (userFile.exists()) {
-                loadParameters(userFile, jaxb);
-            }
         } catch (Exception e) {
             statusHandler.handle(Priority.PROBLEM,
                     "Error occurred loading radar product code to grid parameter mappings",

cave/com.raytheon.uf.viz.hpe/src/com/raytheon/uf/viz/hpe/util/HpeUtils.java

@@ -20,8 +20,6 @@
 package com.raytheon.uf.viz.hpe.util;
 
 import com.raytheon.uf.common.dataplugin.grid.GridRecord;
-import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfo;
-import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfoLookup;
 
 /**
  * HPE Utilities
@@ -42,9 +40,6 @@ import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfoLookup;
  */
 
 public class HpeUtils {
-    private static final String HPE = "HPE";
-
-    private static final String BIAS_HPE = "BiasHPE";
 
     /**
      * Determine if this title represents an HPE model.
@@ -55,19 +50,9 @@ public class HpeUtils {
      * 
      */
     public static boolean isHpe(GridRecord gridRecord) {
-        String title = null;
         if (gridRecord != null) {
-            DatasetInfo info = DatasetInfoLookup.getInstance().getInfo(
+        	return gridRecord.getDatasetId().contains("HPE");
-                    gridRecord.getDatasetId());
-            if (info != null) {
-                title = info.getTitle();
         }
-        }
-
-        if (title == null) {
         return false;
     }
-
-        return HPE.equals(title) || BIAS_HPE.equals(title);
-    }
 }

cave/com.raytheon.uf.viz.localization.edex.config/plugin.xml

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-    <!--
-        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.
-    -->
-<?eclipse version="3.4"?>
-<plugin>
-  <extension
-      point="com.raytheon.uf.viz.localization.perspective.localizationpath">
-    <path
-        application="EDEX"
-        localizationType="COMMON_STATIC"
-        name="AFOS2AWIPS"
-        value="afos2awips">
-    </path>
-    <path
-        application="EDEX"
-        localizationType="COMMON_STATIC"
-        name="AAG"
-        value="aviation/aag">
-    </path>
-    <path
-        application="EDEX"
-        localizationType="COMMON_STATIC"
-        name="Backup Service"
-        value="backupsvc">
-    </path>
-    <path
-        application="EDEX"
-        localizationType="COMMON_STATIC"
-        name="Localization Backup"
-        value="localizationBackup">
-    </path>
-    <path
-        application="EDEX"
-        localizationType="COMMON_STATIC"
-        name="Distribution"
-        value="distribution">
-    </path>
-    <path
-        application="EDEX"
-        localizationType="COMMON_STATIC"
-        name="Purge Rules"
-        value="purge">
-    </path>
-  </extension>
-</plugin>

cave/com.raytheon.uf.viz.monitor.ffmp/plugin.xml

@@ -99,27 +99,4 @@
             sortID="116">
       </contextualMenu>
    </extension>
-    <extension
-          point="com.raytheon.uf.viz.localization.perspective.localizationpath">
-       <path
-             application="D2D"
-             localizationType="common_static"
-             name="FFMP"
-             recursive="true"
-             value="ffmp">
-       </path>
-       <path
-             application="D2D"
-             localizationType="common_static"
-             name="Monitoring"
-             recursive="true"
-             value="monitoring">
-       </path>
-       <path
-             application="D2D"
-             localizationType="cave_static"
-             name="FFMP GUI CONFIG"
-             value="ffmp/guiConfig">
-       </path>
-    </extension>
 </plugin>

cave/com.raytheon.uf.viz.monitor.scan/plugin.xml

@@ -44,21 +44,4 @@
             renderingOrderId="CONTOUR">
       </resource>
    </extension>
-   <extension
-         point="com.raytheon.uf.viz.localization.perspective.localizationpath">
-      <path
-            application="D2D"
-            localizationType="cave_static"
-            name="SCAN"
-            recursive="true"
-            value="scan">
-      </path>
-            <path
-            application="D2D"
-            localizationType="common_static"
-            name="SCAN COMMON"
-            recursive="true"
-            value="scan">
-      </path>
-   </extension>
   </plugin>

cave/com.raytheon.uf.viz.npp.nucaps/plugin.xml

@@ -27,13 +27,4 @@
             type="nucaps">
       </verticalSoundingProvider>
    </extension>
-       <extension
-          point="com.raytheon.uf.viz.localization.perspective.localizationpath">
-       <path
-             application="D2D"
-             localizationType="cave_static"
-             name="NUCAPS SOUNDING CONFIG"
-             value="nucaps">
-       </path>
-    </extension>
 </plugin>

cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/ui/ThinClientConnectivityDialog.java

@@ -19,34 +19,11 @@
  **/
 package com.raytheon.uf.viz.thinclient.ui;
 
-import java.io.IOException;
-
-import org.eclipse.jface.preference.IPersistentPreferenceStore;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-
-import com.raytheon.uf.common.localization.msgs.GetServersResponse;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.viz.core.comm.ConnectivityManager;
-import com.raytheon.uf.viz.core.comm.ConnectivityManager.ConnectivityResult;
-import com.raytheon.uf.viz.core.comm.IConnectivityCallback;
-import com.raytheon.uf.viz.core.exception.VizException;
 import com.raytheon.uf.viz.core.localization.ConnectivityPreferenceDialog;
-import com.raytheon.uf.viz.core.localization.LocalizationConstants;
-import com.raytheon.uf.viz.core.localization.LocalizationManager;
-import com.raytheon.uf.viz.core.localization.ServerRemembrance;
 import com.raytheon.uf.viz.thinclient.Activator;
-import com.raytheon.uf.viz.thinclient.ThinClientUriUtil;
 import com.raytheon.uf.viz.thinclient.preferences.ThinClientPreferenceConstants;
 
 /**
@@ -93,7 +70,7 @@ public class ThinClientConnectivityDialog extends ConnectivityPreferenceDialog {
     private String proxyAddress;
 
     public ThinClientConnectivityDialog(boolean checkAlertViz) {
-        super(checkAlertViz, "Unidata AWIPS");
+        super(checkAlertViz);
         IPreferenceStore store = Activator.getDefault().getPreferenceStore();
         dataRefreshMethod = store
                 .getString(ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD);

cave/com.raytheon.viz.aviation/plugin.xml

@@ -71,21 +71,4 @@
    		<component key="cigvisdist" class="com.raytheon.viz.aviation.CigVisDistComponent"/>
    		<component key="cigvistrend" class="com.raytheon.viz.aviation.CigVisTrendComponent"/>
    </extension>
-   <extension
-        point="com.raytheon.uf.viz.localization.perspective.localizationpath">
-        <path
-                application="AvnFPS"
-                localizationType="COMMON_STATIC"
-                name="Configuration"
-                value="aviation/config"
-                recursive="true">
-        </path>
-        <path
-                application="AvnFPS"
-                localizationType="CAVE_STATIC"
-                name="Avnwatch"
-                value="aviation/avnwatch"
-                recursive="true">
-        </path>          
-       </extension> 
 </plugin>

cave/com.raytheon.viz.gfe/GFESuite/gfeclient.sh

@@ -74,7 +74,7 @@ then
 else
         echo "Display not set, creating offscreen x on port $$"
         extendLibraryPath "-noX"
-        Xvfb :$$ -screen 0 1280x1024x24 -nolisten tcp &
+        Xvfb :$$ -screen 0 1280x1024x30 -nolisten tcp &
         xvfb=$!
         export DISPLAY=":$$.0"
         #don't use shader when no display set 

cave/com.raytheon.viz.gfe/localization/bundles/maps/stormsurgeww.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Created by config_local_shapefiles of config_awips2.sh on Wed Jul 29 
-    19:20:36 GMT 2015 -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#9b9b9b" />
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="pointCapability"
-                                pointStyle="NONE" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="true" isHoverOn="false"
-                        isVisible="true">
-                        <pdProps maxDisplayWidth="100000000"
-                            minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="dbMapResourceData">
-                        <table>mapdata.stormsurgeww</table>
-                        <mapName>StormSurgeWW</mapName>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py

@@ -54,6 +54,7 @@
 # the TPCSurgeProb and PETSS dbs.
 # 03/20/2018 Check in Pablo's fix.
 # 4/3/2018 - Additional fixes needed to enable Manual options to work out to 102 hours.
+# 9/18/2018 - Make ISC default and have 8-hour InundationMax grid created when running
 #  ----------------------------------------------------------------------------
 
 ##
@@ -84,9 +85,9 @@ VariableList = [("DEFAULT: Typical. Should only be changed in coordination with
                            "Higher (40% Exceedance; for well-behaved systems within 6 hours of the event)",
                            "Highest (50% Exceedance; for well-behaved systems at time of the event)"]),
                 ("Grid Smoothing?", "Yes", "radio", ["Yes","No"]),
-                ("Make grids from \nPHISH, PETSS, ISC, or Manually?", "PHISH", "radio", ["PHISH", "PETSS", "ISC", "Manually Replace", "Manually Add", "UpdateInunMax (Edit Inundation Timing Grids)"]),
+                ("Make grids from \nPHISH, PETSS, ISC, or Manually?", "ISC", "radio", ["PHISH", "PETSS", "ISC", "Manually Replace", "Manually Add", "UpdateInunMax (Edit Inundation Timing Grids)"]),
                 ("Manual Inundation settings: Time ranges below relative to advisory model cycle", "", "label"),
-                ("Inundation Height:", 1.0, "scale", [0.0, 3.0], 0.1),
+                ("Inundation Height:", 1.1, "scale", [0.0, 3.0], 0.1),
                 ("Start Hour for Inundation Timing", 0, "scale", [0.0, 96.0], 6.0),
                 ("End Hour for Inundation Timing", 6, "scale", [0.0, 102.0], 6.0),
                 ]
@@ -710,7 +711,7 @@ class Procedure (TropicalUtility.TropicalUtility):
          
         threshDict = {}  # a dict to store thresholds from the UI
  
-        for key in list(keyMap.keys()):
+        for key in keyMap.keys():
  
             if keyMap[key] == "Extreme":
                 threshDict[keyMap[key]] = 9
@@ -728,7 +729,7 @@ class Procedure (TropicalUtility.TropicalUtility):
                        "SurgeHtPlusTideNAVD","SurgeHtPlusTideMHHW"]
 
         # make a new timeRange that will be used to create new grids
-        timeRange = self.makeNewTimeRange(6)
+        timeRange = self.makeNewTimeRange(8)
 
         # Remove old guidance grids and replace them with the new grids          
         # Delete the old grids first

cave/com.raytheon.viz.gfe/plugin.xml

@@ -2012,61 +2012,6 @@
           recursive="true"
           value="gfe/weGroups">
     </path>
-    <path
-          application="GFE Server"
-          extensionFilter=".py,.properties"
-          localizationAdapter="com.raytheon.viz.gfe.localization.adapters.ServerConfigAdapter"
-          localizationType="COMMON_STATIC"
-          name="Server Config Files"
-          recursive="false"
-          value="gfe/config">
-    </path>
-    <path
-          application="GFE Server"
-          extensionFilter=".py"
-          localizationAdapter="com.raytheon.viz.gfe.localization.adapters.SmartInitAdapter"
-          localizationType="COMMON_STATIC"
-          name="Smart Inits"
-          recursive="false"
-          value="gfe/smartinit">
-    </path>
-    <path
-          application="GFE Server"
-          extensionFilter=".xml"
-          localizationAdapter="com.raytheon.viz.gfe.localization.adapters.ParameterInfoAdapter"
-          localizationType="COMMON_STATIC"
-          name="Parameter Info Files"
-          value="grid/parameterInfo">
-    </path>
-    <path
-          application="GFE Server"
-          extensionFilter="gfeParamName.xml"
-          localizationType="COMMON_STATIC"
-          name="Param Names"
-          value="parameter/alias">
-    </path>
-    <path
-          application="GFE Server"
-          extensionFilter="gfeParamInfo.xml"
-          localizationType="COMMON_STATIC"
-          name="Param Info Mapping"
-          value="grid/dataset/alias">
-    </path>
-    <path
-          application="GFE Server"
-          extensionFilter="gfeLevelMappingFile.xml"
-          localizationType="COMMON_STATIC"
-          name="Level Mapping"
-          value="grid">
-    </path>
-    <path
-          application="GFE Server"
-          extensionFilter="VTECPartners.py,.properties"
-          localizationAdapter="com.raytheon.viz.gfe.localization.adapters.ServerConfigAdapter"
-          localizationType="COMMON_STATIC"
-          name="VTEC Partners"
-          value="vtec">
-    </path>
  </extension>
  
  <extension

cave/com.raytheon.viz.grid/plugin.xml

@@ -71,13 +71,4 @@
            </menu>
         </menuContribution>
      </extension>
-   <extension
-         point="com.raytheon.uf.viz.localization.perspective.localizationpath">
-      <path
-            application="EDEX"
-            localizationType="COMMON_STATIC"
-            name="Parameter"
-            value="parameter"
-            recursive="true" />
-   </extension>
 </plugin>

cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridDataListing.java

@@ -33,8 +33,6 @@ import com.raytheon.uf.common.datalisting.DataListing;
 import com.raytheon.uf.common.datalisting.impl.DefaultDataListing;
 import com.raytheon.uf.common.dataplugin.grid.GridConstants;
 import com.raytheon.uf.common.dataplugin.grid.GridRecord;
-import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfo;
-import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfoLookup;
 import com.raytheon.uf.common.dataplugin.level.Level;
 import com.raytheon.uf.common.dataplugin.level.LevelFactory;
 import com.raytheon.uf.common.dataplugin.level.MasterLevel;
@@ -96,14 +94,8 @@ public class GridDataListing extends DefaultDataListing {
     protected Map<String, String> getFormattedValues(String key, Collection<String> values) {
         if (GridConstants.DATASET_ID.equals(key)) {
             Map<String, String> formatted = new LinkedHashMap<>();
-            DatasetInfoLookup lookup = DatasetInfoLookup.getInstance();
             for (String value : values) {
-                DatasetInfo info = lookup.getInfo(value);
-                if (info == null) {
                 formatted.put(value, value);
-                } else {
-                    formatted.put(value, info.getTitle() + " (" + value + ")");
-                }
             }
             return sortByValue(formatted);
         } else if (GridInventory.PARAMETER_QUERY.equals(key)) {

cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataFormatter.java

@@ -26,8 +26,6 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
-import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfo;
-import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfoLookup;
 import com.raytheon.uf.common.dataplugin.level.Level;
 import com.raytheon.uf.common.dataplugin.level.LevelFactory;
 import com.raytheon.uf.common.dataplugin.level.MasterLevel;
@@ -69,16 +67,9 @@ public class GridProductBrowserDataFormatter {
             String[] parameters) {
         List<ProductBrowserLabel> labels = new ArrayList<ProductBrowserLabel>();
         if (GridInventory.MODEL_NAME_QUERY.equals(param)) {
-            DatasetInfoLookup lookup = DatasetInfoLookup.getInstance();
             for (int i = 0; i < parameters.length; i++) {
-                DatasetInfo info = lookup.getInfo(parameters[i]);
-                if (info == null) {
                 labels.add(new ProductBrowserLabel(parameters[i],
                         parameters[i]));
-                } else {
-                    labels.add(new ProductBrowserLabel(info.getTitle() + " ("
-                            + parameters[i] + ")", parameters[i]));
-                }
             }
             Collections.sort(labels);
             return labels;

cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridUpdater.java

@@ -25,8 +25,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -64,6 +64,7 @@ import com.raytheon.viz.grid.GridExtensionManager;
  * Mar 03, 2016  5439     bsteffen  Allow grid derived parameters from edex
  * Aug 15, 2017  6332     bsteffen  Move radar specific logic to extension
  * Aug 23, 2017  6125     bsteffen  Split common updating code to GridInventoryUpdater.
+ * Nov 30, 2018  7673     bsteffen  Prevent full queue from blocking.
  * 
  * </pre>
  * 
@@ -121,8 +122,7 @@ public class GridUpdater extends GridInventoryUpdater {
 
     private final Map<GridMapKey, Set<UpdateValue>> updateMap = new HashMap<>();
 
-    private final BlockingQueue<String> uriUpdateQueue = new ArrayBlockingQueue<>(
+    private final BlockingQueue<String> uriUpdateQueue = new LinkedBlockingQueue<>();
-            512);
 
     private final Job sendDerivedAlerts = new Job(
             "Sending Derived Grid Alerts") {

cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/VizGridInventory.java

@@ -33,8 +33,6 @@ import java.util.Set;
 import com.raytheon.uf.common.dataplugin.grid.GridConstants;
 import com.raytheon.uf.common.dataplugin.grid.GridInfoConstants;
 import com.raytheon.uf.common.dataplugin.grid.GridInfoRecord;
-import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfo;
-import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfoLookup;
 import com.raytheon.uf.common.dataplugin.grid.derivparam.CommonGridInventory;
 import com.raytheon.uf.common.dataplugin.grid.derivparam.GridInventoryUpdater;
 import com.raytheon.uf.common.dataplugin.grid.derivparam.cache.CoverageUtils;
@@ -212,7 +210,6 @@ public class VizGridInventory extends CommonGridInventory
     protected DataTree createBaseTree() throws DataCubeException {
         DataTree newTree = super.createBaseTree();
         initGatherModels(newTree);
-        initAliasModels(newTree);
         GridExtensionManager.addToBaseTree(newTree, derParLibrary);
         return newTree;
     }
@@ -239,74 +236,6 @@ public class VizGridInventory extends CommonGridInventory
         return rval;
     }
 
-    /**
-     * Prepare an alias map, from a modelName to all modelNames that it
-     * includes, from highest res to lowest res
-     * 
-     * @param newGridTree
-     */
-    private void initAliasModels(DataTree newGridTree) {
-        sourceAliases.clear();
-        DatasetInfoLookup lookup = DatasetInfoLookup.getInstance();
-        for (String modelName : newGridTree.getSources()) {
-            DatasetInfo info = lookup.getInfo(modelName);
-            if (info != null && info.getAlias() != null) {
-                SourceNode source = newGridTree.getSourceNode(modelName);
-                SourceNode dest = newGridTree.getSourceNode(info.getAlias());
-                if (source != null && dest != null) {
-                    List<String> aliases = sourceAliases.get(dest.getValue());
-                    if (aliases == null) {
-                        aliases = new ArrayList<>();
-                        aliases.add(dest.getValue());
-                        sourceAliases.put(dest.getValue(), aliases);
-                    }
-                    aliases.add(source.getValue());
-                }
-            }
-        }
-        for (Entry<String, List<String>> aliases : sourceAliases.entrySet()) {
-            Collections.sort(aliases.getValue(), new Comparator<String>() {
-
-                @Override
-                public int compare(String model1, String model2) {
-                    try {
-                        // attempt to figure out which model is the highest
-                        // resolution.
-                        Collection<GridCoverage> coverages1 = CoverageUtils
-                                .getInstance().getCoverages(model1);
-                        Collection<GridCoverage> coverages2 = CoverageUtils
-                                .getInstance().getCoverages(model2);
-                        if (coverages1.isEmpty()) {
-                            return 1;
-                        } else if (coverages2.isEmpty()) {
-                            return -1;
-                        }
-                        double total1 = 0;
-                        double total2 = 0;
-                        for (GridCoverage coverage : coverages1) {
-                            total1 += coverage.getDx();
-                            total1 += coverage.getDy();
-                        }
-                        for (GridCoverage coverage : coverages2) {
-                            total2 += coverage.getDx();
-                            total2 += coverage.getDy();
-                        }
-                        Double res1 = total1 / coverages1.size();
-                        Double res2 = total2 / coverages2.size();
-                        return res1.compareTo(res2);
-                    } catch (DataCubeException e) {
-                        statusHandler.handle(Priority.PROBLEM,
-                                "Unable to create model aliases, problems with "
-                                        + model1 + " and " + model2,
-                                e);
-                        return 0;
-                    }
-                }
-
-            });
-        }
-    }
-
     public Set<Level> getAvailableLevels(Map<String, RequestConstraint> query) {
         Set<Level> levels = new HashSet<>();
         List<AbstractRequestableNode> nodes = evaluateRequestConstraints(query);

cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java

@@ -35,8 +35,6 @@ import org.opengis.referencing.operation.TransformException;
 
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.grid.GridRecord;
-import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfo;
-import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfoLookup;
 import com.raytheon.uf.common.datastorage.Request;
 import com.raytheon.uf.common.datastorage.records.IDataRecord;
 import com.raytheon.uf.common.geospatial.MapUtil;
@@ -314,13 +312,8 @@ public class D2DGridResource extends GridResource<GridResourceData>
             }
         }
         LegendParameters legendParams = new LegendParameters();
-        DatasetInfo info = DatasetInfoLookup.getInstance()
+        
-                .getInfo(record.getDatasetId());
-        if (info == null) {
         legendParams.model = record.getDatasetId();
-        } else {
-            legendParams.model = info.getTitle();
-        }
         legendParams.level = record.getLevel();
         legendParams.parameter = record.getParameter().getName();
         legendParams.ensembleId = record.getEnsembleId();

cave/com.raytheon.viz.hydro/plugin.xml

@@ -957,21 +957,6 @@
 	          </contextId>
 	      </classContext>
 	</extension>
-    <extension
-          point="com.raytheon.uf.viz.localization.perspective.localizationpath">
-       <path
-             application="Hydro Apps"
-             localizationType="COMMON_STATIC"
-             name="Hydro"
-             value="hydro">
-       </path>
-       <path
-             application="Hydro Apps"
-             localizationType="COMMON_STATIC"
-             name="SHEF"
-             value="shef">
-       </path>
-    </extension>
     <extension
           point="com.raytheon.uf.viz.core.component">
        <component

cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/XmrgResource.java

@@ -89,6 +89,8 @@ import com.vividsolutions.jts.geom.GeometryFactory;
  * ------------ ---------- ----------- --------------------------
  * Aug 24, 2009 2258       mpduff      Initial creation.
  * Mar 14, 2017 18417      snaples     Updated loadData to handle trace precip color mapping properly.
+ * Sep 04, 2018 20694      mporricelli Updated loadData and updateXmrg to properly
+ *                                     display trace precip.
  * </pre>
  * 
  * @author mpduff
@@ -367,13 +369,22 @@ public class XmrgResource extends
                     }
                 }
                 sampleData = new ArrayList<Float>(data.length);
-
                 for (short s : data) {
+                    // Map <0 and 0 to the first two color segments of the color scale, respectively
+                    if (s < 0) {
+                        buf.put(0.0f);
+                        sampleData.add(0.0f);
+                    } else if (s == 0) {
+                        buf.put(1.0f);
+                        sampleData.add(0.0f);
+                    } else {
+                        // Map values >0 to appropriate color bar segment
                         float f = (float) Math.floor(cvt.convert(s));
                         buf.put(f);
                         // mm/100 to inch
                         sampleData.add(s * 0.03937f / 100);
                     }
+                }
                 buf.rewind();
 
                 if ((extent.x == 0) && (extent.y == 0)) {
@@ -408,15 +419,13 @@ public class XmrgResource extends
                     buf = FloatBuffer.allocate(data.length);
                     sampleData = new ArrayList<Float>(data.length);
                     for (short s : data) {
+                        // Map <0 and 0 to the first two color segments of the color scale, respectively
                         if (s < 0) {
                             buf.put(0.0f);
                             sampleData.add(0.0f);
-                        } else if (s > 0 && s < 25) {
+                        } else if (s == 0) {
-                            short ns = 10;
+                            buf.put(1.0f);
-                            float f = (short) cvt.convert(ns);
+                            sampleData.add(0.0f);
-                            buf.put(f);
-                            // mm/100 to inch
-                            sampleData.add(s * 0.03937f / 100);
                         } else {
                             float f = (float) Math.floor(cvt.convert(s));
                             buf.put(f);
@@ -621,9 +630,22 @@ public class XmrgResource extends
                 data = xmrg.getData();
             }
             buf = FloatBuffer.allocate(data.length);
+            sampleData = new ArrayList<Float>(data.length);
             for (short s : data) {
+                // Map <0 and 0 to the first two color segments of the color scale, respectively
+                if (s < 0) {
+                    buf.put(0.0f);
+                    sampleData.add(0.0f);
+                } else if (s == 0){
+                    buf.put(1.0f);
+                    sampleData.add(0.0f);
+                } else {
+                    // Map values >0 to appropriate color bar segment
                     float f = (float) Math.floor(cvt.convert(s));
                     buf.put(f);
+                 // mm/100 to inch
+                    sampleData.add(s * 0.03937f / 100);
+                }
             }
             buf.rewind();
             Rectangle extent = xmrg.getHrapExtent();

cave/com.raytheon.viz.lpi/localization/bundles/maps/88Ds.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="colorableCapability" colorAsString="#9b9b9b" />
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="true"
-                        isHoverOn="false" isVisible="true">
-                        <pdProps maxDisplayWidth="100000000" minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="lpiResourceData">
-                        <filename>88D.lpi</filename>
-                        <mapName>WSR-88D Station Locs</mapName>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.lpi/localization/bundles/maps/FAA/volcanoes.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="colorableCapability" colorAsString="#9b9b9b" />
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="true"
-                        isHoverOn="false" opacity="1.0" isVisible="true">
-                        <pdProps maxDisplayWidth="100000000" minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="lpiResourceData">
-                        <filename>volcanoes.lpi</filename>
-                        <mapName>Volcano Locations</mapName>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.lpi/localization/bundles/maps/fireWxStations.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="colorableCapability" colorAsString="#9b9b9b" />
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="true"
-                        isHoverOn="false" opacity="1.0" isVisible="true">
-                        <pdProps maxDisplayWidth="100000000" minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="lpiResourceData">
-                        <filename>fireWxSta.lpi</filename>
-                        <mapName>Fire Wx Stations</mapName>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.lpi/localization/bundles/maps/spotters.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="colorableCapability" colorAsString="#9b9b9b" />
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="true"
-                        isHoverOn="false" opacity="1.0" isVisible="true">
-                        <pdProps maxDisplayWidth="100000000" minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="lpiResourceData">
-                        <filename>spotters.lpi</filename>
-                        <mapName>Spotters</mapName>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.mpe.ui/plugin.xml

@@ -1847,22 +1847,6 @@
 	          </contextId>
 	      </classContext>
 	</extension>
-    <extension
-          point="com.raytheon.uf.viz.localization.perspective.localizationpath">
-       <path
-             application="MPE"
-             localizationType="COMMON_STATIC"
-             name="MPE Proc"
-             value="mpeProc">
-       </path>
-       <path
-             application="MPE"
-             localizationType="COMMON_STATIC"
-             name="MPE Lookup"
-             value="mpeLookup"
-             recursive="true">
-       </path>
-    </extension>
 	<extension point="org.eclipse.ui.services">
 		<sourceProvider
        		provider="com.raytheon.viz.mpe.ui.TransmitBestEstimateQPEProvider">

cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/OtherPrecipOptions.java

@@ -44,8 +44,6 @@ import com.raytheon.viz.mpe.util.MakeMat;
 import com.raytheon.viz.mpe.util.MakeRsel;
 import com.raytheon.viz.mpe.util.QCStations;
 import com.raytheon.viz.mpe.util.QCTStations;
-import com.raytheon.viz.mpe.util.ReadFreezingStationList;
-import com.raytheon.viz.mpe.util.ReadTemperatureStationList;
 import com.raytheon.viz.mpe.util.RenderPcp;
 import com.raytheon.viz.mpe.util.RenderT;
 import com.raytheon.viz.mpe.util.RenderT6;
@@ -67,6 +65,7 @@ import com.raytheon.viz.mpe.util.WriteQPFGrids;
  *                                     been retrieved.
  * Dec 15, 2017 6547       bkowal      Remove unnecessary adjustment now that the larger underlying problem
  *                                     has been resolved.  
+ * Oct 3, 2018  7496       smanoj      Fix temperature and freezing station size error.
  * 
  * </pre>
  * 
@@ -684,9 +683,7 @@ public class OtherPrecipOptions {
 
         } else if (clientdata == 2) {
             int m;
-            int num_zstations;
+            int num_zstations = DailyQcUtils.freezing_stations.size();
-            ReadFreezingStationList rfl = new ReadFreezingStationList();
-            num_zstations = rfl.getNumZstations();
             RenderZ rz = new RenderZ();
 
             /* render Grids and MAZ for four 6hr precipitation */
@@ -823,8 +820,7 @@ public class OtherPrecipOptions {
 
             // logMessage ("Gridding temperature and building MATs");
 
-            ReadTemperatureStationList rt = new ReadTemperatureStationList();
+            int num_tstations = DailyQcUtils.temperature_stations.size();
-            int num_tstations = rt.getNumTstations();
             BadTValues bt = new BadTValues();
             bt.update_bad_tvalues(DailyQcUtils.pcpn_day);
 

cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/AbstractPrismDataReader.java

@@ -39,6 +39,7 @@ import com.raytheon.viz.mpe.core.MPEDataManager;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Sep 29, 2017 6407       bkowal      Initial creation
+ * Sep 26, 2018 7482       smanoj      Fix the issue with data conversion
  * 
  * </pre>
  *
@@ -137,7 +138,8 @@ public abstract class AbstractPrismDataReader {
                 } else {
                     f = (float) dataToImage.convert(s);
                 }
-                float aa = (float) (Math.floor((f * 10)));
+                
+                float aa = (float) (Math.floor((f * getconvFactor())));
                 int bb = (int) aa;
                 destination[monthIndex][i][j] = bb;
             }
@@ -146,6 +148,10 @@ public abstract class AbstractPrismDataReader {
         return null;
     }
     
+    protected abstract float getconvFactor();
+    	
     protected abstract float handleNegativeValue(
             final UnitConverter dataToImage, final short value);
+    
+    
 }

cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java

@@ -89,6 +89,7 @@ import com.vividsolutions.jts.geom.Coordinate;
  * Dec 15, 2017 6547       bkowal      Remove unnecessary adjustment now that the larger underlying problem
  *                                     has been resolved.
  * Jan 24, 2018 6547       bkowal      Adjust station quality function index order. 
+ * Sep 26, 2018 7482       smanoj      Fix the issue with Month in the filenames                                                                      
  *
  * </pre>
  *
@@ -1831,7 +1832,7 @@ public class DailyQcUtils {
                     dbuf = String.format("%s%s_%04d%02d%02d", zgrid_file,
                             ztimefile[dqcTimeStringIndex][k],
                             otime.get(Calendar.YEAR),
-                            otime.get(Calendar.MONTH + 1),
+                            otime.get(Calendar.MONTH) + 1,
                             otime.get(Calendar.DAY_OF_MONTH));
 
                     num = 100 + (m * 4) + kk;
@@ -1882,7 +1883,7 @@ public class DailyQcUtils {
                     dbuf = String.format("%s%s_%04d%02d%02d", tgrid_file,
                             ttimefile[dqcTimeStringIndex][k],
                             otime.get(Calendar.YEAR),
-                            otime.get(Calendar.MONTH + 1),
+                            otime.get(Calendar.MONTH) + 1,
                             otime.get(Calendar.DAY_OF_MONTH));
 
                     if (k < 4) {

cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java

@@ -36,6 +36,8 @@ import javax.measure.unit.SI;
  * Feb 3,  2015  16993     snaples     fixed color scale data conversion issue.
  * Mar 2,  2015  15660     snaples     Fixed problem with color scale using wrong values. Causing grids to be all zeros.
  * Oct 03, 2017  6407      bkowal      Cleanup. Updated to extend {@link AbstractPrismDataReader}.
+ * Sep 27, 2018  7482      smanoj      Fix the issue with data conversion
+ * 
  * </pre>
  * 
  * @author snaples
@@ -47,6 +49,8 @@ public class MeanMonthlyPrecip extends AbstractPrismDataReader {
 
     private static Isoh isoh;
     
+    private static final float convFactor = 25.4f;
+    
     public MeanMonthlyPrecip() {
         super(NonSI.INCH, SI.MILLIMETER);
     }
@@ -115,4 +119,9 @@ public class MeanMonthlyPrecip extends AbstractPrismDataReader {
             short value) {
         return 0;
     }
+    
+    @Override
+    protected float getconvFactor(){
+        return convFactor;
+    }
 }

cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyTemp.java

@@ -34,6 +34,7 @@ import javax.measure.unit.NonSI;
  * Apr 16, 2012            mgamazaychik DR9602 - changed how max and min 
  *                         temperature data are read from PRISM
  * Oct 03, 2017 6407       bkowal       Cleanup. Updated to extend {@link AbstractPrismDataReader}.
+ * Sep 27, 2018  7482      smanoj       Fix the issue with data conversion
  * 
  * </pre>
  * 
@@ -44,6 +45,8 @@ public class MeanMonthlyTemp extends AbstractPrismDataReader {
 
     private static MaxMin maxmin;
     
+    private static final float convFactor = 10.0f;
+    
     public MeanMonthlyTemp() {
         super(NonSI.FAHRENHEIT, NonSI.FAHRENHEIT.divide(10));
     }
@@ -126,4 +129,9 @@ public class MeanMonthlyTemp extends AbstractPrismDataReader {
             return (float) dataToImage.convert(value);
         }
     }
+    
+    @Override
+    protected float getconvFactor(){
+        return convFactor;
+    }
 }

cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarFourPanel.xml

@@ -19,12 +19,6 @@
 		further_licensing_information.
 	-->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<contribute xsi:type="bundleItem"
-		file="bundles/DefaultRadarFourPanel.xml" menuText="4-Panel Z+DVL/SRM+V/KDP+HC/EET"
-		id="05dualpolbasedata">
-		<substitute key="icao" value="${icao}" />
-		<substitute key="elevation" value="0.0--0.5" />
-	</contribute>
 	<contribute xsi:type="titleItem" id="${icao}4PanelZ+SRMZDR+VKDP+HCCC+SW"
 		titleText="------ 4-Panel Z+SRM/ZDR+V/KDP+HC/CC ------" />
 	<contribute xsi:type="bundleItem"

cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesrFullDisk.xml

@@ -36,7 +36,7 @@
 									constraintType="EQUALS" />
 							</mapping>
 							<mapping key="sectorID">
-								<constraint constraintValue="TFD"
+								<constraint constraintValue="EFD"
 									constraintType="EQUALS" />
 							</mapping>
 							<mapping key="creatingEntity">

cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrMenu.xml

@@ -96,22 +96,22 @@
 	    <contribute xsi:type="subinclude" subMenu="GOES 17 - Conus" 
 	    	fileName="menus/satellite/goesr/goesrByChannel.xml">
 	        <substitute key="sector" value="WCONUS" />
-	        <substitute key="entity" value="GOES%" />
+	        <substitute key="entity" value="GOES-17" />
 	    </contribute>
 	    <contribute xsi:type="subinclude" subMenu="GOES 17 - Full Disk" 
 	    	fileName="menus/satellite/goesr/goesrByChannel.xml">
 	        <substitute key="sector" value="WFD" />
-	        <substitute key="entity" value="GOES%" />
+	        <substitute key="entity" value="GOES-17" />
 	    </contribute>
 	    <contribute xsi:type="subinclude" subMenu="GOES 17 - Mesoscale 1" 
 	    	fileName="menus/satellite/goesr/goesrByChannel.xml">
 	        <substitute key="sector" value="WMESO-1" />
-	        <substitute key="entity" value="GOES%" />
+	        <substitute key="entity" value="GOES-17" />
 	    </contribute>
 	    <contribute xsi:type="subinclude" subMenu="GOES 17 - Mesoscale 2" 
 	    	fileName="menus/satellite/goesr/goesrByChannel.xml">
 	        <substitute key="sector" value="WMESO-2" />
-	        <substitute key="entity" value="GOES%" />
+	        <substitute key="entity" value="GOES-17" />
 	    </contribute>
 
 </menuTemplate>

cave/com.raytheon.viz.spi/localization/bundles/maps/Sounding Locs/gfs.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#9b9b9b" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="true" isHoverOn="false"
-                        opacity="1.0" isVisible="true">
-                        <pdProps maxDisplayWidth="100000000" minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="spiResourceData">
-                        <filename>basemaps/GFSmodelBufr.spi</filename>
-                        <mapName>GFS</mapName>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.spi/localization/bundles/maps/Sounding Locs/goes.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#9b9b9b" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="true" isHoverOn="false"
-                        opacity="1.0" isVisible="true">
-                        <pdProps maxDisplayWidth="100000000"
-                            minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="spiResourceData">
-                        <filename>basemaps/goesBufr.spi</filename>
-                        <mapName>GOES</mapName>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.spi/localization/bundles/maps/Sounding Locs/nam.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#9b9b9b" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="true" isHoverOn="false"
-                        opacity="1.0" isVisible="true">
-                        <pdProps maxDisplayWidth="100000000"
-                            minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="spiResourceData">
-                        <filename>basemaps/modelBufr.spi</filename>
-                        <mapName>NAM</mapName>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.spi/localization/bundles/maps/Sounding Locs/raob.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#9b9b9b" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="true" isHoverOn="false"
-                        isVisible="true">
-                        <pdProps maxDisplayWidth="100000000"
-                            minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="spiResourceData">
-                        <filename>basemaps/raob.spi</filename>
-                        <mapName>RAOB Station Locations</mapName>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.spi/localization/bundles/maps/acarsAirports.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#9b9b9b" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="true" isHoverOn="false"
-                        isVisible="true">
-                        <pdProps maxDisplayWidth="100000000"
-                            minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="spiResourceData">
-                        <filename>basemaps/airports.spi</filename>
-                        <mapName>ACARS Airport Locations</mapName>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.spi/localization/bundles/maps/buoy.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#9b9b9b" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="true" isHoverOn="false"
-                        isVisible="true">
-                        <pdProps maxDisplayWidth="100000000"
-                            minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="spiResourceData">
-                        <filename>basemaps/BUOY.spi</filename>
-                        <mapName>Fixed Buoy Locations</mapName>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.spi/localization/bundles/maps/ldad.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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.
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#9b9b9b" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="true" isHoverOn="false"
-                        opacity="1.0" isVisible="true">
-                        <pdProps maxDisplayWidth="100000000" minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="spiResourceData">
-                        <filename>basemaps/ldad15.spi</filename>
-                        <mapName>LDAD Stations</mapName>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.spi/localization/bundles/maps/ldadPrecip.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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.
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#9b9b9b" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="true" isHoverOn="false"
-                        opacity="1.0" isVisible="true">
-                        <pdProps maxDisplayWidth="100000000" minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="spiResourceData">
-                        <filename>basemaps/ldad15prcp.spi</filename>
-                        <mapName>LDAD Precip</mapName>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.spi/localization/bundles/maps/metars.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#9b9b9b" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="true" isHoverOn="false"
-                        isVisible="true">
-                        <pdProps maxDisplayWidth="100000000"
-                            minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="spiResourceData">
-                        <filename>basemaps/MTR.spi</filename>
-                        <mapName>METAR Station Locations</mapName>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.spi/localization/bundles/maps/profilers.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#9b9b9b" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="true" isHoverOn="false"
-                        opacity="1.0" isVisible="true">
-                        <pdProps maxDisplayWidth="100000000"
-                            minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="spiResourceData">
-                        <filename>basemaps/profiler.spi</filename>
-                        <mapName>NPN Profilers</mapName>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.spi/localization/bundles/maps/synoptic.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#9b9b9b" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="true" isHoverOn="false"
-                        isVisible="true">
-                        <pdProps maxDisplayWidth="100000000"
-                            minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="spiResourceData">
-                        <filename>basemaps/synoptic.spi</filename>
-                        <mapName>Synoptic Station Locations</mapName>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.volumebrowser/DataSelectionMenuItems.xml

@@ -19,27 +19,30 @@
         further_licensing_information.
     -->
 <Product-Selection-MenuItems>
-    <Source-Grid>ENPwave</Source-Grid>
+    <Source-Grid>CMC</Source-Grid>
-    <Source-Grid>GFS40</Source-Grid>
+    <Source-Grid>ESTOFS</Source-Grid>
-    <Source-Grid>GFS90</Source-Grid>
+    <Source-Grid>ETSS</Source-Grid>
-    <Source-Grid>GFSensemble</Source-Grid>
+    <Source-Grid>GFS</Source-Grid>
-    <Source-Grid>GFSGuide</Source-Grid>
+    <Source-Grid>GFS20</Source-Grid>
-    <Source-Grid>GriddedMOS</Source-Grid>
     <Source-Grid>GWW</Source-Grid>
+    <Source-Grid>MOSGuide</Source-Grid>
+    <Source-Grid>HRRR</Source-Grid>
     <Source-Grid>HPCGuide</Source-Grid>
-    <Source-Grid>LAMP</Source-Grid>
+    <Source-Grid>LAMP2p5</Source-Grid>
-    <Source-Grid>MSAS</Source-Grid>
     <Source-Grid>NAM12</Source-Grid>
     <Source-Grid>NAM40</Source-Grid>
-    <Source-Grid>NAM80</Source-Grid>
+    <Source-Grid>NAVGEM</Source-Grid>
-    <Source-Grid>NAMWX</Source-Grid>
+    <Source-Grid>NationalBlend</Source-Grid>
-    <Source-Grid>NICIE</Source-Grid>
+    <Source-Grid>PROB3HR</Source-Grid>
-    <Source-Grid>TPC-HurWind</Source-Grid>
+    <Source-Grid>NOHRSC-SNOW</Source-Grid>
+    <Source-Grid>HPCqpf</Source-Grid>
+    <Source-Grid>HPCqpfNDFD</Source-Grid>
+    <Source-Grid>fnmocWave</Source-Grid>
+    <Source-Grid>SeaIce</Source-Grid>
+    <Source-Grid>SPCGuide</Source-Grid>
+    <Source-Grid>RTMA</Source-Grid>
     <Source-Grid>TPCWindProb</Source-Grid>
-    <Source-Grid>TPCWindProb_Prelim</Source-Grid>
+    <Source-Grid>URMA25</Source-Grid>
-    <Source-Grid>WNAwave</Source-Grid>
-    <Source-Grid>RTG_SST-Analysis</Source-Grid>
-    <Source-Other>DMD</Source-Other>
     <Source-Other>GFSBufr</Source-Other>
     <Source-Other>GoesBufr</Source-Other>
     <Source-Other>MDCRS</Source-Other>

cave/com.raytheon.viz.volumebrowser/localization/menus/grid/WaveWatch.xml

@@ -40,10 +40,5 @@
 			    menuText="Sfc Vorticity and Wind" id="" useReferenceTime="true">
 			<substitute key="frameCount" value="${frameCount}"/>
 		</contribute>
-		<contribute xsi:type="titleItem" titleText="------------------------"/>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WaveWatch-FourPanel.xml"
-			    menuText="Four Panel Display" id="" useReferenceTime="true">
-			<substitute key="frameCount" value="${frameCount}"/>
-		</contribute>
 	</contribute>
 </menuTemplate>

cave/com.raytheon.viz.volumebrowser/localization/menus/grid/cmcFamilies.xml

@@ -51,10 +51,6 @@
 			    menuText="Lightning Threat" id="" useReferenceTime="true">
 		</contribute>
 		
-		<contribute xsi:type="bundleItem" file="bundles/grid/CMC35km.xml"
-			    menuText=" Helicity (35 km)" id="" useReferenceTime="true">
-		</contribute>
-		
 		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyD.xml"
 			    menuText="Precip Type / Moisture Transport" id="" useReferenceTime="true">
 		</contribute>

cave/com.raytheon.viz.volumebrowser/localization/menus/volume/ConvectModelFamilies.xml

@@ -18,9 +18,12 @@
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
+    <!-- 
+        This is an absolute override file, indicating that a higher priority 
+        version of the file will completely replace a lower priority version
+        of the file. 
+    -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">    
-			
-		
      <!-- Hail Family -->
     <contribute xsi:type="subMenu" menuText="Hail Family">
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyC.xml"
@@ -61,7 +64,7 @@
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyC.xml"
             menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="NAM12"/>
+            <substitute key="modelName" value="ETA" />
             <substitute key="TP" value="TP6hr" />
             <substitute key="frameCount" value="15" />
         </contribute>
@@ -69,7 +72,7 @@
             menuText="RAP13" id="rap13" useReferenceTime="true">
             <substitute key="modelName" value="${RAP13model}" />
             <substitute key="TP" value="TP3hr" />
-				<substitute key="frameCount" value="19"/>
+            <substitute key="frameCount" value="22" />
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyC.xml"
             menuText="RAP" id="rap" useReferenceTime="true">
@@ -78,7 +81,6 @@
             <substitute key="frameCount" value="12" />
         </contribute>
     </contribute>
-		
     <!--(Heavy Rain Family)-->
     <contribute xsi:type="subMenu" menuText="Heavy Rain Family">
         <contribute xsi:type="bundleItem" file="bundles/volume/HeavyRainFamily.xml"
@@ -119,7 +121,7 @@
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/HeavyRainFamily.xml"
             menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="NAM12"/>
+            <substitute key="modelName" value="ETA" />
             <substitute key="TP" value="TP6hr" />
             <substitute key="frameCount" value="15" />
         </contribute>
@@ -127,7 +129,7 @@
             menuText="RAP13" id="rap13" useReferenceTime="true">
             <substitute key="modelName" value="${RAP13model}" />
             <substitute key="TP" value="TP3hr" />
-				<substitute key="frameCount" value="19"/>
+            <substitute key="frameCount" value="22" />
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/HeavyRainFamily.xml"
             menuText="RAP" id="rap" useReferenceTime="true">
@@ -136,8 +138,6 @@
             <substitute key="frameCount" value="12" />
         </contribute>
     </contribute>
-		
-		
     <contribute xsi:type="subMenu" menuText="MCS Family">
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyX.xml"
             menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
@@ -177,7 +177,7 @@
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyX.xml"
             menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="NAM12"/>
+            <substitute key="modelName" value="ETA" />
             <substitute key="TP" value="TP6hr" />
             <substitute key="frameCount" value="15" />
         </contribute>
@@ -185,7 +185,7 @@
             menuText="RAP13" id="rap13" useReferenceTime="true">
             <substitute key="modelName" value="${RAP13model}" />
             <substitute key="TP" value="TP3hr" />
-				<substitute key="frameCount" value="19"/>
+            <substitute key="frameCount" value="22" />
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyX.xml"
             menuText="RAP" id="rap" useReferenceTime="true">
@@ -233,7 +233,7 @@
         </contribute>
        <!-- <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyA.xml"
                     menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="NAM12"/>
+                <substitute key="modelName" value="ETA"/>
                 <substitute key="TP" value="TP6hr"/>
                 <substitute key="frameCount" value="15"/>
             </contribute> -->
@@ -241,7 +241,7 @@
             menuText="RAP13" id="rap13" useReferenceTime="true">
             <substitute key="modelName" value="${RAP13model}" />
             <substitute key="TP" value="TP3hr" />
-				<substitute key="frameCount" value="19"/>
+            <substitute key="frameCount" value="22" />
         </contribute>
    <!-- <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyA.xml"
                     menuText="RAP" id="rap" useReferenceTime="true">
@@ -250,8 +250,6 @@
                 <substitute key="frameCount" value="12"/>
             </contribute> -->
     </contribute>
-		
-		
     <contribute xsi:type="subMenu" menuText="QLCS/Wind Family">
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyH.xml"
             menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
@@ -291,7 +289,7 @@
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyH.xml"
             menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="NAM12"/>
+            <substitute key="modelName" value="ETA" />
             <substitute key="TP" value="TP6hr" />
             <substitute key="frameCount" value="15" />
         </contribute>
@@ -299,7 +297,7 @@
             menuText="RAP13" id="rap13" useReferenceTime="true">
             <substitute key="modelName" value="${RAP13model}" />
             <substitute key="TP" value="TP3hr" />
-				<substitute key="frameCount" value="19"/>
+            <substitute key="frameCount" value="22" />
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyH.xml"
             menuText="RAP" id="rap" useReferenceTime="true">
@@ -308,7 +306,6 @@
             <substitute key="frameCount" value="12" />
         </contribute>
     </contribute>
-		
     <!--  Storm Init Family -->
     <contribute xsi:type="subMenu" menuText="Storm Initiation Family">
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyB.xml"
@@ -349,7 +346,7 @@
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyB.xml"
             menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="NAM12"/>
+            <substitute key="modelName" value="ETA" />
             <substitute key="TP" value="TP6hr" />
             <substitute key="frameCount" value="15" />
         </contribute>
@@ -357,7 +354,7 @@
             menuText="RAP13" id="rap13" useReferenceTime="true">
             <substitute key="modelName" value="${RAP13model}" />
             <substitute key="TP" value="TP3hr" />
-				<substitute key="frameCount" value="19"/>
+            <substitute key="frameCount" value="22" />
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyB.xml"
             menuText="RAP" id="rap" useReferenceTime="true">
@@ -366,7 +363,6 @@
             <substitute key="frameCount" value="12" />
         </contribute>
     </contribute>
-		
     <!-- Storm Scale 4 Panel
     <contribute xsi:type="subMenu" menuText="Storm Scale 4-Panel">
         <contribute xsi:type="bundleItem" file="bundles/volume/DefaultStormScaleFamily.xml"
@@ -382,21 +378,19 @@
         <contribute xsi:type="bundleItem" file="bundles/volume/DefaultStormScaleFamily.xml"
             menuText="HRRR" id="HRRR" useReferenceTime="true">
             <substitute key="modelName" value="HRRR"/>
-		    <substitute key="frameCount" value="15"/>
+            <substitute key="frameCount" value="19"/>
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/DefaultStormScaleFamily.xml"
             menuText="${HRRRmodel}" id="${HRRRmodel}" useReferenceTime="true">
             <substitute key="modelName" value="${HRRRmodel}"/>
-		    <substitute key="frameCount" value="15"/>
+            <substitute key="frameCount" value="19"/>
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/DefaultStormScaleFamily.xml"
             menuText="NAMNest 4km" id="CRNAMNest" useReferenceTime="true">
             <substitute key="modelName" value="${NAMNestmodel}"/>
             <substitute key="frameCount" value="45"/>
         </contribute>
-	
     </contribute> -->
-	
     <contribute xsi:type="subMenu" menuText="Storm Type Family">
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyV.xml"
             menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
@@ -436,7 +430,7 @@
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyV.xml"
             menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="NAM12"/>
+            <substitute key="modelName" value="ETA" />
             <substitute key="TP" value="TP6hr" />
             <substitute key="frameCount" value="15" />
         </contribute>
@@ -444,7 +438,7 @@
             menuText="RAP13" id="rap13" useReferenceTime="true">
             <substitute key="modelName" value="${RAP13model}" />
             <substitute key="TP" value="TP3hr" />
-				<substitute key="frameCount" value="19"/>
+            <substitute key="frameCount" value="22" />
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyV.xml"
             menuText="RAP" id="rap" useReferenceTime="true">
@@ -453,7 +447,6 @@
             <substitute key="frameCount" value="12" />
         </contribute>
     </contribute>
-		
     <!--ModFamW (Conv: Supercell Family)-->
     <contribute xsi:type="subMenu" menuText="Supercell Family">
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyW.xml"
@@ -494,7 +487,7 @@
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyW.xml"
             menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="NAM12"/>
+            <substitute key="modelName" value="ETA" />
             <substitute key="TP" value="TP6hr" />
             <substitute key="frameCount" value="15" />
         </contribute>
@@ -502,7 +495,7 @@
             menuText="RAP13" id="rap13" useReferenceTime="true">
             <substitute key="modelName" value="${RAP13model}" />
             <substitute key="TP" value="TP3hr" />
-				<substitute key="frameCount" value="19"/>
+            <substitute key="frameCount" value="22" />
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyW.xml"
             menuText="RAP" id="rap" useReferenceTime="true">
@@ -551,7 +544,7 @@
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyYY.xml"
             menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="NAM12"/>
+            <substitute key="modelName" value="ETA" />
             <substitute key="TP" value="TP6hr" />
             <substitute key="frameCount" value="15" />
         </contribute>
@@ -559,7 +552,7 @@
             menuText="RAP13" id="rap13" useReferenceTime="true">
             <substitute key="modelName" value="${RAP13model}" />
             <substitute key="TP" value="TP3hr" />
-				<substitute key="frameCount" value="19"/>
+            <substitute key="frameCount" value="22" />
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyYY.xml"
             menuText="RAP" id="rap" useReferenceTime="true">
@@ -608,7 +601,7 @@
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyY.xml"
             menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="NAM12"/>
+            <substitute key="modelName" value="ETA" />
             <substitute key="TP" value="TP6hr" />
             <substitute key="frameCount" value="15" />
         </contribute>
@@ -616,7 +609,7 @@
             menuText="RAP13" id="rap13" useReferenceTime="true">
             <substitute key="modelName" value="${RAP13model}" />
             <substitute key="TP" value="TP3hr" />
-				<substitute key="frameCount" value="19"/>
+            <substitute key="frameCount" value="22" />
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyY.xml"
             menuText="RAP" id="rap" useReferenceTime="true">
@@ -625,7 +618,4 @@
             <substitute key="frameCount" value="12" />
         </contribute>
     </contribute>
-		
-
-		
 </menuTemplate>

cave/com.raytheon.viz.volumebrowser/localization/menus/volume/WinterFamily.xml

@@ -18,56 +18,61 @@
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
+    <!-- 
+        This is an absolute override file, indicating that a higher priority 
+        version of the file will completely replace a lower priority version
+        of the file. 
+    -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-		<contribute xsi:type="bundleItem" file="bundles/volume/WinterFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/WinterFamily.xml" menuText="ECMWF-HiRes"
-				menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
+        id="ecmwfHiRes" useReferenceTime="true">
         <substitute key="TP" value="TP" />
         <substitute key="frameCount" value="41" />
     </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/WinterFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/WinterFamily.xml" menuText="GFS20"
-				menuText="GFS20" id="gfs20" useReferenceTime="true">
+        id="gfs20" useReferenceTime="true">
         <substitute key="modelName" value="GFS20" />
         <substitute key="TP" value="TP" />
         <substitute key="frameCount" value="55" />
     </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/WinterFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/WinterFamily.xml" menuText="GFS"
-				menuText="GFS" id="gfs1deg" useReferenceTime="true">
+        id="gfs1deg" useReferenceTime="true">
         <substitute key="modelName" value="${GFSmodel}" />
         <substitute key="TP" value="TP" />
         <substitute key="frameCount" value="41" />
     </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/WinterFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/WinterFamily.xml" menuText="NAM12"
-				menuText="NAM12" id="nam12" useReferenceTime="true">
+        id="nam12" useReferenceTime="true">
         <substitute key="modelName" value="${NAM12model}" />
         <substitute key="TP" value="TP3hr" />
         <substitute key="frameCount" value="29" />
     </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/WinterFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/WinterFamily.xml" menuText="NAM40"
-				menuText="NAM40" id="nam40" useReferenceTime="true">
+        id="nam40" useReferenceTime="true">
         <substitute key="modelName" value="${NAM40model}" />
         <substitute key="TP" value="TP3hr" />
         <substitute key="frameCount" value="21" />
     </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/WinterFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/WinterFamily.xml" menuText="NAM80"
-				menuText="NAM80" id="nam80" useReferenceTime="true">
+        id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="NAM12"/>
+        <substitute key="modelName" value="ETA" />
         <substitute key="TP" value="TP6hr" />
         <substitute key="frameCount" value="15" />
     </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/WinterFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/WinterFamily.xml" menuText="RAP13"
-				menuText="RAP13" id="rap13" useReferenceTime="true">
+        id="rap13" useReferenceTime="true">
         <substitute key="modelName" value="${RAP13model}" />
         <substitute key="TP" value="TP3hr" />
-				<substitute key="frameCount" value="19"/>
+        <substitute key="frameCount" value="22" />
     </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/WinterFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/WinterFamily.xml" menuText="RAP"
-				menuText="RAP" id="rap" useReferenceTime="true">
+        id="rap" useReferenceTime="true">
         <substitute key="modelName" value="${RAPmodel}" />
         <substitute key="TP" value="TP3hr" />
         <substitute key="frameCount" value="9" />
     </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/WinterFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/WinterFamily.xml" menuText="UKMET"
-				menuText="UKMET" id="ukmet" useReferenceTime="true">
+        id="ukmet" useReferenceTime="true">
         <substitute key="TP" value="TP6hr" />
         <substitute key="frameCount" value="15" />
     </contribute>

cave/com.raytheon.viz.volumebrowser/localization/menus/volume/WinterFnFourPanelFamily.xml

@@ -18,6 +18,11 @@
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
+    <!-- 
+        This is an absolute override file, indicating that a higher priority 
+        version of the file will completely replace a lower priority version
+        of the file. 
+    -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <contribute xsi:type="bundleItem" file="bundles/volume/WinterFnFourPanelFamily.xml"
         menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
@@ -50,7 +55,7 @@
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/volume/WinterFnFourPanelFamily.xml"
         menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="NAM12"/>
+        <substitute key="modelName" value="ETA" />
         <substitute key="TP" value="TP6hr" />
         <substitute key="frameCount" value="15" />
     </contribute>
@@ -58,7 +63,7 @@
         menuText="RAP13" id="rap13" useReferenceTime="true">
         <substitute key="modelName" value="${RAP13model}" />
         <substitute key="TP" value="TP3hr" />
-				<substitute key="frameCount" value="19"/>
+        <substitute key="frameCount" value="22" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/volume/WinterFnFourPanelFamily.xml"
         menuText="RAP" id="rap" useReferenceTime="true">

cave/com.raytheon.viz.volumebrowser/localization/menus/volume/WinterModelFamilies.xml

@@ -18,14 +18,19 @@
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
+    <!-- 
+        This is an absolute override file, indicating that a higher priority 
+        version of the file will completely replace a lower priority version
+        of the file. 
+    -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <contribute xsi:type="subMenu" menuText="Basic">
    <!-- <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyD-ECMW.xml"
                 menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
             <substitute key="TP" value="TP"/>
             <substitute key="frameCount" value="41"/>
-			</contribute> -->
+        </contribute>
-<!-- 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyD-MandatoryLevels.xml"
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyD-MandatoryLevels.xml"
                 menuText="Canadian-NH" id="canNH" useReferenceTime="true">
             <substitute key="modelName" value="Canadian-NH"/> 
             <substitute key="TP" value="TP"/>
@@ -69,7 +74,7 @@
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyD.xml"
             menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="NAM12"/>
+            <substitute key="modelName" value="ETA" />
             <substitute key="TP" value="TP6hr" />
             <substitute key="frameCount" value="15" />
         </contribute>
@@ -77,7 +82,7 @@
             menuText="RAP13" id="rap13" useReferenceTime="true">
             <substitute key="modelName" value="${RAP13model}" />
             <substitute key="TP" value="TP3hr" />
-				<substitute key="frameCount" value="19"/>
+            <substitute key="frameCount" value="22" />
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyD.xml"
             menuText="RAP" id="rap" useReferenceTime="true">
@@ -97,37 +102,44 @@
                 <substitute key="TP" value="TP"/>
                 <substitute key="frameCount" value="41"/>
             </contribute> -->
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml" menuText="GFS20" id="gfs20" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml"
+            menuText="GFS20" id="gfs20" useReferenceTime="true">
             <substitute key="modelName" value="GFS20" />
             <substitute key="TP" value="TP" />
             <substitute key="frameCount" value="55" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml" menuText="GFS" id="gfs1deg" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml"
+            menuText="GFS" id="gfs1deg" useReferenceTime="true">
             <substitute key="modelName" value="${GFSmodel}" />
             <substitute key="TP" value="TP" />
             <substitute key="frameCount" value="41" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml" menuText="NAM12" id="nam12" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml"
+            menuText="NAM12" id="nam12" useReferenceTime="true">
             <substitute key="modelName" value="${NAM12model}" />
             <substitute key="TP" value="TP3hr" />
             <substitute key="frameCount" value="29" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml" menuText="NAM40" id="nam40" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml"
+            menuText="NAM40" id="nam40" useReferenceTime="true">
             <substitute key="modelName" value="${NAM40model}" />
             <substitute key="TP" value="TP3hr" />
             <substitute key="frameCount" value="21" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml" menuText="NAM80" id="nam80" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml"
-				<substitute key="modelName" value="NAM12"/>
+            menuText="NAM80" id="nam80" useReferenceTime="true">
+            <substitute key="modelName" value="ETA" />
             <substitute key="TP" value="TP6hr" />
             <substitute key="frameCount" value="15" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml" menuText="RAP13" id="rap13" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml"
+            menuText="RAP13" id="rap13" useReferenceTime="true">
             <substitute key="modelName" value="${RAP13model}" />
             <substitute key="TP" value="TP3hr" />
-				<substitute key="frameCount" value="19"/>
+            <substitute key="frameCount" value="22" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml" menuText="RAP" id="rap" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml"
+            menuText="RAP" id="rap" useReferenceTime="true">
             <substitute key="modelName" value="${RAPmodel}" />
             <substitute key="TP" value="TP3hr" />
             <substitute key="frameCount" value="9" />
@@ -137,7 +149,6 @@
             <substitute key="frameCount" value="15"/>
         </contribute> -->
     </contribute>
-		
     <contribute xsi:type="subMenu" menuText="Big3 Qn Family">
       <!-- <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM-ECMW.xml"
                     menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
@@ -170,7 +181,7 @@
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
             menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="NAM12"/>
+            <substitute key="modelName" value="ETA" />
             <substitute key="TP" value="TP6hr" />
             <substitute key="frameCount" value="15" />
         </contribute>
@@ -178,7 +189,7 @@
             menuText="RAP13" id="rap13" useReferenceTime="true">
             <substitute key="modelName" value="${RAP13model}" />
             <substitute key="TP" value="TP3hr" />
-				<substitute key="frameCount" value="19"/>
+            <substitute key="frameCount" value="22" />
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
             menuText="RAP" id="rap" useReferenceTime="true">
@@ -192,7 +203,6 @@
                 <substitute key="frameCount" value="15"/>
             </contribute> -->
     </contribute>
-		
     <contribute xsi:type="subMenu" menuText="PType Family">
    <!-- <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL-MandatoryLevels.xml"
                 menuText="Canadian-NH" id="canNH" useReferenceTime="true">
@@ -212,12 +222,14 @@
             <substitute key="TP" value="TP" />
             <substitute key="frameCount" value="41" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml" menuText="GFS20" id="gfs20" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml"
+            menuText="GFS20" id="gfs20" useReferenceTime="true">
             <substitute key="modelName" value="GFS20" />
             <substitute key="TP" value="TP" />
             <substitute key="frameCount" value="55" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml" menuText="GFS" id="gfs1deg" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml"
+            menuText="GFS" id="gfs1deg" useReferenceTime="true">
             <substitute key="modelName" value="${GFSmodel}" />
             <substitute key="TP" value="TP" />
             <substitute key="frameCount" value="41" />
@@ -228,27 +240,32 @@
             <substitute key="TP" value="TP" />
             <substitute key="frameCount" value="5" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml" menuText="NAM12" id="nam12" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml"
+            menuText="NAM12" id="nam12" useReferenceTime="true">
             <substitute key="modelName" value="${NAM12model}" />
             <substitute key="TP" value="TP3hr" />
             <substitute key="frameCount" value="29" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml" menuText="NAM40" id="nam40" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml"
+            menuText="NAM40" id="nam40" useReferenceTime="true">
             <substitute key="modelName" value="${NAM40model}" />
             <substitute key="TP" value="TP3hr" />
             <substitute key="frameCount" value="21" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml" menuText="NAM80" id="nam80" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml"
-				<substitute key="modelName" value="NAM12"/>
+            menuText="NAM80" id="nam80" useReferenceTime="true">
+            <substitute key="modelName" value="ETA" />
             <substitute key="TP" value="TP6hr" />
             <substitute key="frameCount" value="15" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml" menuText="RAP13" id="rap13" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml"
+            menuText="RAP13" id="rap13" useReferenceTime="true">
             <substitute key="modelName" value="${RAP13model}" />
             <substitute key="TP" value="TP3hr" />
-				<substitute key="frameCount" value="19"/>
+            <substitute key="frameCount" value="22" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml" menuText="RAP" id="rap" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml"
+            menuText="RAP" id="rap" useReferenceTime="true">
             <substitute key="modelName" value="${RAPmodel}" />
             <substitute key="TP" value="TP3hr" />
             <substitute key="frameCount" value="9" />
@@ -258,13 +275,12 @@
             <substitute key="frameCount" value="15"/>
         </contribute> -->
     </contribute>
-
     <contribute xsi:type="subMenu" menuText="PV-Trop Family">
   <!-- <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE-ECMW.xml" menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
             <substitute key="TP" value="TP"/>
             <substitute key="frameCount" value="41"/>
-			</contribute> -->
+        </contribute>
-<!-- 				<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml"
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml"
                 menuText="Canadian-NH" id="canNH" useReferenceTime="true">
             <substitute key="modelName" value="Canadian-NH"/> 
             <substitute key="TP" value="TP"/>
@@ -282,37 +298,44 @@
             <substitute key="TP" value="TP"/>
             <substitute key="frameCount" value="41"/>
         </contribute> -->
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml" menuText="GFS20" id="gfs20" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml"
+            menuText="GFS20" id="gfs20" useReferenceTime="true">
             <substitute key="modelName" value="GFS20" />
             <substitute key="TP" value="TP" />
             <substitute key="frameCount" value="55" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml" menuText="GFS" id="gfs1deg" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml"
+            menuText="GFS" id="gfs1deg" useReferenceTime="true">
             <substitute key="modelName" value="${GFSmodel}" />
             <substitute key="TP" value="TP" />
             <substitute key="frameCount" value="41" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml" menuText="NAM12" id="nam12" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml"
+            menuText="NAM12" id="nam12" useReferenceTime="true">
             <substitute key="modelName" value="${NAM12model}" />
             <substitute key="TP" value="TP3hr" />
             <substitute key="frameCount" value="29" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml" menuText="NAM40" id="nam40" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml"
+            menuText="NAM40" id="nam40" useReferenceTime="true">
             <substitute key="modelName" value="${NAM40model}" />
             <substitute key="TP" value="TP3hr" />
             <substitute key="frameCount" value="21" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml" menuText="NAM80" id="nam80" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml"
-				<substitute key="modelName" value="NAM12"/>
+            menuText="NAM80" id="nam80" useReferenceTime="true">
+            <substitute key="modelName" value="ETA" />
             <substitute key="TP" value="TP6hr" />
             <substitute key="frameCount" value="15" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml" menuText="RAP13" id="rap13" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml"
+            menuText="RAP13" id="rap13" useReferenceTime="true">
             <substitute key="modelName" value="${RAP13model}" />
             <substitute key="TP" value="TP3hr" />
-				<substitute key="frameCount" value="19"/>
+            <substitute key="frameCount" value="22" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml" menuText="RAP" id="rap" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml"
+            menuText="RAP" id="rap" useReferenceTime="true">
             <substitute key="modelName" value="${RAPmodel}" />
             <substitute key="TP" value="TP3hr" />
             <substitute key="frameCount" value="9" />
@@ -322,45 +345,49 @@
             <substitute key="frameCount" value="15"/>
          </contribute> -->
     </contribute>
-
-		
-
     <contribute xsi:type="subMenu" menuText="Snow Growth Family">
       <!-- <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ-ECMW.xml" menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
                 <substitute key="TP" value="TP"/>
                 <substitute key="frameCount" value="41"/>
             </contribute> -->
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml" menuText="GFS20" id="gfs20" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml"
+            menuText="GFS20" id="gfs20" useReferenceTime="true">
             <substitute key="modelName" value="GFS20" />
             <substitute key="TP" value="TP" />
             <substitute key="frameCount" value="55" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml" menuText="GFS" id="gfs1deg" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml"
+            menuText="GFS" id="gfs1deg" useReferenceTime="true">
             <substitute key="modelName" value="${GFSmodel}" />
             <substitute key="TP" value="TP" />
             <substitute key="frameCount" value="41" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml" menuText="NAM12" id="nam12" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml"
+            menuText="NAM12" id="nam12" useReferenceTime="true">
             <substitute key="modelName" value="${NAM12model}" />
             <substitute key="TP" value="TP3hr" />
             <substitute key="frameCount" value="29" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml" menuText="NAM40" id="nam40" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml"
+            menuText="NAM40" id="nam40" useReferenceTime="true">
             <substitute key="modelName" value="${NAM40model}" />
             <substitute key="TP" value="TP3hr" />
             <substitute key="frameCount" value="21" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml" menuText="NAM80" id="nam80" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml"
-				<substitute key="modelName" value="NAM12"/>
+            menuText="NAM80" id="nam80" useReferenceTime="true">
+            <substitute key="modelName" value="ETA" />
             <substitute key="TP" value="TP6hr" />
             <substitute key="frameCount" value="15" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml" menuText="RAP13" id="rap13" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml"
+            menuText="RAP13" id="rap13" useReferenceTime="true">
             <substitute key="modelName" value="${RAP13model}" />
             <substitute key="TP" value="TP3hr" />
-				<substitute key="frameCount" value="19"/>
+            <substitute key="frameCount" value="22" />
         </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml" menuText="RAP" id="rap" useReferenceTime="true">
+        <contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml"
+            menuText="RAP" id="rap" useReferenceTime="true">
             <substitute key="modelName" value="${RAPmodel}" />
             <substitute key="TP" value="TP3hr" />
             <substitute key="frameCount" value="9" />

cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFamilies.xml

@@ -18,11 +18,21 @@
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
+    <!-- 
+        This is an absolute override file, indicating that a higher priority 
+        version of the file will completely replace a lower priority version
+        of the file. 
+    -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<contribute xsi:type="titleItem" titleText="------ Families ------"
+    <contribute xsi:type="titleItem" titleText="------ Families ------" id="FamiliesLine" />
-		id="FamiliesLine" />
+    <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml" menuText="DGEX"
-	<contribute xsi:type="bundleItem" file="bundles/volume/ECMWFHiRes.xml"
+        id="dgex" useReferenceTime="true">
-		menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
+        <substitute key="modelName" value="${DGEXmodel}" />
+        <substitute key="TP" value="TP" />
+        <substitute key="frameCount" value="18" />
+    </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/volume/ECMWFHiRes.xml" menuText="ECMWF-HiRes"
+        id="ecmwfHiRes" useReferenceTime="true">
         <substitute key="TP" value="TP" />
         <substitute key="frameCount" value="41" />
     </contribute>
@@ -43,98 +53,97 @@
         <substitute key="TP" value="TP"/>
         <substitute key="frameCount" value="17"/>
     </contribute> -->
-	<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml" menuText="GFS20"
-		menuText="GFS20" id="gfs20" useReferenceTime="true">
+        id="gfs20" useReferenceTime="true">
         <substitute key="modelName" value="GFS20" />
         <substitute key="TP" value="TP" />
         <substitute key="frameCount" value="55" />
     </contribute>
-	<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml" menuText="GFS"
-		menuText="GFS" id="gfs1deg" useReferenceTime="true">
+        id="gfs1deg" useReferenceTime="true">
         <substitute key="modelName" value="${GFSmodel}" />
         <substitute key="TP" value="TP" />
         <substitute key="frameCount" value="41" />
     </contribute>
-	<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml" menuText="${ARWmodel1}"
-		menuText="${ARWmodel1}" id="arwEast" useReferenceTime="true" suppressErrors="${ARWsuppress1;false}">
+        id="arwEast" useReferenceTime="true" suppressErrors="${ARWsuppress1;false}">
         <substitute key="modelName" value="${ARWmodel1}" />
         <substitute key="TP" value="TP" />
         <substitute key="frameCount" value="17" />
     </contribute>
-	<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml" menuText="${ARWmodel2}"
-		menuText="${ARWmodel2}" id="arwWest" useReferenceTime="true" suppressErrors="${ARWsuppress2;false}">
+        id="arwWest" useReferenceTime="true" suppressErrors="${ARWsuppress2;false}">
         <substitute key="modelName" value="${ARWmodel2}" />
         <substitute key="TP" value="TP" />
         <substitute key="frameCount" value="17" />
     </contribute>
-	<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml" menuText="${MMMmodel1}"
-		menuText="${MMMmodel1}" id="nmmEast" useReferenceTime="true" suppressErrors="${MMMsuppress1;false}">
+        id="nmmEast" useReferenceTime="true" suppressErrors="${MMMsuppress1;false}">
         <substitute key="modelName" value="${MMMmodel1}" />
         <substitute key="TP" value="TP" />
         <substitute key="frameCount" value="17" />
     </contribute>
-	<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml" menuText="${MMMmodel2}"
-		menuText="${MMMmodel2}" id="nmmWest" useReferenceTime="true" suppressErrors="${MMMsuppress2;false}">
+        id="nmmWest" useReferenceTime="true" suppressErrors="${MMMsuppress2;false}">
         <substitute key="modelName" value="${MMMmodel2}" />
         <substitute key="TP" value="TP" />
         <substitute key="frameCount" value="17" />
     </contribute>
-	<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml" menuText="HRRR"
-		menuText="HRRR" id="hrrr" useReferenceTime="true">
+        id="hrrr" useReferenceTime="true">
         <substitute key="modelName" value="HRRR" />
         <substitute key="TP" value="TP" />
-		<substitute key="frameCount" value="16"/>
+        <substitute key="frameCount" value="19" />
     </contribute>
-	<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml" menuText="LAPS"
-		menuText="LAPS" id="laps" useReferenceTime="true">
+        id="laps" useReferenceTime="true">
         <substitute key="modelName" value="LAPS" />
         <substitute key="TP" value="TP" />
         <substitute key="frameCount" value="6" />
     </contribute>
-	<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml" menuText="NAM12"
-		menuText="NAM12" id="nam12" useReferenceTime="true">
+        id="nam12" useReferenceTime="true">
         <substitute key="modelName" value="${NAM12model}" />
         <substitute key="TP" value="TP3hr" />
         <substitute key="frameCount" value="29" />
     </contribute>
-	<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml" menuText="NAM40"
-		menuText="NAM40" id="nam40" useReferenceTime="true">
+        id="nam40" useReferenceTime="true">
         <substitute key="modelName" value="${NAM40model}" />
         <substitute key="TP" value="TP3hr" />
         <substitute key="frameCount" value="29" />
     </contribute>
-	<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml" menuText="NAM80"
-		menuText="NAM80" id="nam80" useReferenceTime="true">
+        id="nam80" useReferenceTime="true">
-		<substitute key="modelName" value="NAM12"/>
+        <substitute key="modelName" value="ETA" />
         <substitute key="TP" value="TP6hr" />
         <substitute key="frameCount" value="15" />
     </contribute>
-	
         <!-- <contribute xsi:type="bundleItem" file="bundles/volume/DefaultMesoFamily.xml"
         menuText="${HRRRmodel}" id="hrrr" useReferenceTime="true">
         <substitute key="modelName" value="${HRRRmodel}"/>
-		<substitute key="frameCount" value="16"/>
+        <substitute key="frameCount" value="19"/>
     </contribute> -->
-	<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml" menuText="RAP13"
-		menuText="RAP13" id="rap13" useReferenceTime="true">
+        id="rap13" useReferenceTime="true">
         <substitute key="modelName" value="${RAP13model}" />
         <substitute key="TP" value="TP3hr" />
-		<substitute key="frameCount" value="19"/>
+        <substitute key="frameCount" value="22" />
     </contribute>
-	<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml" menuText="RAP40"
-		menuText="RAP40" id="rap" useReferenceTime="true">
+        id="rap" useReferenceTime="true">
         <substitute key="modelName" value="${RAPmodel}" />
         <substitute key="TP" value="TP3hr" />
         <substitute key="frameCount" value="9" />
     </contribute>
-		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml" menuText="SREF"
-		menuText="SREF" id="sref212" useReferenceTime="true">
+        id="sref212" useReferenceTime="true">
         <substitute key="modelName" value="${SREFmodel}" />
         <substitute key="TP" value="TP3hr" />
         <substitute key="frameCount" value="30" />
     </contribute>
-	<contribute xsi:type="bundleItem" file="bundles/volume/UKMET.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/UKMET.xml" menuText="UKMET"
-		menuText="UKMET" id="ukmet" useReferenceTime="true">
+        id="ukmet" useReferenceTime="true">
         <substitute key="TP" value="TP6hr" />
         <substitute key="frameCount" value="15" />
     </contribute>

cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFourPanelFamilies.xml

@@ -18,6 +18,11 @@
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
+    <!-- 
+        This is an absolute override file, indicating that a higher priority 
+        version of the file will completely replace a lower priority version
+        of the file. 
+    -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <!-- <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
         menuText="GEM-NHem" id="canadian-nh" useReferenceTime="true">
@@ -31,6 +36,12 @@
         <substitute key="TP" value="TP"/>
         <substitute key="frameCount" value="17"/>
     </contribute> -->
+    <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
+        menuText="DGEX" id="dgex4panel" useReferenceTime="true">
+        <substitute key="modelName" value="${DGEXmodel}" />
+        <substitute key="TP" value="TP6hr" />
+        <substitute key="frameCount" value="18" />
+    </contribute>
     <contribute xsi:type="bundleItem" file="bundles/volume/ECMWFHiResFourPanel.xml"
         menuText="ECMWF-HiRes" id="ecmwf4panel" useReferenceTime="true">
         <substitute key="frameCount" value="41" />
@@ -61,7 +72,7 @@
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
         menuText="NAM80" id="nam804panel" useReferenceTime="true">
-			<substitute key="modelName" value="NAM12"/>
+        <substitute key="modelName" value="ETA" />
         <substitute key="TP" value="TP6hr" />
         <substitute key="frameCount" value="15" />
     </contribute>
@@ -69,7 +80,7 @@
         menuText="RAP13" id="rap134panel" useReferenceTime="true">
         <substitute key="modelName" value="${RAP13model}" />
         <substitute key="TP" value="TP3hr" />
-			<substitute key="frameCount" value="19"/>
+        <substitute key="frameCount" value="22" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
         menuText="RAP" id="rap4panel" useReferenceTime="true">
@@ -77,8 +88,8 @@
         <substitute key="TP" value="TP3hr" />
         <substitute key="frameCount" value="9" />
     </contribute>
-		<contribute xsi:type="bundleItem" file="bundles/volume/UKMETFourPanel.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/UKMETFourPanel.xml" menuText="UKMET"
-			menuText="UKMET" id="ukmet4panel" useReferenceTime="true">
+        id="ukmet4panel" useReferenceTime="true">
         <substitute key="modelName" value="UKMET-NorthernHemisphere" />
         <substitute key="TP" value="TP6hr" />
         <substitute key="frameCount" value="15" />

cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseStdEnvPackage.xml

@@ -18,6 +18,11 @@
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
+    <!-- 
+        This is an absolute override file, indicating that a higher priority 
+        version of the file will completely replace a lower priority version
+        of the file. 
+    -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
         menuText="LAPS" id="lapsstdenv" useReferenceTime="true">
@@ -46,5 +51,4 @@
     <contribute xsi:type="bundleItem" file="bundles/volume/RaobStdEnv.xml"
         menuText="RaobOA" id="raoboastdenv" useReferenceTime="true">
     </contribute>
-	
 </menuTemplate>

cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseSurfaceFamilies.xml

@@ -18,6 +18,11 @@
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
+    <!-- 
+        This is an absolute override file, indicating that a higher priority 
+        version of the file will completely replace a lower priority version
+        of the file. 
+    -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
         <contribute xsi:type="bundleItem" file="bundles/volume/DefaultSurface.xml"
             menuText="ECMWF-HiRes" id="ecmwf" useReferenceTime="true">
@@ -59,13 +64,13 @@
             menuText="HRRR" id="HRRR" useReferenceTime="true">
             <substitute key="modelName" value="HRRR"/>
             <substitute key="TP" value="TP"/>
-			<substitute key="frameCount" value="16"/>
+            <substitute key="frameCount" value="19"/>
         </contribute>
 <!--    <contribute xsi:type="bundleItem" file="bundles/volume/DefaultSurface.xml"
             menuText="${HRRRmodel}" id="${HRRRmodel}" useReferenceTime="true">
             <substitute key="modelName" value="${HRRRmodel}"/>
             <substitute key="TP" value="TP"/>
-			<substitute key="frameCount" value="15"/>
+            <substitute key="frameCount" value="19"/>
         </contribute> -->
         <contribute xsi:type="bundleItem" file="bundles/volume/DefaultSurface.xml"
                     menuText="LAPS" id="laps" useReferenceTime="true">
@@ -95,7 +100,7 @@
             menuText="RAP13" id="rap13surface" useReferenceTime="true">
             <substitute key="modelName" value="${RAP13model}"/>
             <substitute key="TP" value="TP3hr"/>
-			<substitute key="frameCount" value="18"/>
+            <substitute key="frameCount" value="22"/>
         </contribute>
         <contribute xsi:type="bundleItem" file="bundles/volume/DefaultSurface.xml"
             menuText="RAP" id="rapsurface" useReferenceTime="true">

cave/com.raytheon.viz.volumebrowser/localization/menus/volume/hailFamily.xml

@@ -18,56 +18,61 @@
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
+    <!-- 
+        This is an absolute override file, indicating that a higher priority 
+        version of the file will completely replace a lower priority version
+        of the file. 
+    -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-		<contribute xsi:type="bundleItem" file="bundles/volume/HailFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/HailFamily.xml" menuText="ECMWF-HiRes"
-				menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
+        id="ecmwfHiRes" useReferenceTime="true">
         <substitute key="TP" value="TP" />
         <substitute key="frameCount" value="41" />
     </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/HailFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/HailFamily.xml" menuText="GFS20"
-				menuText="GFS20" id="gfs20" useReferenceTime="true">
+        id="gfs20" useReferenceTime="true">
         <substitute key="modelName" value="GFS20" />
         <substitute key="TP" value="TP" />
         <substitute key="frameCount" value="55" />
     </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/HailFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/HailFamily.xml" menuText="GFS"
-				menuText="GFS" id="gfs1deg" useReferenceTime="true">
+        id="gfs1deg" useReferenceTime="true">
         <substitute key="modelName" value="${GFSmodel}" />
         <substitute key="TP" value="TP" />
         <substitute key="frameCount" value="41" />
     </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/HailFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/HailFamily.xml" menuText="NAM12"
-				menuText="NAM12" id="nam12" useReferenceTime="true">
+        id="nam12" useReferenceTime="true">
         <substitute key="modelName" value="${NAM12model}" />
         <substitute key="TP" value="TP3hr" />
         <substitute key="frameCount" value="29" />
     </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/HailFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/HailFamily.xml" menuText="NAM40"
-				menuText="NAM40" id="nam40" useReferenceTime="true">
+        id="nam40" useReferenceTime="true">
         <substitute key="modelName" value="${NAM40model}" />
         <substitute key="TP" value="TP3hr" />
         <substitute key="frameCount" value="29" />
     </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/HailFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/HailFamily.xml" menuText="NAM80"
-				menuText="NAM80" id="nam80" useReferenceTime="true">
+        id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="NAM12"/>
+        <substitute key="modelName" value="ETA" />
         <substitute key="TP" value="TP6hr" />
         <substitute key="frameCount" value="15" />
     </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/HailFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/HailFamily.xml" menuText="RAP13"
-				menuText="RAP13" id="rap13" useReferenceTime="true">
+        id="rap13" useReferenceTime="true">
         <substitute key="modelName" value="${RAP13model}" />
         <substitute key="TP" value="TP3hr" />
-				<substitute key="frameCount" value="19"/>
+        <substitute key="frameCount" value="22" />
     </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/HailFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/HailFamily.xml" menuText="RAP"
-				menuText="RAP" id="rap" useReferenceTime="true">
+        id="rap" useReferenceTime="true">
         <substitute key="modelName" value="${RAPmodel}" />
         <substitute key="TP" value="TP3hr" />
         <substitute key="frameCount" value="9" />
     </contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/HailFamily.xml"
+    <contribute xsi:type="bundleItem" file="bundles/volume/HailFamily.xml" menuText="UKMET"
-				menuText="UKMET" id="ukmet" useReferenceTime="true">
+        id="ukmet" useReferenceTime="true">
         <substitute key="TP" value="TP6hr" />
         <substitute key="frameCount" value="15" />
     </contribute>

cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml

@@ -18,7 +18,13 @@
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
+    <!-- 
+        This is an absolute override file, indicating that a higher priority 
+        version of the file will completely replace a lower priority version
+        of the file. 
+    -->
 <menuContributionFile>
+    <substitute key="DGEXmodel" value="DGEX" />
     <substitute key="GFSmodel" value="GFS229" />
     <substitute key="NAM12model" value="NAM12" />
     <substitute key="NAM40model" value="NAM40" />
@@ -28,30 +34,52 @@
     <substitute key="MMMmodel2" value="HiResW-NMM-West" />
     <substitute key="RAP13model" value="RAP13" />
     <substitute key="RAPmodel" value="RAP40" />
-	<substitute key="SREFmodel" value="SREF40" />
+    <substitute key="SREFmodel" value="SREF212" />
-	
+<!--     <substitute key="HRRRmodel" value="HRRR-CR" />
-    <include installTo="menu:volume?after=VolumeBundles" 
+    <substitute key="GEMNHmodel" value="Canadian-NH" />
-             fileName="menus/volume/baseFamilies.xml">
+    <substitute key="GEMRegmodel" value="Canadian-Reg" />
+    <substitute key="ARXLAPSmodel" value="ARXLAPS" />
+    <substitute key="HRRRmodel" value="HRRR-CR" />
+    <substitute key="NAMNestmodel" value="CR-NAMNest" /> -->
+<!-- #
+# Configuration area for bundles that call radar mosaics. Replace the radar1-12 variables below
+# with radars that build your mosaic. 
+# -->
+<!--     <substitute key="radar1" value="karx" />
+        <substitute key="radar2" value="kmpx"/>
+        <substitute key="radar3" value="kdlh"/>
+        <substitute key="radar4" value="kgrb"/>
+        <substitute key="radar5" value="kmkx"/>
+        <substitute key="radar6" value="kabr"/>
+        <substitute key="radar7" value="kfsd"/>
+        <substitute key="radar8" value="kdvn"/>
+        <substitute key="radar9" value="kdmx"/>
+        <substitute key="radar10" value="kabr"/>
+           <substitute key="radar11" value="koax"/>
+        <substitute key="radar12" value="kmvx"/> -->
+<!-- #
+# Configure the color map/table for the mosaic radar reflectivity
+# -->
+<!--     <substitute key="localReflectivityColorMap" value="Radar/Ref/ARX-Radar-Mosaic-clear"/> -->
+<!-- # end config section         -->
+    <include installTo="menu:volume?after=VolumeBundles" fileName="menus/volume/baseFamilies.xml">
     </include>
-
+    <include subMenu="4-PanelFamilies" installTo="menu:volume" fileName="menus/volume/baseFourPanelFamilies.xml">
-   <include subMenu="4-PanelFamilies" installTo="menu:volume" 
-             fileName="menus/volume/baseFourPanelFamilies.xml">
     </include>
+ <!--    <include subMenu="Aviation: Model Family" installTo="menu:volume" 
+             fileName="menus/volume/aviationFamily.xml">
+    </include> -->
     
-    <include subMenu="Convect Families" installTo="menu:volume" 
+<!--     Have placed the architecture for Comparisons, but they are not live, could not test them. db -->
-             fileName="menus/volume/ConvectModelFamilies.xml">
+<!--     <include subMenu="Comparison Families" installTo="menu:volume" 
+             fileName="menus/volume/baseComparisonFamilies.xml">
+    </include>  -->
+    <include subMenu="Convect Families" installTo="menu:volume" fileName="menus/volume/ConvectModelFamilies.xml">
     </include>
- 
+    <include subMenu="Surface Families" installTo="menu:volume" fileName="menus/volume/baseSurfaceFamilies.xml">
-    <include subMenu="Surface Families" installTo="menu:volume" 
-             fileName="menus/volume/baseSurfaceFamilies.xml">
     </include>
-     <include subMenu="Winter Families" installTo="menu:volume" 
+    <include subMenu="Winter Families" installTo="menu:volume" fileName="menus/volume/WinterModelFamilies.xml">
-             fileName="menus/volume/WinterModelFamilies.xml">
     </include>
-
+    <include subMenu="Standard Env Package" installTo="menu:volume" fileName="menus/volume/baseStdEnvPackage.xml">
-    <include subMenu="Standard Env Package" installTo="menu:volume" 
-             fileName="menus/volume/baseStdEnvPackage.xml">
     </include>
-    
-
 </menuContributionFile>

cave/com.raytheon.viz.volumebrowser/plugin.xml

@@ -56,6 +56,13 @@
           application="D2D"
           localizationType="CAVE_STATIC,COMMON_STATIC"
           name="Volume Browser"
+          value="volumebrowser"
+          recursive="true">
+       </path>
+       <path
+          application="D2D"
+          localizationType="COMMON_STATIC"
+          name="Volume Browser Level Mappings"
           value="level/mappings"
           recursive="true">
        </path>
@@ -70,10 +77,10 @@
     <extension
          point="org.eclipse.ui.menus">
       <menuContribution
-            locationURI="menu:volume?after=top">
+            locationURI="menu:models?after=top">
              <command
                    commandId="com.raytheon.viz.volumebrowser.volumeBrowserRef"
-                   label="Browser...">
+                   label="Volume Browser">
              </command>
              <separator name="afterVB" visible="false"/>
              <separator name="VolumeBundles" visible="true"/>
@@ -81,6 +88,13 @@
              <separator name="SurfaceFamilies" visible="false"/>
              <separator name="StdEnvDataPackageFamilies" visible="true"/>
       </menuContribution>
+      <menuContribution
+            locationURI="menu:tools">
+             <command
+                   commandId="com.raytheon.viz.volumebrowser.volumeBrowserRef"
+                   label="Volume Browser">
+             </command>
+      </menuContribution>
     </extension>
     <extension
         point="com.raytheon.uf.viz.ui.menus.contribItemProvider">

cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/GridAlterBundleContributor.java

@@ -26,7 +26,6 @@ import java.util.List;
 import java.util.Map;
 
 import com.raytheon.uf.common.dataplugin.grid.GridConstants;
-import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfoLookup;
 import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
 import com.raytheon.uf.common.menus.vb.VbSource;
 import com.raytheon.uf.common.menus.vb.VbSourceList;
@@ -103,18 +102,14 @@ public class GridAlterBundleContributor extends AlterBundleContributorAdapter {
         if (selectedString != null) {
             reqMap.put(GridConstants.DATASET_ID, new RequestConstraint(
                     selectedString));
-            DatasetInfoLookup lookup = DatasetInfoLookup.getInstance();
 
             // next, need to modify for other displays (not plan view)
             if (data instanceof VarHeightResourceData) {
-                ((VarHeightResourceData) data).setSource(lookup.getInfo(
+                ((VarHeightResourceData) data).setSource(selectedString);
-                        selectedString).getTitle());
             } else if (data instanceof TimeSeriesResourceData) {
-                ((TimeSeriesResourceData) data).setSource(lookup.getInfo(
+                ((TimeSeriesResourceData) data).setSource(selectedString);
-                        selectedString).getTitle());
             } else if (data instanceof CrossSectionResourceData) {
-                ((CrossSectionResourceData) data).setSource(lookup.getInfo(
+                ((CrossSectionResourceData) data).setSource(selectedString);
-                        selectedString).getTitle());
             }
         }
     }

cave/com.raytheon.viz.warngen/localization/bundles/maps/warngenExtensionArea.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#f08080" />
-                            <capability xsi:type="shadeableCapability"
-                                opacity="0.4" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="true" isHoverOn="false"
-                        isVisible="true">
-                        <pdProps maxDisplayWidth="100000000"
-                            minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="genericToolsResourceData">
-                        <name>WarnGen Extension Area</name>
-                        <classT>com.raytheon.viz.warngen.gui.WarngenExtensionAreaLayer</classT>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.warngen/localization/bundles/maps/warngenloc.xml

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#9b9b9b" />
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="pointCapability"
-                                pointStyle="NONE" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="true" isHoverOn="false"
-                        isVisible="true">
-                        <pdProps maxDisplayWidth="100000000"
-                            minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="dbMapResourceData">
-                        <table>mapdata.warngenloc</table>
-                        <mapName>WarnGenLoc</mapName>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.warnings/localization/bundles/AllCWASPS.xml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#bbbbbb" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="cwaspsResourceData"
-                        isUpdatingOnMetadataOnly="false" retrieveData="true"
-                        isRequeryNecessaryOnTimeMatch="false" name="National Sig Wx Advisories (SPS)"
-                        hideSampling="true">
-                        <metadataMap>
-                            <mapping key="pil">
-                                <constraint constraintValue="SPS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.warnings/localization/bundles/AllLocalWarnings.xml

@@ -1,325 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        isRequeryNecessaryOnTimeMatch="true" retrieveData="false" name="All Local Warnings"
-                        hideSampling="true">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW,FFW,FLW,FLY,SVR,TOR,EWW,SVS,EWS,FFS,FLS,SQW,DSW"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W,FF.W,FA.W,FA.Y,SV.W,TO.W,EW.W,SQ.W,DS.W,DS.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Local SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Local TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Local EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Local Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Local Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Local Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Local Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLY,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Local Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.warnings/localization/bundles/AllMarineWarnings.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="d2DMapRenderableDisplay"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="false" isHoverOn="false"
-                        isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData"
-                        isUpdatingOnMetadataOnly="false" retrieveData="false"
-                        isRequeryNecessaryOnTimeMatch="true"
-                        name="National Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.warnings/localization/bundles/AllNationalWarnings.xml

@@ -1,358 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="All National Warnings"
-                        hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW,FFW,FLW,FLY,SVR,TOR,EWW,SVS,EWS,FFS,FLS,SQW,DSW"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W,FF.W,FA.W,FA.Y,SV.W,TO.W,EW.W,FL.W,FL.Y,SQ.W,DS.W,DS.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="All SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="All TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="All EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="All Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="All Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="All Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="All Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-AR.xml

@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Alaska Region Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW,FFW,FLW,FLY,SVR,TOR,EWW,SVS,EWS,FFS,FLS,SQW,DSW"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W,FF.W,FA.W,FA.Y,SV.W,TO.W,EW.W,FL.W,FL.Y,SQ.W,DS.W,DS.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Alaska Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-CR.xml

@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Central Region Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW,FFW,FLW,FLY,SVR,TOR,EWW,SVS,EWS,FFS,FLS,SQW,DSW"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W,FF.W,FA.W,FA.Y,SV.W,TO.W,EW.W,FL.W,FL.Y,SQ.W,DS.W,DS.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Central Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-ER.xml

@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Eastern Region Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW,FFW,FLW,FLY,SVR,TOR,EWW,SVS,EWS,FFS,FLS,SQW,DSW"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W,FF.W,FA.W,FA.Y,SV.W,TO.W,EW.W,FL.W,FL.Y,SQ.W,DS.W,DS.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Regon Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Eastern Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-PR.xml

@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Pacific Region Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW,FFW,FLW,FLY,SVR,TOR,EWW,SVS,EWS,FFS,FLS,SQW,DSW"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W,FF.W,FA.W,FA.Y,SV.W,TO.W,EW.W,FL.W,FL.Y,SQ.W,DS.W,DS.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Pacific Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-SR.xml

@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Southern Region Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW,FFW,FLW,FLY,SVR,TOR,EWW,SVS,EWS,FFS,FLS,SQW,DSW"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W,FF.W,FA.W,FA.Y,SV.W,TO.W,EW.W,FL.W,FL.Y,SQ.W,DS.W,DS.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Southern Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-WR.xml

@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Western Region Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW,FFW,FLW,FLY,SVR,TOR,EWW,SVS,EWS,FFS,FLS,SQW,DSW"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W,FF.W,FA.W,FA.Y,SV.W,TO.W,EW.W,FL.W,FL.Y,SQ.W,DS.W,DS.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Western Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>

cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings.xml

@@ -1,374 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        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 is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Local &amp; Regional Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW,FFW,FLW,FLY,SVR,TOR,EWW,SVS,EWS,FFS,FLS,SQW,DSW"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W,FF.W,FA.W,FA.Y,SV.W,TO.W,EW.W,FL.W,FL.Y,SQ.W,DS.W,DS.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Local &amp; Regional SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Local &amp; Regional TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Local &amp; Regional EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Local &amp; Regional Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Local &amp; Regional Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Local &amp; Regional Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Local &amp; Regional River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Local &amp; Regional Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="All Local &amp; Regional Localized Extreme Weather Events">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>