From 281566e5425409d45024065e1ba370ca7b3fb308 Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Thu, 3 Jul 2014 19:38:29 -0600 Subject: [PATCH] cave.sh default perspective changed to NCP.ini Former-commit-id: 5572d87d6fee80a2d66ccd2512742b010977cc4e --- cave/build/static/linux/cave/cave.sh | 3 ++- .../ResourceDefns/RADAR/FNEXRAD/FNEXRAD.xml | 2 +- .../ResourceDefns/RADAR/NEXRCOMP/DHR.attr | 8 ------ .../ResourceDefns/RADAR/NEXRCOMP/DVL.attr | 8 ------ .../ResourceDefns/RADAR/NEXRCOMP/EET.attr | 8 ------ .../ResourceDefns/RADAR/NEXRCOMP/HHC.attr | 8 ------ .../ResourceDefns/RADAR/NEXRCOMP/N0R.attr | 8 ------ .../ResourceDefns/RADAR/NEXRCOMP/N1P.attr | 8 ------ .../ResourceDefns/RADAR/NEXRCOMP/NEXRCOMP.xml | 25 ------------------- .../ResourceDefns/RADAR/NEXRCOMP/NTP.attr | 8 ------ .../Arctic Composite.xml} | 0 .../{Arctic => Arctic Composite}/IR.attr | 0 .../{Arctic => Arctic Composite}/IR2.attr | 0 .../{Arctic => Arctic Composite}/VIS.attr | 0 .../{Arctic => Arctic Composite}/WV.attr | 0 .../GINI_Miscellaneous.xml | 0 .../NORMAL_TPW_PERCENT.attr | 0 .../SND_PRECIP_WATER.attr | 0 .../GOES 13 - GINI.xml} | 0 .../{GINI_GOES13 => GOES 13 - GINI}/IR.attr | 0 .../{GINI_GOES13 => GOES 13 - GINI}/IR13.attr | 0 .../SND_11.03.attr | 0 .../SND_14.06.attr | 0 .../SND_3.98.attr | 0 .../SND_4.45.attr | 0 .../SND_6.51.attr | 0 .../SND_7.02.attr | 0 .../SND_7.43.attr | 0 .../SND_VIS.attr | 0 .../{GINI_GOES13 => GOES 13 - GINI}/VIS.attr | 0 .../{GINI_GOES13 => GOES 13 - GINI}/WV.attr | 0 .../default.attr | 0 .../GOES 13 - McIDAS.xml} | 0 .../{GOES13 => GOES 13 - McIDAS}/IR.attr | 0 .../{GOES13 => GOES 13 - McIDAS}/IR2.attr | 0 .../{GOES13 => GOES 13 - McIDAS}/VIS.attr | 0 .../{GOES13 => GOES 13 - McIDAS}/WV.attr | 0 .../GOES 15 - GINI.xml} | 0 .../{GINI_GOES15 => GOES 15 - GINI}/IR.attr | 0 .../{GINI_GOES15 => GOES 15 - GINI}/IR13.attr | 0 .../SND_11.03.attr | 0 .../SND_14.06.attr | 0 .../SND_3.98.attr | 0 .../SND_4.45.attr | 0 .../SND_6.51.attr | 0 .../SND_7.02.attr | 0 .../SND_7.43.attr | 0 .../SND_VIS.attr | 0 .../{GINI_GOES15 => GOES 15 - GINI}/VIS.attr | 0 .../{GINI_GOES15 => GOES 15 - GINI}/WV.attr | 0 .../default.attr | 0 .../GOES 15 - McIDAS.xml} | 0 .../{GOES15 => GOES 15 - McIDAS}/IR.attr | 0 .../{GOES15 => GOES 15 - McIDAS}/IR2.attr | 0 .../{GOES15 => GOES 15 - McIDAS}/VIS.attr | 0 .../{GOES15 => GOES 15 - McIDAS}/WV.attr | 0 .../GINI_GOES12.xml => LCI East/LCI East.xml} | 0 .../LOW_CLOUD_IMG.attr | 0 .../GINI_GOES11.xml => LCI West/LCI West.xml} | 0 .../LOW_CLOUD_IMG.attr | 0 .../POES-NPOESS.xml} | 0 .../RAIN_RATE.attr | 0 62 files changed, 3 insertions(+), 83 deletions(-) delete mode 100644 ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/DHR.attr delete mode 100644 ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/DVL.attr delete mode 100644 ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/EET.attr delete mode 100644 ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/HHC.attr delete mode 100644 ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/N0R.attr delete mode 100644 ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/N1P.attr delete mode 100644 ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/NEXRCOMP.xml delete mode 100644 ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/NTP.attr rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{Arctic/Arctic.xml => Arctic Composite/Arctic Composite.xml} (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{Arctic => Arctic Composite}/IR.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{Arctic => Arctic Composite}/IR2.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{Arctic => Arctic Composite}/VIS.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{Arctic => Arctic Composite}/WV.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_Precip => GINI_Miscellaneous}/GINI_Miscellaneous.xml (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_Precip => GINI_Miscellaneous}/NORMAL_TPW_PERCENT.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_Precip => GINI_Miscellaneous}/SND_PRECIP_WATER.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES13/GINI_GOES13.xml => GOES 13 - GINI/GOES 13 - GINI.xml} (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES13 => GOES 13 - GINI}/IR.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES13 => GOES 13 - GINI}/IR13.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES13 => GOES 13 - GINI}/SND_11.03.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES13 => GOES 13 - GINI}/SND_14.06.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES13 => GOES 13 - GINI}/SND_3.98.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES13 => GOES 13 - GINI}/SND_4.45.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES13 => GOES 13 - GINI}/SND_6.51.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES13 => GOES 13 - GINI}/SND_7.02.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES13 => GOES 13 - GINI}/SND_7.43.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES13 => GOES 13 - GINI}/SND_VIS.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES13 => GOES 13 - GINI}/VIS.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES13 => GOES 13 - GINI}/WV.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES13 => GOES 13 - GINI}/default.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GOES13/GOES13.xml => GOES 13 - McIDAS/GOES 13 - McIDAS.xml} (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GOES13 => GOES 13 - McIDAS}/IR.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GOES13 => GOES 13 - McIDAS}/IR2.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GOES13 => GOES 13 - McIDAS}/VIS.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GOES13 => GOES 13 - McIDAS}/WV.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES15/GINI_GOES15.xml => GOES 15 - GINI/GOES 15 - GINI.xml} (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES15 => GOES 15 - GINI}/IR.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES15 => GOES 15 - GINI}/IR13.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES15 => GOES 15 - GINI}/SND_11.03.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES15 => GOES 15 - GINI}/SND_14.06.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES15 => GOES 15 - GINI}/SND_3.98.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES15 => GOES 15 - GINI}/SND_4.45.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES15 => GOES 15 - GINI}/SND_6.51.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES15 => GOES 15 - GINI}/SND_7.02.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES15 => GOES 15 - GINI}/SND_7.43.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES15 => GOES 15 - GINI}/SND_VIS.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES15 => GOES 15 - GINI}/VIS.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES15 => GOES 15 - GINI}/WV.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES15 => GOES 15 - GINI}/default.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GOES15/GOES15.xml => GOES 15 - McIDAS/GOES 15 - McIDAS.xml} (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GOES15 => GOES 15 - McIDAS}/IR.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GOES15 => GOES 15 - McIDAS}/IR2.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GOES15 => GOES 15 - McIDAS}/VIS.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GOES15 => GOES 15 - McIDAS}/WV.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES12/GINI_GOES12.xml => LCI East/LCI East.xml} (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES11 => LCI East}/LOW_CLOUD_IMG.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES11/GINI_GOES11.xml => LCI West/LCI West.xml} (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_GOES12 => LCI West}/LOW_CLOUD_IMG.attr (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_POES-NPOESS/GINI_POES-NPOESS.xml => POES-NPOESS/POES-NPOESS.xml} (100%) rename ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/{GINI_POES-NPOESS => POES-NPOESS}/RAIN_RATE.attr (100%) diff --git a/cave/build/static/linux/cave/cave.sh b/cave/build/static/linux/cave/cave.sh index e237b0be79..30d2e39713 100644 --- a/cave/build/static/linux/cave/cave.sh +++ b/cave/build/static/linux/cave/cave.sh @@ -129,7 +129,8 @@ if [[ -z $IGNORE_NUM_CAVES ]]; then lookupINI "$@" launcherRegex='--launcher.ini\s(.+\.ini)' # default to cave.ini - targetIni="/awips2/cave/cave.ini" + # targetIni="/awips2/cave/cave.ini" + targetIni="/awips2/cave/NCP.ini" if [[ $CAVE_INI_ARG =~ $launcherRegex ]] then targetIni="${BASH_REMATCH[1]}" diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/FNEXRAD/FNEXRAD.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/FNEXRAD/FNEXRAD.xml index 63078edbfb..835efd3586 100644 --- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/FNEXRAD/FNEXRAD.xml +++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/FNEXRAD/FNEXRAD.xml @@ -1,6 +1,6 @@ - FNEXRAD + NEXRCOMP SATELLITE GiniSatellite sectorID diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/DHR.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/DHR.attr deleted file mode 100644 index eca32eb472..0000000000 --- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/DHR.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=DHR -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=DHR -displayUnitStr=dBZ -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/DVL.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/DVL.attr deleted file mode 100644 index c2db8d8255..0000000000 --- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/DVL.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=DVL -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=DVL -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/EET.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/EET.attr deleted file mode 100644 index 0fcc84552c..0000000000 --- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/EET.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=EET -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=EET -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/HHC.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/HHC.attr deleted file mode 100644 index 1e4b4559ea..0000000000 --- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/HHC.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=HHC NEXRCOMP -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=HHC -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/N0R.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/N0R.attr deleted file mode 100644 index 6a91f90dab..0000000000 --- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/N0R.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=nids_ref16 -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=N0R -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/N1P.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/N1P.attr deleted file mode 100644 index b137d76880..0000000000 --- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/N1P.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=OHA -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=N1P -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/NEXRCOMP.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/NEXRCOMP.xml deleted file mode 100644 index 835efd3586..0000000000 --- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/NEXRCOMP.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - NEXRCOMP - SATELLITE - GiniSatellite - sectorID - - CLOSEST_BEFORE_OR_AFTER - 5 - USE_DATA_TIMES - 20 - 1 - DETERMINE_BY_RSC_CATEGORY - BasicWX_US - -legendColor=RGB {200, 200, 200} -pluginName=satellite -satelliteName=NEXRCOMP -! satellite DB table valid values are -! This must match the "creatingEntity" in the - - - true - false - diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/NTP.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/NTP.attr deleted file mode 100644 index 7d2d6187ed..0000000000 --- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/NTP.attr +++ /dev/null @@ -1,8 +0,0 @@ -colorMapName=OHA -colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml -! The DB values have spaces but imageType must use " "s. -imageType=NTP -displayUnitStr=IRPixel -alpha=1.0 -brightness=1.0 -contrast=1.0 diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic/Arctic.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic Composite/Arctic Composite.xml similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic/Arctic.xml rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic Composite/Arctic Composite.xml diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic/IR.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic Composite/IR.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic/IR.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic Composite/IR.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic/IR2.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic Composite/IR2.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic/IR2.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic Composite/IR2.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic/VIS.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic Composite/VIS.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic/VIS.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic Composite/VIS.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic/WV.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic Composite/WV.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic/WV.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic Composite/WV.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Precip/GINI_Miscellaneous.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/GINI_Miscellaneous.xml similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Precip/GINI_Miscellaneous.xml rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/GINI_Miscellaneous.xml diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Precip/NORMAL_TPW_PERCENT.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/NORMAL_TPW_PERCENT.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Precip/NORMAL_TPW_PERCENT.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/NORMAL_TPW_PERCENT.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Precip/SND_PRECIP_WATER.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_PRECIP_WATER.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Precip/SND_PRECIP_WATER.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_PRECIP_WATER.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/GINI_GOES13.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/GOES 13 - GINI.xml similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/GINI_GOES13.xml rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/GOES 13 - GINI.xml diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/IR.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/IR.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/IR.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/IR.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/IR13.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/IR13.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/IR13.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/IR13.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_11.03.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_11.03.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_11.03.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_11.03.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_14.06.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_14.06.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_14.06.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_14.06.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_3.98.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_3.98.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_3.98.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_3.98.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_4.45.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_4.45.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_4.45.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_4.45.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_6.51.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_6.51.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_6.51.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_6.51.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_7.02.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_7.02.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_7.02.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_7.02.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_7.43.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_7.43.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_7.43.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_7.43.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_VIS.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_VIS.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_VIS.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_VIS.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/VIS.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/VIS.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/VIS.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/VIS.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/WV.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/WV.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/WV.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/WV.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/default.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/default.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/default.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/default.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES13/GOES13.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - McIDAS/GOES 13 - McIDAS.xml similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES13/GOES13.xml rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - McIDAS/GOES 13 - McIDAS.xml diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES13/IR.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - McIDAS/IR.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES13/IR.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - McIDAS/IR.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES13/IR2.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - McIDAS/IR2.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES13/IR2.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - McIDAS/IR2.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES13/VIS.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - McIDAS/VIS.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES13/VIS.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - McIDAS/VIS.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES13/WV.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - McIDAS/WV.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES13/WV.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - McIDAS/WV.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/GINI_GOES15.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/GOES 15 - GINI.xml similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/GINI_GOES15.xml rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/GOES 15 - GINI.xml diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/IR.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/IR.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/IR.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/IR.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/IR13.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/IR13.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/IR13.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/IR13.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_11.03.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_11.03.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_11.03.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_11.03.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_14.06.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_14.06.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_14.06.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_14.06.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_3.98.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_3.98.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_3.98.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_3.98.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_4.45.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_4.45.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_4.45.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_4.45.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_6.51.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_6.51.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_6.51.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_6.51.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_7.02.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_7.02.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_7.02.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_7.02.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_7.43.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_7.43.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_7.43.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_7.43.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_VIS.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_VIS.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_VIS.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_VIS.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/VIS.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/VIS.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/VIS.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/VIS.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/WV.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/WV.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/WV.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/WV.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/default.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/default.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/default.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/default.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES15/GOES15.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - McIDAS/GOES 15 - McIDAS.xml similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES15/GOES15.xml rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - McIDAS/GOES 15 - McIDAS.xml diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES15/IR.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - McIDAS/IR.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES15/IR.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - McIDAS/IR.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES15/IR2.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - McIDAS/IR2.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES15/IR2.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - McIDAS/IR2.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES15/VIS.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - McIDAS/VIS.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES15/VIS.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - McIDAS/VIS.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES15/WV.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - McIDAS/WV.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES15/WV.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - McIDAS/WV.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES12/GINI_GOES12.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/LCI East/LCI East.xml similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES12/GINI_GOES12.xml rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/LCI East/LCI East.xml diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES11/LOW_CLOUD_IMG.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/LCI East/LOW_CLOUD_IMG.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES11/LOW_CLOUD_IMG.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/LCI East/LOW_CLOUD_IMG.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES11/GINI_GOES11.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/LCI West/LCI West.xml similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES11/GINI_GOES11.xml rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/LCI West/LCI West.xml diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES12/LOW_CLOUD_IMG.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/LCI West/LOW_CLOUD_IMG.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES12/LOW_CLOUD_IMG.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/LCI West/LOW_CLOUD_IMG.attr diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/GINI_POES-NPOESS.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/POES-NPOESS/POES-NPOESS.xml similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/GINI_POES-NPOESS.xml rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/POES-NPOESS/POES-NPOESS.xml diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/RAIN_RATE.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/POES-NPOESS/RAIN_RATE.attr similarity index 100% rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/RAIN_RATE.attr rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/POES-NPOESS/RAIN_RATE.attr