diff --git a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaic.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaic.xml index 26804da0b1..b90ac55674 100644 --- a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaic.xml +++ b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaic.xml @@ -24,6 +24,9 @@ + + + @@ -32,35 +35,42 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 diff --git a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicTwoPanel.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicTwoPanel.xml index 431b02e157..ae37074d5d 100644 --- a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicTwoPanel.xml +++ b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicTwoPanel.xml @@ -54,6 +54,9 @@ + + + @@ -62,33 +65,38 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -116,6 +124,9 @@ + + + @@ -124,33 +135,38 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicVILCompRefl.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicVILCompRefl.xml index efbf17dc5e..adcf639464 100644 --- a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicVILCompRefl.xml +++ b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicVILCompRefl.xml @@ -42,89 +42,106 @@ + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.radar/localization/menus/radar/baseLocalRadarMenu.xml b/cave/com.raytheon.viz.radar/localization/menus/radar/baseLocalRadarMenu.xml deleted file mode 100644 index db7a3457b8..0000000000 --- a/cave/com.raytheon.viz.radar/localization/menus/radar/baseLocalRadarMenu.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarMenu.xml b/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarMenu.xml index 07b801a277..f43d9a1936 100644 --- a/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarMenu.xml +++ b/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarMenu.xml @@ -121,7 +121,7 @@ - + @@ -129,4 +129,4 @@ - \ No newline at end of file + diff --git a/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/terminal/baseRadarTerminalBestResBaseProducts.xml b/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/terminal/baseRadarTerminalBestResBaseProducts.xml index 308b33923e..e07dfad19e 100644 --- a/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/terminal/baseRadarTerminalBestResBaseProducts.xml +++ b/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/terminal/baseRadarTerminalBestResBaseProducts.xml @@ -822,264 +822,160 @@ - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + diff --git a/edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfig.java b/edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfig.java index 565366b5f4..bf8e2d9584 100644 --- a/edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfig.java +++ b/edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfig.java @@ -32,21 +32,21 @@ import javax.xml.bind.annotation.XmlRootElement; * Archive data information for retention, purging and archiving. An example: * * 
- * <archive>
- *   <name>Raw</name>
- *   <rootDir>/data_store/</rootDir>
- *   <!-- default retention hours for a category. -->
- *   <defaultRetentionHours>168</defaultRetentionHours>
- *   <category>
- *     <name>Model grib</name>
+ * 
+ *   Raw
+ *   /data_store/
+ *   
+ *   168
+ *   
+ *     Model grib
  *     ...
- *   </category>
- *   <category>
- *     <name>Model grib2</name>
+ *   
+ *   
+ *     Model grib2
  *     ...
- *   </category>
+ *   
  *   ...
- * <archive>
+ * 
  *
* * 
diff --git a/edexOsgi/com.raytheon.uf.edex.archive/resources/com.raytheon.uf.edex.archive.cron.properties b/edexOsgi/com.raytheon.uf.edex.archive/resources/com.raytheon.uf.edex.archive.cron.properties
index 527c8f5746..8ae8911b5b 100644
--- a/edexOsgi/com.raytheon.uf.edex.archive/resources/com.raytheon.uf.edex.archive.cron.properties
+++ b/edexOsgi/com.raytheon.uf.edex.archive/resources/com.raytheon.uf.edex.archive.cron.properties
@@ -3,17 +3,17 @@ archive.enable=false
 # runs database and hdf5 archive for archive server to pull data from 
 archive.cron=0+40+*+*+*+?
 # path to store processed archive data
-archive.path=/awips2/archive
+archive.path=/awips2/edex/data/archive
 
 # enable archive purge
-archive.purge.enable=true
+archive.purge.enable=false
 # when to purge archives
 archive.purge.cron=0+5+0/2+*+*+?
 # compress database records
 archive.compression.enable=false
 
 # To change Default case directory.
-#archive.case.directory=/awips2/edex/data/archiver/
+archive.case.directory=/awips2/cave/cases
 
 # to disable a specific archive, use property archive.disable=pluginName,pluginName...
 #archive.disable=grid,text,acars
diff --git a/edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/useradmin/ArchiveCaseCreationAuthRequestHandler.java b/edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/useradmin/ArchiveCaseCreationAuthRequestHandler.java
index ee89215925..4da34d58d8 100644
--- a/edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/useradmin/ArchiveCaseCreationAuthRequestHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/useradmin/ArchiveCaseCreationAuthRequestHandler.java
@@ -45,7 +45,7 @@ public class ArchiveCaseCreationAuthRequestHandler extends
 
     private final String CASE_DIR_KEY = "archive.case.directory";
 
-    private final String CASE_DIR_DEFAULT = "/awips2/edex/data/archiver/";
+    private final String CASE_DIR_DEFAULT = "/awips2/edex/data/archive/cases";
 
     @Override
     public ArchiveAdminAuthRequest handleRequest(ArchiveAdminAuthRequest request)
