Commit graph

11529 commits

Author SHA1 Message Date
Steve Harris
770ccb1520 Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
Former-commit-id: 54a1d9cdbc [formerly 132d68acc6 [formerly 296cc5a5a6bcc45cd92198a045a88620d7d18653]]
Former-commit-id: 132d68acc6
Former-commit-id: 94e6323c0a
2012-03-29 10:01:55 -05:00
Steve Harris
132d68acc6 Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
Former-commit-id: 296cc5a5a6bcc45cd92198a045a88620d7d18653
2012-03-29 10:01:55 -05:00
Nate Jensen
b54807f36a Issue #427 Share maps and editor
Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c

Former-commit-id: e9b2e70892 [formerly 37d4401747] [formerly 615962f5dd] [formerly e9b2e70892 [formerly 37d4401747] [formerly 615962f5dd] [formerly 0e214bcd7c [formerly 615962f5dd [formerly 7a58d8a17be53fc504cafe32d19de2f52121eeff]]]]
Former-commit-id: 0e214bcd7c
Former-commit-id: 2ba6735324 [formerly 8d94771854] [formerly 2f70306617907f26efb4f42d9c736b68c3f4f5a2 [formerly 2801c4fdfb]]
Former-commit-id: 02922d354abd7bde98ea1ad74b2d1aa2c178b78f [formerly 98fb91164b]
Former-commit-id: 28931de3c6
2012-03-22 09:39:59 -05:00
Nate Jensen
e9b2e70892 Issue #427 Share maps and editor
Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c

Former-commit-id: 0e214bcd7c [formerly 615962f5dd [formerly 7a58d8a17be53fc504cafe32d19de2f52121eeff]]
Former-commit-id: 615962f5dd
Former-commit-id: 37d4401747
2012-03-22 09:39:59 -05:00
Nate Jensen
615962f5dd Issue #427 Share maps and editor
Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c

Former-commit-id: 7a58d8a17be53fc504cafe32d19de2f52121eeff
2012-03-22 09:39:59 -05:00
David Gillingham
cc50d252a1 Issue #20: Don't throw an exception if overriding a lower-localization
level's configuration (like overriding BASE's default plugin
configuration).

Former-commit-id: a1ac93704b [formerly e33083c11a] [formerly 13af9170b1] [formerly a1ac93704b [formerly e33083c11a] [formerly 13af9170b1] [formerly ed74b90589 [formerly 13af9170b1 [formerly b585768a8c7e3f42742efe5128ec6cb05c6424bf]]]]
Former-commit-id: ed74b90589
Former-commit-id: d1bf70a7be [formerly 558c69401d] [formerly 0292153c8495403a4ef38c31d54a54c78f7b0db8 [formerly 5dac19bde9]]
Former-commit-id: e6c648223d36fadd33eb385dc9b937e8dd81b199 [formerly 0658b4049c]
Former-commit-id: 21a13f6340
2012-03-14 15:07:59 -05:00
David Gillingham
a1ac93704b Issue #20: Don't throw an exception if overriding a lower-localization
level's configuration (like overriding BASE's default plugin
configuration).

Former-commit-id: ed74b90589 [formerly 13af9170b1 [formerly b585768a8c7e3f42742efe5128ec6cb05c6424bf]]
Former-commit-id: 13af9170b1
Former-commit-id: e33083c11a
2012-03-14 15:07:59 -05:00
David Gillingham
13af9170b1 Issue #20: Don't throw an exception if overriding a lower-localization
level's configuration (like overriding BASE's default plugin
configuration).

Former-commit-id: b585768a8c7e3f42742efe5128ec6cb05c6424bf
2012-03-14 15:07:59 -05:00
Max Schenkelberg
42696fd296 Issue #358 Cleaned up mesh extension and API to use geotools for
defining a mesh.  This is better practice than using arbitrary
MathTransform objects as it is well defined and allows for serialization
of the mesh to occur.

