From 1061ccbc4cc04007c8b5208c3aa9b399115b283f Mon Sep 17 00:00:00 2001
From: Dave Hladky <david_j_hladky@raytheon.com>
Date: Wed, 25 Jan 2012 10:53:51 -0600
Subject: [PATCH] Issue #15 Wes2Bridge time settings

Former-commit-id: 66fbee3e04c4e2ddda35829321606d021e348fde [formerly 594412a5b5dc3397ff4f146c1d33b4b44fb41d2c] [formerly 66fbee3e04c4e2ddda35829321606d021e348fde [formerly 594412a5b5dc3397ff4f146c1d33b4b44fb41d2c] [formerly b03b324ead689328746d1e33ae50cba0834ee06d [formerly 61cb464263b06c01f4ea0b7270628f03e9e48d5a]]]
Former-commit-id: b03b324ead689328746d1e33ae50cba0834ee06d
Former-commit-id: 4e8acfaba33e8cf110561e5d4fe353e1ee348f5b [formerly 2d53cfbe41fbe44769c55e7e043d623ece6a2bb4]
Former-commit-id: 8553b8a654b95ce30ffaffd0cb88d3d3d654fca3
---
 .../uf/viz/core/catalog/CatalogQuery.java     |   4 ++++
 .../monitor/ffmp/ui/rsc/FFMPDataLoader.java   |   3 ++-
 .../cave/refresh/ThinClientURICatalog.java    |  13 +++++++----
 .../satellite/SatelliteDataCubeAdapter.java   |   2 ++
 .../edex_static/base/python/ObsRequest.py     |  21 +++++++++---------
 .../build.edex/tmp/includes/core.includes     |   2 +-
 .../build.edex/tmp/includes/cots.includes     |   2 +-
 .../build.edex/tmp/includes/plugins.includes  |   2 +-
 .../tmp/uengine/com.raytheon.edex.common.jar  | Bin 347047 -> 347047 bytes
 .../com.raytheon.uf.common.serialization.jar  | Bin 97515 -> 97515 bytes
 .../dataquery/requests/TimeQueryRequest.java  |  14 +++++++++++-
 .../database/handlers/TimeQueryHandler.java   |  11 +++++++++
 12 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/catalog/CatalogQuery.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/catalog/CatalogQuery.java
index 92fae31080..0d9280036e 100644
--- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/catalog/CatalogQuery.java
+++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/catalog/CatalogQuery.java
@@ -36,6 +36,7 @@ import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.common.time.BinOffset;
 import com.raytheon.uf.common.time.DataTime;
+import com.raytheon.uf.common.time.SimulatedTime;
 import com.raytheon.uf.viz.core.comm.Connector;
 import com.raytheon.uf.viz.core.exception.VizException;
 import com.raytheon.uf.viz.core.requests.ThriftClient;
@@ -232,7 +233,9 @@ public class CatalogQuery {
         req.setMaxQuery(max);
         req.setPluginName(pluginName);
         req.setBinOffset(binOffset);
+        req.setSimDate(SimulatedTime.getSystemTime().getTime());
         req.setQueryTerms(constraintMap);
+
         return req;
     }
 