diff --git a/edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml b/edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
index 7368f78c3e..f071cb3c66 100644
--- a/edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
+++ b/edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
@@ -1,23 +1,4 @@
 
-    
 
 
     Processed
-    /archive/
+    /awips2/edex/data/archive/
     168
-     
-        Decision Assistance
-         168
-         
-            (cwat|fog|ffmp|fssobs|preciprate|qpf|scan|vil)/.*(\d{4})-(\d{2})-(\d{2})-(\d{2}).*
+    
+        Radar
+        168
+        
+            radar/(.*)/(.*)/.*-(\d{4})-(\d{2})-(\d{2})-(\d{2})
             {1}
-            2,3,4,5
+            3,4,5,6
+        
+    
+    
+        Model
+        168
+        
+            (grid)/(.*)/(.*)/.*-(\d{4})-(\d{2})-(\d{2})-(\d{2})-.*
+            {2}
+            4,5,6,7
+        
+        
+            (modelsounding)/(.*)/.*/.*(\d{4})-(\d{2})-(\d{2})-(\d{2}).*
+            (bufrmos)(.*)/.*(\d{4})-(\d{2})-(\d{2})-(\d{2})
+            {1} - {2}
+            3,4,5,6
         
     
     
@@ -175,21 +171,6 @@
             2,3,4,5
         
     
-    
-        Model
-        168
-        
-            (grid)/(.*)/(.*)/.*-(\d{4})-(\d{2})-(\d{2})-(\d{2})-.*
-            {2}
-            4,5,6,7
-        
-        
-            (modelsounding)/(.*)/.*/.*(\d{4})-(\d{2})-(\d{2})-(\d{2}).*
-            (bufrmos)(.*)/.*(\d{4})-(\d{2})-(\d{2})-(\d{2})
-            {1} - {2}
-            3,4,5,6
-        
-    
     
         Products
         168
@@ -204,7 +185,7 @@
         Observation
         168
         
-            (acars|airep|binlightning|bufrascat|bufrhdw|bufrmthdw|bufrssmi|idft|lsr|obs|pirep|recco|svrwx)/.*-(\d{4})-(\d{2})-(\d{2})-(\d{2})
+            (acars|airep|binlightning|bufrhdw|bufrmthdw|bufrssmi|idft|lsr|obs|pirep|recco|svrwx)/.*-(\d{4})-(\d{2})-(\d{2})-(\d{2})
             (sfcobs)/.*/.*-(\d{4})-(\d{2})-(\d{2})-(\d{2})
             {1}
             2,3,4,5
@@ -235,13 +216,12 @@
         
     
     
-    
-        radar
-        168
-        
-            radar/(.*)/(.*)/.*-(\d{4})-(\d{2})-(\d{2})-(\d{2})
+        Decision Assistance
+         168
+         
+            (cwat|fog|ffmp|fssobs|preciprate|qpf|scan|vil)/.*(\d{4})-(\d{2})-(\d{2})-(\d{2}).*
             {1}
-            3,4,5,6
+            2,3,4,5
         
     
 
diff --git a/edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/roles/archiveAdminRoles.xml b/edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/roles/archiveAdminRoles.xml
index 6f8edb996f..a48075deb7 100644
--- a/edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/roles/archiveAdminRoles.xml
+++ b/edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/roles/archiveAdminRoles.xml
@@ -1,16 +1,20 @@
 
 
    Data Archiving
-   
    
       
          This permission allows the user to access Archive Retention.
        
    
-   
    
       
-         This permission allows the user to access Archive Case Creation. 
+         This permission allows the user to access Archive Case Creation.
        
    
-
\ No newline at end of file
+   
+
diff --git a/pythonPackages/pypies/pypies/impl/H5pyDataStore.py b/pythonPackages/pypies/pypies/impl/H5pyDataStore.py
index 355b06f43c..cc92c029a5 100644
--- a/pythonPackages/pypies/pypies/impl/H5pyDataStore.py
+++ b/pythonPackages/pypies/pypies/impl/H5pyDataStore.py
@@ -46,6 +46,7 @@
 #    Sep 14, 2015       4868       rjpeter        Updated writePartialHDFData to create the dataset if
 #                                                 it doesn't exist.
 #    Oct 20, 2015       4982       nabowle        Verify datatypes match when replacing data.
+#    Nov 30, 2016                  mjames@ucar    Change == None to is None (for numpy array).
 #
 
 import h5py, os, numpy, pypies, re, logging, shutil, time, types, traceback
@@ -162,7 +163,7 @@ class H5pyDataStore(IDataStore.IDataStore):
         recMaxDims = rec.getMaxSizes()
         for i in range(nDims):
             szDims1[i] = szDims[nDims - i - 1]
-            if recMaxDims == None or recMaxDims[i] == 0:
+            if recMaxDims is None or recMaxDims[i] == 0:
                 maxDims[i] = None
             else:
                 maxDims[i] = recMaxDims[i]