Former-commit-id: 5a61f3ae23 [formerly 8fb7eccb73] [formerly 6e5964df9d] [formerly 5a61f3ae23 [formerly 8fb7eccb73] [formerly 6e5964df9d] [formerly 50765e8a34 [formerly 6e5964df9d [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]]
Former-commit-id: 50765e8a34
Former-commit-id: 458f5970aa [formerly 8f08fab0a7] [formerly 87c83af55da8aec24c975aa2f80b06b4449fa969 [formerly cf440b3884]]
Former-commit-id: 732d389245ce92a580088b9302b87702dca2b03d [formerly 6378e8c4ee]
Former-commit-id: 9366a5f308
2012-03-14 09:49:32 -05:00
Max Schenkelberg
5a61f3ae23 Issue #358 Cleaned up mesh extension and API to use geotools for
defining a mesh.  This is better practice than using arbitrary
MathTransform objects as it is well defined and allows for serialization
of the mesh to occur.

Former-commit-id: 50765e8a34 [formerly 6e5964df9d [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]
Former-commit-id: 6e5964df9d
Former-commit-id: 8fb7eccb73
2012-03-14 09:49:32 -05:00
Max Schenkelberg
6e5964df9d Issue #358 Cleaned up mesh extension and API to use geotools for
defining a mesh.  This is better practice than using arbitrary
MathTransform objects as it is well defined and allows for serialization
of the mesh to occur.

Former-commit-id: 7e4abe637edacca71e1e1c98d99521cd33415fb0
2012-03-14 09:49:32 -05:00
David Gillingham
13b2df8c41 Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process.
Former-commit-id: edde99f0b8 [formerly 7e5ec12276] [formerly e13850a2b6] [formerly edde99f0b8 [formerly 7e5ec12276] [formerly e13850a2b6] [formerly d433b7d4d6 [formerly e13850a2b6 [formerly 727e2b19688397ea4608a2b6ca3fda3222b6ad36]]]]
Former-commit-id: d433b7d4d6
Former-commit-id: 9cc2c09ae5 [formerly 3c4e90e0bf] [formerly 0328fbf92c7293da9871a341342665168164a9a2 [formerly 2b5588bd1e]]
Former-commit-id: 5d55cc005839dda8cfa6803d81909c0ffb8ccde0 [formerly 2d82185a1d]
Former-commit-id: 69adfe2e40
2012-03-13 12:31:38 -05:00
David Gillingham
edde99f0b8 Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process.
Former-commit-id: d433b7d4d6 [formerly e13850a2b6 [formerly 727e2b19688397ea4608a2b6ca3fda3222b6ad36]]
Former-commit-id: e13850a2b6
Former-commit-id: 7e5ec12276
2012-03-13 12:31:38 -05:00
David Gillingham
e13850a2b6 Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process.
Former-commit-id: 727e2b19688397ea4608a2b6ca3fda3222b6ad36
2012-03-13 12:31:38 -05:00
Steve Harris
31c739aec3 Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set
Former-commit-id: 229fa2944d [formerly 6d2af585b1] [formerly 5bbf80a384] [formerly 229fa2944d [formerly 6d2af585b1] [formerly 5bbf80a384] [formerly 10dc140747 [formerly 5bbf80a384 [formerly a8ca6db2b2df5f7bd8a6a2fec3496dc1f37aa20c]]]]
Former-commit-id: 10dc140747
Former-commit-id: 4d58cdca1b [formerly 7fc8cf3d94] [formerly 80cb0b251d26c0d96f2c7ee6601e3e0f30708bf4 [formerly 7bdde9f690]]
Former-commit-id: 3641f7427bca19a3448d6e5ab052df768969a1af [formerly a97a9f80c9]
Former-commit-id: 749ee2f4f4
2012-03-12 13:10:34 -05:00
Steve Harris
229fa2944d Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set
Former-commit-id: 10dc140747 [formerly 5bbf80a384 [formerly a8ca6db2b2df5f7bd8a6a2fec3496dc1f37aa20c]]
Former-commit-id: 5bbf80a384
Former-commit-id: 6d2af585b1
2012-03-12 13:10:34 -05:00
Steve Harris
5bbf80a384 Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set
Former-commit-id: a8ca6db2b2df5f7bd8a6a2fec3496dc1f37aa20c
2012-03-12 13:10:34 -05:00
Bryan Kowal
e131dbea86 Issue #419 - a -Dgit={true|false} switch will be used to determine if deploy-install will deploy from a single directory source tree or a multiple directory source tree. Removed tmp files that should not be baselined.
Former-commit-id: 08451e8a63 [formerly eab9c845bb] [formerly 58bfa62981] [formerly 08451e8a63 [formerly eab9c845bb] [formerly 58bfa62981] [formerly 66e05f4c96 [formerly 58bfa62981 [formerly eaa45d7123c43590be3d58fdf845708ade2dbb51]]]]
Former-commit-id: 66e05f4c96
Former-commit-id: 474e2fae6d [formerly 64a7f1db84] [formerly 94a80f914d91af133eceacc5f6694a2db505051c [formerly 3b97383354]]
Former-commit-id: 4895ca298978a3651818a521f6044198b0f29bcc [formerly 6851775548]
Former-commit-id: 6b35ea48d0
2012-03-12 11:43:34 -05:00
Bryan Kowal
08451e8a63 Issue #419 - a -Dgit={true|false} switch will be used to determine if deploy-install will deploy from a single directory source tree or a multiple directory source tree. Removed tmp files that should not be baselined.
Former-commit-id: 66e05f4c96 [formerly 58bfa62981 [formerly eaa45d7123c43590be3d58fdf845708ade2dbb51]]
Former-commit-id: 58bfa62981
Former-commit-id: eab9c845bb
2012-03-12 11:43:34 -05:00
Bryan Kowal
58bfa62981 Issue #419 - a -Dgit={true|false} switch will be used to determine if deploy-install will deploy from a single directory source tree or a multiple directory source tree. Removed tmp files that should not be baselined.
Former-commit-id: eaa45d7123c43590be3d58fdf845708ade2dbb51
2012-03-12 11:43:34 -05:00
David Gillingham
8afb307353 Issue #361: Fine tune synchronization in GfeScriptExecutor to prevent
massive backups in access to GfeScript instance map.

Issue #361: Further modifications to GfeScriptExecutor and GfeScript to improve synchronization-caused back-logs.

Change-Id: Ic33ef5e62d2bd1e19dd2cfedcfefe050cf7efe9e

Former-commit-id: d3d2046df0 [formerly efc9e9000b] [formerly 9a75c87829] [formerly d3d2046df0 [formerly efc9e9000b] [formerly 9a75c87829] [formerly 3cfa029f4b [formerly 9a75c87829 [formerly 679996850315f699d47633da5baf593c72ba7927]]]]
Former-commit-id: 3cfa029f4b
Former-commit-id: ad170c7b51 [formerly 882544b165] [formerly 40b8cde016ba8c02a3df6cf49704fcd4f543df58 [formerly 1818e488c5]]
Former-commit-id: 69b2b65bc9f95e43a6d7e1b4fd315cc1000bd325 [formerly 2f723abcb7]
Former-commit-id: 5bc4e2b41b
2012-03-06 16:24:58 -06:00
David Gillingham
d3d2046df0 Issue #361: Fine tune synchronization in GfeScriptExecutor to prevent
massive backups in access to GfeScript instance map.

Issue #361: Further modifications to GfeScriptExecutor and GfeScript to improve synchronization-caused back-logs.

Change-Id: Ic33ef5e62d2bd1e19dd2cfedcfefe050cf7efe9e

Former-commit-id: 3cfa029f4b [formerly 9a75c87829 [formerly 679996850315f699d47633da5baf593c72ba7927]]
Former-commit-id: 9a75c87829
Former-commit-id: efc9e9000b
2012-03-06 16:24:58 -06:00
David Gillingham
9a75c87829 Issue #361: Fine tune synchronization in GfeScriptExecutor to prevent
massive backups in access to GfeScript instance map.

Issue #361: Further modifications to GfeScriptExecutor and GfeScript to improve synchronization-caused back-logs.

Change-Id: Ic33ef5e62d2bd1e19dd2cfedcfefe050cf7efe9e

Former-commit-id: 679996850315f699d47633da5baf593c72ba7927
2012-03-06 16:24:58 -06:00
David Gillingham
c2dedd3c7c Issue #361: Refactor IscDataRecRequest handler to execute iscDataRec
asynchronously.

Former-commit-id: b8acb1912c [formerly 8d2ea4cfba] [formerly ff231f33f4] [formerly b8acb1912c [formerly 8d2ea4cfba] [formerly ff231f33f4] [formerly 1d69867594 [formerly ff231f33f4 [formerly 26161f9fd457f02b4df8780750064aeb27fc7ba1]]]]
Former-commit-id: 1d69867594
Former-commit-id: 8bf167bc15 [formerly 000ca27db9] [formerly 2c7dd92ec610e80343c37fb794682b682556ef19 [formerly 8c0b121cbc]]
Former-commit-id: 0e62e1016f98b0289b90c4259c26ce541cf534be [formerly 773b6c7af6]
Former-commit-id: f67e4bc8c2
2012-03-05 16:49:23 -06:00
David Gillingham
b8acb1912c Issue #361: Refactor IscDataRecRequest handler to execute iscDataRec
asynchronously.

Former-commit-id: 1d69867594 [formerly ff231f33f4 [formerly 26161f9fd457f02b4df8780750064aeb27fc7ba1]]
Former-commit-id: ff231f33f4
Former-commit-id: 8d2ea4cfba
2012-03-05 16:49:23 -06:00
David Gillingham
ff231f33f4 Issue #361: Refactor IscDataRecRequest handler to execute iscDataRec
asynchronously.

Former-commit-id: 26161f9fd457f02b4df8780750064aeb27fc7ba1
2012-03-05 16:49:23 -06:00
Bryan Kowal
03d302a83d Issue #20 - additional new svn changes that have not been merged yet:
http://lightning.omaha.us.ray.com/redmine/projects/interim-svn-repository/repository/diff/trunk/edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java?rev=48&rev_to=1

Former-commit-id: 3bd189df23 [formerly ed81095573] [formerly bea56356fd] [formerly 3bd189df23 [formerly ed81095573] [formerly bea56356fd] [formerly 00759729a4 [formerly bea56356fd [formerly 47f1f6baaafd98cca0da5812a0870156766e83c7]]]]
Former-commit-id: 00759729a4
Former-commit-id: b0fc22d8ca [formerly 0b690e438c] [formerly 418be3166347d739bc1c5f3e7660655a0b29b88f [formerly 1fda54a89b]]
Former-commit-id: eb8c8405f7a9f29c90da7c6d45999d106d0eed2c [formerly 94beefffcd]
Former-commit-id: 2fad8b9298
2012-03-05 14:36:56 -06:00
Bryan Kowal
3bd189df23 Issue #20 - additional new svn changes that have not been merged yet:
http://lightning.omaha.us.ray.com/redmine/projects/interim-svn-repository/repository/diff/trunk/edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java?rev=48&rev_to=1

Former-commit-id: 00759729a4 [formerly bea56356fd [formerly 47f1f6baaafd98cca0da5812a0870156766e83c7]]
Former-commit-id: bea56356fd
Former-commit-id: ed81095573
2012-03-05 14:36:56 -06:00
Bryan Kowal
bea56356fd Issue #20 - additional new svn changes that have not been merged yet:
http://lightning.omaha.us.ray.com/redmine/projects/interim-svn-repository/repository/diff/trunk/edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java?rev=48&rev_to=1

Former-commit-id: 47f1f6baaafd98cca0da5812a0870156766e83c7
2012-03-05 14:36:56 -06:00
Max Schenkelberg
af3f53efbf Issue #358 merged esb.camel project for plot update compatibility
Former-commit-id: 8438bc54db [formerly 225dfd15be] [formerly 0cf00cb7f4] [formerly 8438bc54db [formerly 225dfd15be] [formerly 0cf00cb7f4] [formerly 76e7a02f76 [formerly 0cf00cb7f4 [formerly ba90282320443c6c41c3188db9f43ffb11399bdd]]]]
Former-commit-id: 76e7a02f76
Former-commit-id: 2300065c15 [formerly b23dc95d40] [formerly 7e077fb0a73db21250703b0387c3382298480c99 [formerly e27d36432a]]
Former-commit-id: c418bb91abe407175b247a3bc3dc2f6516dca1bc [formerly b1a521b17e]
Former-commit-id: 9385c7c7b3
2012-03-02 13:26:44 -06:00
Max Schenkelberg
8438bc54db Issue #358 merged esb.camel project for plot update compatibility
Former-commit-id: 76e7a02f76 [formerly 0cf00cb7f4 [formerly ba90282320443c6c41c3188db9f43ffb11399bdd]]
Former-commit-id: 0cf00cb7f4
Former-commit-id: 225dfd15be
2012-03-02 13:26:44 -06:00
Max Schenkelberg
0cf00cb7f4 Issue #358 merged esb.camel project for plot update compatibility
Former-commit-id: ba90282320443c6c41c3188db9f43ffb11399bdd
2012-03-02 13:26:44 -06:00
Max Schenkelberg
c371189680 Issue #358 merged dataURI changes from thinclient in for plot
compatibility

Former-commit-id: 7337ff7ed6 [formerly 4d91a4fd74] [formerly f96ff96259] [formerly 7337ff7ed6 [formerly 4d91a4fd74] [formerly f96ff96259] [formerly 1f714b1a5b [formerly f96ff96259 [formerly 14d0dc1cd0e5eb0b48de89f5c73f30152d4789de]]]]
Former-commit-id: 1f714b1a5b
Former-commit-id: 236c8f4ba3 [formerly 79365f1f62] [formerly c406d73453a39a7f5f13343ad3eebf5e47637d1a [formerly e4914cbe89]]
Former-commit-id: 38dff0f2b54be1f4265020f0a29af5aa90b5c399 [formerly 28052629c8]
Former-commit-id: 4590c7b694
2012-03-02 12:24:19 -06:00
Max Schenkelberg
7337ff7ed6 Issue #358 merged dataURI changes from thinclient in for plot
compatibility

Former-commit-id: 1f714b1a5b [formerly f96ff96259 [formerly 14d0dc1cd0e5eb0b48de89f5c73f30152d4789de]]
Former-commit-id: f96ff96259
Former-commit-id: 4d91a4fd74
2012-03-02 12:24:19 -06:00
Max Schenkelberg
f96ff96259 Issue #358 merged dataURI changes from thinclient in for plot
compatibility

Former-commit-id: 14d0dc1cd0e5eb0b48de89f5c73f30152d4789de
2012-03-02 12:24:19 -06:00
Max Schenkelberg
67b1edb767 Issue #358 Committing NPP core rendering improvements merged with Thin
Client core improvements

Former-commit-id: fe1811c167 [formerly e2cd95d3f4] [formerly ae47d9683e] [formerly fe1811c167 [formerly e2cd95d3f4] [formerly ae47d9683e] [formerly 48b6d45f00 [formerly ae47d9683e [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 52c7dec2e8 [formerly 0554abdde0] [formerly 22d12e35f7b0f5789a9dd62c8684fad371d63859 [formerly 3212cc6ebb]]
Former-commit-id: de90ce0a3f7817cfc15c75089e7f6a081fef0acc [formerly 585e979c76]
Former-commit-id: ae389f0b57
2012-03-01 16:59:40 -06:00
Max Schenkelberg
fe1811c167 Issue #358 Committing NPP core rendering improvements merged with Thin
Client core improvements

Former-commit-id: 48b6d45f00 [formerly ae47d9683e [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]
Former-commit-id: ae47d9683e
Former-commit-id: e2cd95d3f4
2012-03-01 16:59:40 -06:00
Max Schenkelberg
ae47d9683e Issue #358 Committing NPP core rendering improvements merged with Thin
Client core improvements

Former-commit-id: 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6
2012-03-01 16:59:40 -06:00
Steve Harris
4ee0ec25ea Merge branch 'ss_sync' into sync_test
Former-commit-id: 994e79cfb3 [formerly 3b9c3e3474] [formerly 951ecfe3dd] [formerly 994e79cfb3 [formerly 3b9c3e3474] [formerly 951ecfe3dd] [formerly 787aed90f8 [formerly 951ecfe3dd [formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]]]]
Former-commit-id: 787aed90f8
Former-commit-id: 6fdae68267 [formerly b3f831a7b4] [formerly 64c60f8d4b42c0f811914474c3baf46e1940786e [formerly db45babec8]]
Former-commit-id: 840d838fc0fb5c246c5a324aa5695ebb80f9cd44 [formerly 376edad3c9]
Former-commit-id: cdc4d1cb44
2012-03-01 14:01:16 -06:00
Steve Harris
994e79cfb3 Merge branch 'ss_sync' into sync_test
Former-commit-id: 787aed90f8 [formerly 951ecfe3dd [formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]]
Former-commit-id: 951ecfe3dd
Former-commit-id: 3b9c3e3474
2012-03-01 14:01:16 -06:00
Steve Harris
951ecfe3dd Merge branch 'ss_sync' into sync_test
Former-commit-id: 7ebcf63686d75d58f8bfea92e825edaf49a30df1
2012-03-01 14:01:16 -06:00
David Gillingham
ac4ffd696c Issue #20: Fix breakage to alertViz caused by changes to
FileUtil.join().

Former-commit-id: 33b41f1b0e [formerly 6a2b7e12d6] [formerly c6803ba434] [formerly 33b41f1b0e [formerly 6a2b7e12d6] [formerly c6803ba434] [formerly 8a45f1f4c3 [formerly c6803ba434 [formerly 8832c64ba47f87027d5215caf7d84b9fc6a187cd]]]]
Former-commit-id: 8a45f1f4c3
Former-commit-id: d5779b3101 [formerly 234801c998] [formerly 2791eec232ac17fe9ced7b27957c3b17a5fe3742 [formerly 953f8a6535]]
Former-commit-id: 3e1e2877c3fb4b37bf9840c3ddda1c204a84b956 [formerly ad5601c5ec]
Former-commit-id: 1d48986042
2012-03-01 11:19:22 -06:00
David Gillingham
33b41f1b0e Issue #20: Fix breakage to alertViz caused by changes to
FileUtil.join().

Former-commit-id: 8a45f1f4c3 [formerly c6803ba434 [formerly 8832c64ba47f87027d5215caf7d84b9fc6a187cd]]
Former-commit-id: c6803ba434
Former-commit-id: 6a2b7e12d6
2012-03-01 11:19:22 -06:00
David Gillingham
c6803ba434 Issue #20: Fix breakage to alertViz caused by changes to
FileUtil.join().

Former-commit-id: 8832c64ba47f87027d5215caf7d84b9fc6a187cd
2012-03-01 11:19:22 -06:00
Ben Steffensmeier
029c938b45 Issue #353 add logic to syncronize times for thin client data updates..
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1

Former-commit-id: 07d98eb7dc [formerly 56d97c95d5] [formerly 5c303ed189] [formerly 07d98eb7dc [formerly 56d97c95d5] [formerly 5c303ed189] [formerly c61e40c426 [formerly 5c303ed189 [formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]]]]
Former-commit-id: c61e40c426
Former-commit-id: cc8e7897cf [formerly 390700efb0] [formerly bc3ac83b421a21ffdbc670c12096f7c96ca7c87f [formerly 84e6c9beb8]]
Former-commit-id: d164073f91d0b2a6b493c5bba3ad3cafd728023d [formerly 588432f980]
Former-commit-id: da7275d80b
2012-02-29 15:49:47 -06:00
Ben Steffensmeier
07d98eb7dc Issue #353 add logic to syncronize times for thin client data updates..
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1

Former-commit-id: c61e40c426 [formerly 5c303ed189 [formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]]
Former-commit-id: 5c303ed189
Former-commit-id: 56d97c95d5
2012-02-29 15:49:47 -06:00
Ben Steffensmeier
5c303ed189 Issue #353 add logic to syncronize times for thin client data updates..
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1

Former-commit-id: f94248823eed52b2d9f8c56af3dc7607b323fc1e
2012-02-29 15:49:47 -06:00
Steve Harris
85d3d96d4c Merge branch 'ss_sync' into 9-Wes2Bridge
Conflicts:
	.gitignore
	ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java

deleted h5 files
using ss_sync version of java files


Former-commit-id: 6d01784115 [formerly 24059a5b4e] [formerly 9b67525e95] [formerly 6d01784115 [formerly 24059a5b4e] [formerly 9b67525e95] [formerly e5b56c99ab [formerly 9b67525e95 [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]]]
Former-commit-id: e5b56c99ab
Former-commit-id: 2dbdc945bf [formerly 73a337bc31] [formerly 6a444fc4fae979713c005a8d9737369a6bcbce84 [formerly 40d7357165]]
Former-commit-id: 9ad2c540c010a2b27f18bb9c98356065c7663bd2 [formerly 21f12bae82]
Former-commit-id: f8ae79c35c
2012-02-27 15:58:49 -06:00
Steve Harris
6d01784115 Merge branch 'ss_sync' into 9-Wes2Bridge
Conflicts:
	.gitignore
	ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java

deleted h5 files
using ss_sync version of java files


Former-commit-id: e5b56c99ab [formerly 9b67525e95 [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]
Former-commit-id: 9b67525e95
Former-commit-id: 24059a5b4e
2012-02-27 15:58:49 -06:00
Steve Harris
9b67525e95 Merge branch 'ss_sync' into 9-Wes2Bridge
Conflicts:
	.gitignore
	ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java

deleted h5 files
using ss_sync version of java files


Former-commit-id: fb9d0adece5806382d0aa5c7c3e7c41f89594143
2012-02-27 15:58:49 -06:00