@@ -251,6 +254,7 @@ public class CatalogQuery {
      * @return the available times that meet the constraints
      * @throws VizException
      */
+    @SuppressWarnings("unchecked")
     public static DataTime[] performTimeQuery(
             Map<String, RequestConstraint> constraintMap, boolean max,
             BinOffset binOffset) throws VizException {
diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
index 17c89b5401..b8a1f6f828 100644
--- a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
+++ b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
@@ -39,6 +39,7 @@ import com.raytheon.uf.common.serialization.SerializationException;
 import com.raytheon.uf.common.serialization.SerializationUtil;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
+import com.raytheon.uf.common.time.SimulatedTime;
 import com.raytheon.uf.common.util.FileUtil;
 import com.raytheon.uf.viz.core.VizApp;
 import com.raytheon.uf.viz.monitor.ffmp.FFMPMonitor;
@@ -474,7 +475,7 @@ public class FFMPDataLoader extends Thread {
 
         FFMPBasinData basinData = null;
 
-        if (file.exists()) {
+        if (file.exists() && SimulatedTime.getSystemTime().isRealTime()) {
 
             System.out.println("File path: " + file.getName());
 
diff --git a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientURICatalog.java b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientURICatalog.java
index 3b412d5af4..941fea86a4 100644
--- a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientURICatalog.java
+++ b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientURICatalog.java
@@ -35,6 +35,7 @@ import com.raytheon.uf.common.dataquery.requests.TimeQueryRequest;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.time.DataTime;
+import com.raytheon.uf.common.time.SimulatedTime;
 import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
 import com.raytheon.uf.viz.core.exception.VizException;
 import com.raytheon.uf.viz.core.rsc.URICatalog;
@@ -122,6 +123,7 @@ public class ThinClientURICatalog extends URICatalog implements
             TimeQueryRequest request = new TimeQueryRequest();
             request.setPluginName(pluginName);
             request.setMaxQuery(true);
+            request.setSimDate(SimulatedTime.getSystemTime().getTime());
             request.setQueryTerms(map);
             List<TimeQueryRequest> requestList = requests.get(pluginName);
             if (requestList == null) {
@@ -182,6 +184,7 @@ public class ThinClientURICatalog extends URICatalog implements
                 }
             }
         }
+        rebuildTree();
     }
 
     @Override
@@ -192,11 +195,13 @@ public class ThinClientURICatalog extends URICatalog implements
     }
 
     public void requeryAllMenuTimes() {
-        Map<Map<String, RequestConstraint>, List<IURIRefreshCallback>> map = new HashMap<Map<String, RequestConstraint>, List<IURIRefreshCallback>>();
-        for (DataPair pair : getDataPairs()) {
-            map.put(pair.metadata, pair.data);
+        if (enableMenuTimes) {
+            Map<Map<String, RequestConstraint>, List<IURIRefreshCallback>> map = new HashMap<Map<String, RequestConstraint>, List<IURIRefreshCallback>>();
+            for (DataPair pair : getDataPairs()) {
+                map.put(pair.metadata, pair.data);
+            }
+            queryMenuTimes(map, null, false);
         }
-        queryMenuTimes(map, null, false);
     }
 
 }
diff --git a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/SatelliteDataCubeAdapter.java b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/SatelliteDataCubeAdapter.java
index 6ce7ea4017..f7bb8f0325 100644
--- a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/SatelliteDataCubeAdapter.java
+++ b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/SatelliteDataCubeAdapter.java
@@ -58,6 +58,7 @@ import com.raytheon.uf.common.geospatial.MapUtil;
 import com.raytheon.uf.common.pointdata.PointDataContainer;
 import com.raytheon.uf.common.time.BinOffset;
 import com.raytheon.uf.common.time.DataTime;
+import com.raytheon.uf.common.time.SimulatedTime;
 import com.raytheon.uf.viz.core.HDF5Util;
 import com.raytheon.uf.viz.core.catalog.CatalogQuery;
 import com.raytheon.uf.viz.core.catalog.LayerProperty;
@@ -541,6 +542,7 @@ public class SatelliteDataCubeAdapter implements IDataCubeAdapter {
                 DerivParamField field = (DerivParamField) ifield;
                 TimeQueryRequest newRequest = new TimeQueryRequest();
                 newRequest.setBinOffset(binOffset);
+                newRequest.setSimDate(SimulatedTime.getSystemTime().getTime());
                 newRequest.setMaxQuery(false);
                 newRequest.setQueryTerms(modifyQuery(queryParams, field));
                 newRequest.setPluginName("satellite");
diff --git a/edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py b/edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
index d076758484..c928079efe 100644
--- a/edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
+++ b/edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
@@ -1,19 +1,19 @@
 ##
 # This software was developed and / or modified by Raytheon Company,
-# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
-# 
-# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
 # This software product contains export-restricted data whose
 # export/transfer/disclosure is restricted by U.S. law. Dissemination
 # to non-U.S. persons whether in the United States or abroad requires
 # an export license or other authorization.
 # 
-# Contractor Name:        Raytheon Company
-# Contractor Address:     6825 Pine Street, Suite 340
-#                         Mail Stop B8
-#                         Omaha, NE 68106
-#                         402.291.0100
-# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
 # See the AWIPS II Master Rights File ("Master Rights File.pdf") for
 # further licensing information.
 ##
@@ -62,7 +62,8 @@ class ObsRequest(PointDataQuery.PointDataQuery):
         self._pdq.setParameters(MetarPointDataTransform.ALL_PARAMS_LIST)        
         self.queryResults = self._pdq.execute()
         if self.queryResults is None:
-            self.makeNullResponse()
+            response = ArrayList()
+            return response
         else:
             records = MetarPointDataTransform.toMetarRecords(self.queryResults)
             size = len(records)
diff --git a/edexOsgi/build.edex/tmp/includes/core.includes b/edexOsgi/build.edex/tmp/includes/core.includes
index b229dc770a..b5f4413a14 100644
--- a/edexOsgi/build.edex/tmp/includes/core.includes
+++ b/edexOsgi/build.edex/tmp/includes/core.includes
@@ -1,4 +1,4 @@
-## Core includes file generated on 2012-01-20 17:08:45 GMT
+## Core includes file generated on 2012-01-24 20:30:22 GMT
 com.raytheon.edex.rpgenvdata/component-deploy.xml
 com.raytheon.uf.common.jms/component-deploy.xml
 com.raytheon.uf.edex.database/component-deploy.xml
diff --git a/edexOsgi/build.edex/tmp/includes/cots.includes b/edexOsgi/build.edex/tmp/includes/cots.includes
index 1fc912c95c..95b3c9d04b 100644
--- a/edexOsgi/build.edex/tmp/includes/cots.includes
+++ b/edexOsgi/build.edex/tmp/includes/cots.includes
@@ -1,4 +1,4 @@
-## Cots includes file generated on 2012-01-20 17:08:45 GMT
+## Cots includes file generated on 2012-01-24 20:30:22 GMT
 com.sun.jndi.nis/*.jar
 net.sf.ehcache/*.jar
 javax.persistence/*.jar
diff --git a/edexOsgi/build.edex/tmp/includes/plugins.includes b/edexOsgi/build.edex/tmp/includes/plugins.includes
index a38b6972d2..0246843b10 100644
--- a/edexOsgi/build.edex/tmp/includes/plugins.includes
+++ b/edexOsgi/build.edex/tmp/includes/plugins.includes
@@ -1,4 +1,4 @@
-## Plug-in includes file generated on 2012-01-20 17:08:45 GMT
+## Plug-in includes file generated on 2012-01-24 20:30:22 GMT
 com.raytheon.uf.edex.plugin.satellite.mcidas/component-deploy.xml
 com.raytheon.edex.plugin.ldadhydro/component-deploy.xml
 com.raytheon.uf.edex.plugin.loctables/component-deploy.xml
diff --git a/edexOsgi/build.edex/tmp/uengine/com.raytheon.edex.common.jar b/edexOsgi/build.edex/tmp/uengine/com.raytheon.edex.common.jar
index 128f3525a9a05ec14526e457c62997d6dae22e27..4eca5dab047ea5d6dac21b353104083bd98906b2 100644
GIT binary patch
delta 6844
zcmZ8kd0bW1_P=MJz2O30ka-pr!2x8FSs4TcN5H3nCZ^={ET_V;6g5XuQ{PRu*2|#`
zdX_&$%xmWG`uS3E9`dCnn7=GhP{Dcj?Yq`G{XQ@L;C%0z*LSVG?>&{$yHa{v3i|5Y
z*<}Cwp)`4wrGtL1G`TAIJzZZsKH0iY4}s@py#qX*d1rX0@<jWyx|F}}0)ka_q1MU%
zj(<cmo9t@0mV-60d&7MP2fGlTZXkHgXDcH?Cu_352MGK7=c8~#U<L@T1bX;_)q}Vg
zc-qr6W&b(Nh%UD^ca<;my?f#Qu4a?T&&Om6x4LHp$ze_0QeB?lXNGv2(~7YkJ!2z+
zip+M{>51&!kRikeGFW%?z?u&C=;#EB=f&Z2;$3e3Q;Sh~A7P|p`K=rwNn@d_19>FF
zGkI7RC}s~U7XX|_P6vzX`Qx(DG?j<S^$)m{pD_*KFLQZDTwy&onZ9tgZc7Wa-k#)G
z9X(mcAPG}{!r3%!3w0k|`g-(#xmM?_J_TILu1T62%?9T`g>DQ!me*f1nR1w%o2dEO
zEvo0N9gn@-T6Y-1?vKAmF!z(A2>Nf>2f%9Cv=6#d>8(whT%j@T(?$ykV_oe7=~{H=
z{vy@D8Yk<3)qd8P16)3Pq9!tU`%2h{>V}=!P-b<ktpLG-Zx&&LmIIAw^Xy<Gsv-{A
zU|7|^)wm&eczhe${NqeA+FU*N8M?oJF%>I5{F4Wc_)_f-C~j3<JXCw6ZVX0={l9uN
z4Z2F1`u^^UlHzN<u-(e~pP-`!`8(^g6mOo)nmN@^u4E#p`r!3`n#JC3edwGePnB}6
zJXNas+m+_(v<6QGo=;Qu4A`iY)qi-JtIKZg$2=LgPhc%>cVC4@tZEVETp`@7>+d^5
zxnJJ@8e1Isr~uaa>s{KX;A9)hwSNGTj%IB)90fSh^slw7^45H0lY_AQ_xA2`(vHH?
z+D^38)&rArqPG@j&u9D0TRR2C$*I0tDg<5YcdY!7YT;MiWJ<xHF~M33xy393Y|nhP
z(_n8q<*%h;VJ(8S?og|(AWUoPZjURcCTa%(sLf0Q+OjHw96wjJo{&|JEI<xV(wyXZ
zXVFsbNYb_ecZH*de|5#%WZE2Mt;+P1WiG;E`!HF1=na*Akf&AtQGBTU#YH%};H3t~
zNKP22JqN=HgS554q0L;R-9+?gh}NqGBuTiu*wfj?WV-C5PMaF-Ak9Ipv<Pq8yfK;=
zTywUyZ)u&-?fX(~B%+9E+7t%#+#fW0;Ww%erYMS+1IB0pvcOF^$%n4OOJ19SZQHia
z)IwpRwsZ3}3+_fr&$VH-%4>pdZK_eJ2WrCRvPgT0d|H-h?;v`=Tr0t>x0Y%p8kFtz
z^TnE(%w#&u<=iB-b-&bVTo${lx>qdM=41Sd<vq3DYG@lBfj@|!wo)65Q>wIT(HQ^Y
zhuV)AzglV^MFVLChqb4`t}XAl_9o77Z>_cyW>{LMC4kkJb=pKXKtZ>(J{WggvzCIM
zpWoNMbcJg9!Y!#zs*<q+Ngk+*UD>R0TN!8J;3g{_*`BcQA<3DvzVJ|&i0SRorGMOV
z>VhAVEEkzsJKYYpnpt~0u>ELeTmY)GFm;{TW&Pb)2nRIDlU>yT75cKSDElywtwGee
zH5-g*Njnyg=s*WHm4Qc61Y3{37ou1+YMr~VBPctc$ed7iC6yH-O3h%`Q5&AkN>KKG
zE^C2kU0>#kXiGk`AlfsKDX#4esk{NUvxC`COdd0oy@P1$Fcyi%mr7U+BDXQD3!<KH
zusxWPO*Ddfyv@o$yQWsf+&YaFVI;?y%mKYx&Ss8?0_L$;M0pEYFrta&ED=%Va@NiP
z$T(?b2}rZUIyMot(?4M;+*K8y8C2I|dV4jo8jEaG!93-^+X#2LuAKSVo@`?NXzf$M
zLJ@V_!iFGP`#&rW(TN?#C_32KP?RnDmd(MO=I_{Bh-MvPi2`zNTzqcI2$l0aSGnq2
z=50HFjLks5g41jyqFp~2oE*Bql0dermc4~^Ou5W%Aay0bG7d_4Y8elZe+?I|ww2dd
zAGE8zZp`i0O?C%7Dt~QenBn*PY!jmQpBVjZe_^b~UZ$H-d)UE1XPtGLo!L!)6SdPk
zb>iVmU!CT0IZ&rXENZ0}p<Pv5eFdWI_Ih7Lt0MGtL}#OQ+7vBbKdYPVlllA7h4pe$
z5%;z=CFx#h=h%(1;nEdm>a=t_vvk_ujX8QLcJI?$k8*?+$Su%UK>%slrU%FeorRaJ
zCPych3XAk6WV82BBTB+>y)}n2iZ7%($pKRLmR`~7o<A{*2g!}T%t`JqXHK^5BlSz@
zyJD=~2aCM)rtXaB`XoJw)?liB5oK3r>IcxHVz&MikgV;?18n=}>BU%h@B)1T8ZTd>
zH=yym%k+0q`}hOB6>0;lIvwtQQm0E`{>M6<v|StY>F5#jsZIwuqe8F4c&)eSlR#^y
zBt(|Q3pd+8zcMIMvKi>Rq)I;k*?@6bm>}G3M=u(7|GV4B`*^QG`=kSg?~U(_jc9eq
z*qlK}$pcRK=O=YK;V)0?v#_hO^LiW1XkTgD-i!KREXDVdUW{x`yP~I{@s8hgx|t4M
z*J-hj+|(DMw&0FlkL`ASpby7g_~g0Xh_YoGPer>L!D*e7ocUywZE@wB&@Rt|pCZzH
zI30k(0NxJmX1C&JP&=S4e}U*P;hffaUMIc{WnH59UPO0d`6%=qlE`nPtZyn0MA^7>
zz6{Z$EZz@MZZ5YXQkyaj*(l88Q*eMl)3pLlG-VCsVQBnD5syOj@ld1iGsC$X%6=Wm
z-$pd}uSN@z<9TnC&6vzx@Bmai-G4#Op3ME_&splXOzLd5nb}^M&b#3^)`v4VeVc5Y
z#c3*+=JLbXSH%L}9s{0U!k?i`)%!N~&|?K}joPtR>c&>Ln)gCk$B*~`M6=iP-?)?g
zQuz4BxILaS<7@6GyX6R1=~Kl$ZJR&ibl|Eg`3-bg{}rd>*sz_`eUtLFAzSnfr?1q1
z?c<%$qxn0IduQ`L#OeDa;VAEb+7TxW2G^YB(@^I2Bd7D%{b!DMpH$aRfNjNPJ_I{#
zxWenv_}{<t%{Z^w*VU`3{fl$!b^do<y~@gdH+ZuBWmYb}!QpjMPVy0f^6Cxl1wUP$
z+V%Dyq=^kY4M5F(9w=8e@Cf*Hpn(qsFz>b!CpYqr@M%;d9|&MiBOeUl^i8FYxyfTu
zf0K_h#Qgw-+#<=+TRa~mwYT_d0Mc*sOaLlJ4**AQ^H%|cHSqxeW;RitADZ|pAc<_|
zg#Z>B07`h=OeJ)_L*YNT!+U|@MMIK$mk$BSn!A)o*#t`0d-!56)9>-WfZlqKj{@+-
z044YNXpktHasYTdpvopZps2SWt6*0j@Nm#u9`ZZ@1<s22nGbm+eEQ-cF9zWFh>rm9
z#v?uqz|lv%1VGed{yG5b<Npuc9VA_z@csZG+4?7x?C=vx=J%9h%z8?^*FWWhz$4=s
zjr5ael<@g8s-^fj@$t=b%G~M&Wq#)c(fP9>NqR}Smb|28fE{`K5_e>Em;jPj&lAwi
z>fZ!5(?=7yGM{S#Dd3DG!x{R>Z<)aTa@R>RK_}zmx<Hy>+__xf#=XnM1Zb~;V?LQL
z1QNSLP-b5Tfh#lFLG%UV{SE?mFvL;dT(`NXDShfF+JpYMqbL9nVitV>j5iBhiF0NO
z7U@KlEp-wj!KT@esFCM_<RfQM1mK=CdG&V@!$G1FW}(W3SjcZ7a8ea5&})r_oQ7D)
zWT!>oDQMwJM7?f+-L4ckz)j%Undm0)#QoDv;IRsBNdc#|r2cAJk}BMtDxK?2HW%H=
zJ;H;G%RB@g>JuK6qKzl1rg&2A$2>((Xv@=!*q`Ag-U3OZmzV_LHE$a39&hT)+ec-$
zUtsE%iUzRBN5liT;3JX%c=(D;0I&FpQ~-bT6}<q|`ikxV+W3)Vyr1X|lHGo)9u;|w
zzsLqbRDv3GiNELspFZ%XplAHiPWlH>h*1F|2W++)l1Bj)BRx<NVJ~-ipy&bMhd^=<
z3L?qKAT?jR4J14mL<yUM)I!<CX~9(UJO$vJ=+)Zl0wymf3UB#Kum}e$r&g3Q-vFyy
zQKs5fM$;i81B^$8Q0^@uYCiTPFG57NvjUlOYKso3m(8X)^)f!ZHPy1LHQAptKtLNx
zH=>Q&V0(luZHUMR2FPklyew@?Hs{+?Nx`9{8WTz+R)v!4aVW*<*^X2z+o{87Pf^!S
z^nfC3T$;-n6`2`EMNSB#Hmky@+DBm&v!sU_<<M|-X6<1XhLiqyI91`@UgUvlOnXYT
zvptRbVS9>^(Sg9?4&;8a199Nhk-)1RX_Olb05g5rkxGp0M6RU<*wcwd@~jhWO5X^Q
zERPVqVBGe%kr#4BZ#C|_5h4r<4UDAifCTd+DZ%zgs^ozIx^<?M^E(rr1L74K*E<XR
zA>bcH`Vj`GjG`tQ4M~@1axIId@c)XY^zJd_J~)QB+!RB@ZZIVAu_P&rHQZx~W{)@;
z_G@vXJG}G!xO~q7*&HQ&<i0r35qiBIN6g1|p+N6;A<4lm<nI<wtf}tss6(5!cxv-n
zJk_cA>ItlFja&G|OL;p^vAQaO=-Zz_t?P-Dsed9Z)v82FdC`yrCy}ZoiBf)*M6AHR
zc_q`nr6-f?qGZyaOQvc9QmE|W6l&y)6xxG_Ddd%rO0|@ylFj*4O4zz9fj7HSz#U!5
z>q%FdM|L+Ny}TPWcd{GB2}mQak~Esfwlu2nSsEqHNhh$<06(Quz}6WQaI^u`$OGl~
z86pDa)?`0*u9-AN;N+D|;$%)H-DQ7Uzb2lRyDpQK+o3zvo^OD)-HGc<-KpfzERu}P
zqK>y2;9(Zoq-Rs@OAK%}n^gWi$V-)lw{JxcGFD~dRh`t6%9z`ejE@+gWe%x^<j@2*
z8<LwjWSo#oHf6bFQ<E$D12g`;i0`qzNVTIEja}<a?B@2S)hO>xSJ81p<<W<12KN!^
T5O7@|a<A_r(m>LoubA^6XucJn

delta 6844
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

diff --git a/edexOsgi/build.edex/tmp/uengine/com.raytheon.uf.common.serialization.jar b/edexOsgi/build.edex/tmp/uengine/com.raytheon.uf.common.serialization.jar
index 343c4c9e7c3ef0ae8d470101393de004b13a1edd..e04342cf0c805c45e5d15bf79a1ee49524f2e1f3 100644
GIT binary patch
delta 1419
zcmYL{dq|T}7{>Sd%}d6zETx-WC@fMdN7T|Z%Su}oN;mDYIhUK$Ih~hzTdmO_QBY6|
zzAg|^R1=GAql*axlju(Of+#{Fsq9KfSW)>s?}_~9{PvvZd!F+iPv1az-$1w~e}$xu
zRw;jvYjyiH)1^nXy7Ri*B<<dy3r2+fVTe+141;2c=wU@4H7gv7TNB4y2V%xZP}*Zx
zLJ7ouVDIPn4&G@S`-2t#`20A<>-(8H5o>~WI@Vlm5>}U1i?vOgrL4hE+6f#HGxr=r
z*Zc&Ao(0nwhGr#7!v@V+$wzF_PEx53NxrVbN%C1U#RlEkUQ`E`KH}p(&6&+GL?2)X
z<@Ls+?6kQZUf+h&`w&tr=lI;Otcw_?*sKhD%1zw<wK6#d=1E)ca^4q@Ndslg9wWoW
z!+CsZ;m1gnAMcA$JihP#<?v>=UO`^qteUNnfx?Ip%2YdIuI}y(Q>pBcD%CPyL2If!
zyqZP_J1$@2C~xO322F_g(-GZ?2oI*+OpQdk<Gz7C_a4sVnx`k!*g5sQpW*1M5D#R0
zEhEM^@HP*Y+;<M1x#N8!!<-LY0QpM>&6Pck^#46Ysg!?P)+aGV&NnX?-|qj&XX^ZQ
zj6)2+gJ_mVNtB}$T{1{i77e<oq4X3`WIFXCLFrlwNta2@BS9Am=*Cbfu}CLx-%Kfh
z_RVxs8hp}np@DSDqn3RJTBx|?CkDbm@>C-gLD_C3+`fFrNZC+gi)jg<sF?JCQ^m9n
z@TZt^0eX|jIb;%_zcEoJwh~Kd7ND?Xuw5zjl~6k1K?yAe#G5G}U^CNJz&kUw0IXZ6
z0noFBngNDVasytLQW+rELLR^^3+)7~vC<B}b1OLktIDVn5Go@ZV1|t<00(VU1JIOH
z6~I$YUVv0VCV;g<cwSV93X5IjJhY2rWK@zJ<};OK1;jhVt=2fG8p<1oC|zA8&eL5b
zPB^cc9Ps$7MOT88>YyBO3S~$Q)kE>th_Cwpfvr{~KdTitR!~RfFo)`B6Cj~p<m|7f
zCMd&P;==d3Xf2dpm$-z&1~Ja{2GNz?C<6VB<bru}6RiidG>O3PO`_e|Oxv(Em^@C_
Zv``v;>088<oeC)LG}%oV0K1z!e*qMK<MaRk

delta 1419
zcmYL{dq|T}7{>SddCORqrF63kg+*!Qlrqh-th8mJbki=IbGbR4b2FW{)f)ZL1q|v7
zzAg|^R7OR%(Zz&;MRcbd6+{sdNo7|;!is9&^PXt`e7`;CInVQ+!|Cmh=<Sct7A}>-
zV>Ie-d`bEq?PO_ON&5MWJ0xZ9NDD-U{b7g>Ul#_&64}j)K6-it6puEZm-fYukf5~3
zEra5Z|G?hQ2_3w0dgKpQ+C~?~OS5;R$v;!a;+v?OjBmbfD!y)=PR)`}>vE9!NjHWg
zVrQOX=$f6#&^>1o!@!&*X;5fWPVymJjEgjy1CrczaH?|FOmP8Et`F7zMUQ#hr+G6N
z2I&0^!GfLyl$|uU!z-^Xe*huHa*pSIWu4D3!DeM>tu%4_*Xrb0n8$6t$9Z48CM}ee
ztwx562MhSpB94$KKiV6qdgSkIOW@5tbp?6;v*B!w@)t)AQBSok_Uf+AFpb6@rO_;w
zi%z8~gPk-y&~f=XNBKH;GH8RuTZddrLU<taR%#T|9S;obx&LSy*E~HIj+GP7`xp+t
z3i5%BuNB0|{cj6k$$#hIGk3giWJv$e1yH_Z(@e$NNdMncv?erjAm@`fMcy|b7vJgo
z$TM~RI>I4_-vKl$!z9X6i!K=?s)zyI(o$9mC@PD3kf3%gf|N0rnumfe6w%FrlFgZ>
zY~4U9fc6b^TnasDrPx3j>Z4X<1I<(2$`b?OK*~fTl|b2QB;3Ao*GRcg;!0^Dprn-a
zfD@&(8t|u-@&S62$T?sV+uxXIuKIkHq%xWgC@u@NtBPDkS%8OSv;f-^%v1=lnQ1fN
zotaty){WEv=-x=p07E%>058j_0+4SZFW|O?wgXmLX&d0Vm0W=36;urfR*(%a#YR<t
z{WhuvXe+4(;H@MdK&m1Wz*;3dFRDa^#V&Fl*~J*y)nteHOf^{n2@Y|qwGMJZdE*eJ
zD{90%*J{Lsvz+9Br_Cw45?xdWWuHqZ18S)rimz7e>iY+_O(OZ(CUIj$byNv+u#VOP
z66;0I-g;_+GRQ41e7BocLFsXeODJv-$GOoUy0RKYU|S=(VIJQ^YXB`xBJg{YXm>T!
f7A%F5M=9DC%EUi?i#TPc3hFye_E0v!?ji4AQ!UI|

diff --git a/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/requests/TimeQueryRequest.java b/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/requests/TimeQueryRequest.java
index 732851b889..0cf4c83020 100644
--- a/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/requests/TimeQueryRequest.java
+++ b/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/requests/TimeQueryRequest.java
@@ -19,6 +19,7 @@
  **/
 package com.raytheon.uf.common.dataquery.requests;
 
+import java.util.Date;
 import java.util.Map;
 
 import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
@@ -53,6 +54,9 @@ public class TimeQueryRequest implements IServerRequest {
     @DynamicSerializeElement
     private boolean maxQuery;
 
+    @DynamicSerializeElement
+    private Date simDate;
+
     @DynamicSerializeElement
     private Map<String, RequestConstraint> queryTerms;
 
@@ -91,11 +95,19 @@ public class TimeQueryRequest implements IServerRequest {
         return queryTerms;
     }
 
+    public void setSimDate(Date simDate) {
+        this.simDate = simDate;
+    }
+
+    public Date getSimDate() {
+        return simDate;
+    }
+
     @Override
     public String toString() {
         return "TimeQueryRequest [pluginName=" + pluginName + ", maxQuery="
                 + maxQuery + ", queryTerms=" + queryTerms + ", binOffset="
-                + binOffset + "]";
+                + binOffset + " simDate=" + simDate + " ]";
     }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/handlers/TimeQueryHandler.java b/edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/handlers/TimeQueryHandler.java
index ba94ce5e95..ab0b0335d3 100644
--- a/edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/handlers/TimeQueryHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/handlers/TimeQueryHandler.java
@@ -70,6 +70,16 @@ public class TimeQueryHandler implements IRequestHandler<TimeQueryRequest> {
             map.remove("pluginName");
         }
 
+        // Simulated Date is the date set in the CAVE calling this
+        if (request.getSimDate() != null) {
+            RequestConstraint timeConstraint = new RequestConstraint();
+            timeConstraint.setConstraintType(ConstraintType.LESS_THAN);
+            timeConstraint
+                    .setConstraintValue(new DataTime(request.getSimDate())
+                            .toString());
+            map.put(REF_TIME, timeConstraint);
+        }
+
         String database = PluginFactory.getInstance().getDatabase(
                 request.getPluginName());
         String classname = PluginFactory.getInstance()
@@ -136,6 +146,7 @@ public class TimeQueryHandler implements IRequestHandler<TimeQueryRequest> {
                     constraint.getConstraintType().getOperand(), classname);
         }
 
+        //System.out.println("TimeQuery: " + query.createHQLQuery());
         return query;
     }