xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4644 commits 31 branches 40 tags 3.8 GiB
Commit graph

4644 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Gonzales
e906d71ac4 Issue #2771 For Data Delivery CAVE now request current id from 
the registry EDEX.  Added DATA_DELIVERY_ID to environment that is used instead
of site id for identification when participating in the federation
and subscription identification.

Amend: Created common data delivery package com.raytheon.uf.edex.datadelivery. Moved DataDeliveryIdUtil there.
       Created ClusterIdUtil.  DataDeliveryIdUtil uses that utility.  It also verifies the id against the awips sites.
       Changed centralRegistry.sh to  set CLUSTER_ID to NCF.
       Handle cases where site id is HAK or HUS.
       Check for empty id setting in Cluster ID Util.
       Return full id for Data Delivery ID.
       Simplify Data Delivery ID and return Cluster ID.

Change-Id: Iee140b5626e1962217cca2deb6d1483ebf265911

Former-commit-id: 1d57e9f5f7 [formerly 379c0fb46c] [formerly 19460ed0d7] [formerly 1d57e9f5f7 [formerly 379c0fb46c] [formerly 19460ed0d7] [formerly ba4e308328 [formerly 19460ed0d7 [formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]]]]
Former-commit-id: ba4e308328
Former-commit-id: ae35320dd6 [formerly 1b76488111] [formerly eab08c6056f77a408245754e016c16a1db9d08f4 [formerly 3be3380944]]
Former-commit-id: 367c8f66061868a52d255ea46c57bb8c2dc11b5f [formerly 9aa1cb299e]
Former-commit-id: b0421675ff
 2014-02-18 11:10:44 -06:00
Nate Jensen
8e8e9141e7 Issue #2704 fix alertviz connectivity checks 
Former-commit-id: 742217ded0 [formerly 0160ab0464] [formerly 0c4de50218] [formerly 742217ded0 [formerly 0160ab0464] [formerly 0c4de50218] [formerly 4d68994525 [formerly 0c4de50218 [formerly adfb9c293456aeced60e3ab41575d8b3b0f635b8]]]]
Former-commit-id: 4d68994525
Former-commit-id: 60fd298721 [formerly 121bcd184a] [formerly 4ab3a27b137394410a2b8da012bfe21a237dd4b6 [formerly 228ab8dd60]]
Former-commit-id: 38e7719aa70d69e4f2268ba3d82ba8df10a7cace [formerly 944df080f4]
Former-commit-id: 0dd9cd1094
 2014-02-17 17:10:07 -06:00
Nate Jensen
9c67149bf9 Issue #2812 made getHostname() use getWsId().getHostname for consistency 
and working on windows


Former-commit-id: 34c7c3cba1 [formerly c8e70cd6b1] [formerly 15ff4ab5d7] [formerly 34c7c3cba1 [formerly c8e70cd6b1] [formerly 15ff4ab5d7] [formerly 2486e39192 [formerly 15ff4ab5d7 [formerly 6e020ed9403fcd2e1c27ed9ab8443497ba645933]]]]
Former-commit-id: 2486e39192
Former-commit-id: 62739b7936 [formerly b801b36ca7] [formerly 961e5c0a4aa129e13bdd51a1f6be5cc7caf172c0 [formerly 0314d61773]]
Former-commit-id: 991546c580399668225c99bbb7a4506b93bf17d6 [formerly e6dae7a23c]
Former-commit-id: 695d03b815
 2014-02-17 11:58:04 -06:00
Nate Jensen
0bca06ef1a Issue #2813 fix xml serialization of subscriptions 
Former-commit-id: e42eb1940d [formerly 4583814741] [formerly 81da42a36a6b3a653ef59de2dc4ec5fb3158386f [formerly be75cc3731]] [formerly e42eb1940d [formerly 4583814741] [formerly 81da42a36a6b3a653ef59de2dc4ec5fb3158386f [formerly be75cc3731]] [formerly 83e9226419 [formerly be75cc3731 [formerly 2f4d702c247d8c0f433f44cf65b25e884ff0d5ba]]]]
Former-commit-id: 83e9226419
Former-commit-id: fd8e2126b1 [formerly e9bbdfdf89] [formerly 814fc7ae6232206fb29b52f95a6d3c32f51b62c5 [formerly 30bbc788ce]]
Former-commit-id: 97227c6baf4c9b880f984a88d56c645160f85e93 [formerly 39b3824ae3]
Former-commit-id: c6b270f084
 2014-02-17 11:37:48 -06:00
Steve Harris
a5d78a7f44 Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 1b7e02636d [formerly d0352c69d4] [formerly 267cc881a4] [formerly 1b7e02636d [formerly d0352c69d4] [formerly 267cc881a4] [formerly 9fcc5ad930 [formerly 267cc881a4 [formerly a494febee5f45d211797843d56077ac0ef358dbf]]]]
Former-commit-id: 9fcc5ad930
Former-commit-id: 1fbbb6e73f [formerly 146412a8bd] [formerly 4c759335f64413680ab7d7fe1fc420d460dacc98 [formerly e115197bb7]]
Former-commit-id: 3a7d7a0e21b09081b233b6aa8dcf49e018ef8486 [formerly 28aa3dd195]
Former-commit-id: 7805eac857
 2014-02-17 08:54:34 -06:00
Ron Anderson
8a3fa8f03e Merge "Issue #2528 Fix display of data on somewhat identical projections. Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26" into omaha_14.2.1 
Former-commit-id: 4b2981b74f [formerly ce8d59e075] [formerly fae824482b] [formerly 4b2981b74f [formerly ce8d59e075] [formerly fae824482b] [formerly 769c56bf08 [formerly fae824482b [formerly ddb195c3032b80221e63f21eb113eaab5d50b124]]]]
Former-commit-id: 769c56bf08
Former-commit-id: facdf2b779 [formerly 8434f5cc65] [formerly 3283dd7794029e5cfa8c585c129c8e58899e8c04 [formerly 29e24081a6]]
Former-commit-id: 667f4a40a90358e21feeac640544b0572c5aca54 [formerly f4d0632cb2]
Former-commit-id: 7972a652b0
 2014-02-17 08:56:48 -06:00
Mike Duff
8f8300320c Issue #2806 - Disable activate/deactivate buttons when viewing subscriptions from another site. 
Former-commit-id: b34c9eedd0 [formerly 43ea3b0918] [formerly ac62d322ed] [formerly b34c9eedd0 [formerly 43ea3b0918] [formerly ac62d322ed] [formerly 346dc4afff [formerly ac62d322ed [formerly a2dcb434e8d72e0046c6af9900e0abd093f9bcbc]]]]
Former-commit-id: 346dc4afff
Former-commit-id: fad65749a8 [formerly 6601dff483] [formerly 2be8bfeadfd1af814a97057e7cfe23152263de88 [formerly 5b3a55d11f]]
Former-commit-id: 3add04f6f2835f888f0452d213544d97cca8f1c0 [formerly c5f33b0ed0]
Former-commit-id: fe38928d33
 2014-02-14 08:53:40 -06:00
Ben Steffensmeier
f686048ddc Issue #2528 Fix display of data on somewhat identical projections. 
Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26

Former-commit-id: 94f0b52344 [formerly 2b30269ac9] [formerly 54a17c012d] [formerly 94f0b52344 [formerly 2b30269ac9] [formerly 54a17c012d] [formerly 23694f5e0c [formerly 54a17c012d [formerly dfd408bdf6b4648ca9cd54fb12ed26f5ce8272aa]]]]
Former-commit-id: 23694f5e0c
Former-commit-id: bc38342841 [formerly be00537d6d] [formerly 9216d693916f99cccb2708677c47ef641c0cf7d1 [formerly bedf3cf45d]]
Former-commit-id: d7ddd5a4a6a966a25cee41eb29c97f5337897152 [formerly c8feeebbbd]
Former-commit-id: 1e96945cb8
 2014-02-13 13:27:32 -06:00
Ron Anderson
52aac6e855 Merge "Issue #2788 Fix topo for large areas." into omaha_14.2.1 
Former-commit-id: ce72867ab9 [formerly 21e95cc2f0] [formerly 51c9d27a39] [formerly ce72867ab9 [formerly 21e95cc2f0] [formerly 51c9d27a39] [formerly 42fd9c8f9a [formerly 51c9d27a39 [formerly 10bbf4bf6e5be7ff8bb138113991f7292a3390b1]]]]
Former-commit-id: 42fd9c8f9a
Former-commit-id: c2e56111c1 [formerly ca11555427] [formerly c5382d8fbd02ce98c80e76cb3bcd2d718cfc584a [formerly b84a83eb6f]]
Former-commit-id: 038e150875b793ce7a2afd8a7cfae08a2e921c3f [formerly 828738b81f]
Former-commit-id: 3598139635
 2014-02-13 10:46:27 -06:00
Ron Anderson
86f067bac9 Issue #2788 Fix topo for large areas. 
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 69ee4792ad [formerly 3e78908bb5] [formerly fcf45916f4] [formerly 69ee4792ad [formerly 3e78908bb5] [formerly fcf45916f4] [formerly 2f067699f2 [formerly fcf45916f4 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]]
Former-commit-id: 2f067699f2
Former-commit-id: 4d8ebf6712 [formerly d9b82b4ebe] [formerly 3ebfa79176cc7f3e52da6c61f6bee73013042f0c [formerly 2d7c87ac84]]
Former-commit-id: d0c2bdea1752a1aeb905c70a45c12e3d9bda80dc [formerly d298aabe40]
Former-commit-id: 7447a71c10
 2014-02-13 10:10:34 -06:00
Lee Venable
06eb20431a Issue #2773 - added code to help prevent eclipse bug from occurring. 
Former-commit-id: 328aebb4a6 [formerly 8073fd22b1] [formerly 7099472204] [formerly 328aebb4a6 [formerly 8073fd22b1] [formerly 7099472204] [formerly ce08022db7 [formerly 7099472204 [formerly 7b3700b5ad07c677755844f969b5c31f31be138b]]]]
Former-commit-id: ce08022db7
Former-commit-id: c17a417cbe [formerly a7302a3232] [formerly 1b4a9c2bf36e763585bfbc84e3a5a6ce5dbd03e0 [formerly c74ae6b83d]]
Former-commit-id: cd29c83d449fdcaba1122415142340d3b6f1881f [formerly 5ae2a544ca]
Former-commit-id: 3a195bd22e
 2014-02-12 13:47:20 -06:00
Ron Anderson
303a1b1786 Merge "Issue #2719 Update NHA GFE domain" into omaha_14.2.1 
Former-commit-id: cf7281ba3c [formerly 8ba331e7fb] [formerly af4f8de839] [formerly cf7281ba3c [formerly 8ba331e7fb] [formerly af4f8de839] [formerly d906b780e8 [formerly af4f8de839 [formerly caf31f2a88227c7ed9141676feb937822f4d03ce]]]]
Former-commit-id: d906b780e8
Former-commit-id: e0403fd81d [formerly 2fdcef7338] [formerly 33d7dc6d66fee245851700ef94b840f31e915bc0 [formerly 361881dfda]]
Former-commit-id: 64ebb3c14ee6f0c360a86bff0fcf037a49b4d01a [formerly 2e1f7c8199]
Former-commit-id: 79a635bc9e
 2014-02-11 17:16:07 -06:00
Ron Anderson
3d1cd70b57 Issue #2719 Update NHA GFE domain 
Change-Id: I081aef85ca4133addfc203473af5c53679c12d1c

Former-commit-id: 0b73d0703e [formerly 0f9b44ff94] [formerly a665530831] [formerly 0b73d0703e [formerly 0f9b44ff94] [formerly a665530831] [formerly ee89463d27 [formerly a665530831 [formerly 28008b46b5d68e544dace5f721b283c222701699]]]]
Former-commit-id: ee89463d27
Former-commit-id: 07fdb410c6 [formerly 1ca9c95567] [formerly 92ba98108868529a68af7962661c0c08a1eade14 [formerly bfa65ed39e]]
Former-commit-id: 738332a4bfc2ad7f86c63c6827a2be4e66627c41 [formerly dd597e8349]
Former-commit-id: 454ce0268d
 2014-02-11 17:07:01 -06:00
Ben Steffensmeier
ee421748c3 Issue #2765 Fix aliases for probability parameters. 
Former-commit-id: 89d47e3243 [formerly 2952ae37a6] [formerly 43a8b80ef2] [formerly 89d47e3243 [formerly 2952ae37a6] [formerly 43a8b80ef2] [formerly 0bb18f2cd7 [formerly 43a8b80ef2 [formerly 11bbfb8275cfafb411d1d5d9732b021f0011712a]]]]
Former-commit-id: 0bb18f2cd7
Former-commit-id: be4d0f1c88 [formerly c0dbdb9906] [formerly 63b3cde2a263f269c8044495d613aae2f31b7980 [formerly eb9c4ef999]]
Former-commit-id: fa23535348a4984a61c61d93acbf80e9954fa499 [formerly 8a4c3686f8]
Former-commit-id: d69ac764db
 2014-02-11 11:35:03 -06:00
Lee Venable
bd92b85084 Merge "Issue #2704 smarter thin client connectivity dialog and connection checking" into omaha_14.2.1 
Former-commit-id: 6773d174ec [formerly c7cfd49622] [formerly 5c256dc19c] [formerly 6773d174ec [formerly c7cfd49622] [formerly 5c256dc19c] [formerly f078971b5d [formerly 5c256dc19c [formerly c75877624ab414c1a45bc7326c49aa99c8ec3021]]]]
Former-commit-id: f078971b5d
Former-commit-id: f8ae04bce2 [formerly ab6fab4199] [formerly fb3d041cae5b972726c8f92403f7ef7c6570c7bf [formerly 42fdfa4964]]
Former-commit-id: fbc5baf5f9b34b3a8ed1c177ca437f4840d40632 [formerly 22aab74e8d]
Former-commit-id: c1543acd86
 2014-02-11 09:15:44 -06:00
Nate Jensen
aba5c50bfe Issue #2704 smarter thin client connectivity dialog and connection 
checking

Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af

Former-commit-id: 24bbf4949d [formerly c28085118f] [formerly 75ca70fba6] [formerly 24bbf4949d [formerly c28085118f] [formerly 75ca70fba6] [formerly fd43d9e095 [formerly 75ca70fba6 [formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]]]]
Former-commit-id: fd43d9e095
Former-commit-id: 1dcb3a77c3 [formerly c0256ac19e] [formerly d828ad996a7bd8eb159d4cd60c7b851fc8ac8486 [formerly 2111989497]]
Former-commit-id: 65cd03344892f0b8870a3dcdc9e97aa695e0a8e5 [formerly 9e09da8bb6]
Former-commit-id: 93a740106d
 2014-02-10 16:48:29 -06:00
Max Schenkelberg
75cde90e40 Issue #2680 fixed samplers in structs issues with GLSL spec. 
Change-Id: I2375e4c273f6cd340f253d71ae7eadc8ed9a38e9

Former-commit-id: 7de6ff30da [formerly 3c1fafe328] [formerly 7822511754] [formerly 7de6ff30da [formerly 3c1fafe328] [formerly 7822511754] [formerly a8a67634f9 [formerly 7822511754 [formerly 4f3635fc682c2a1746e188dac0f371676c9e0be9]]]]
Former-commit-id: a8a67634f9
Former-commit-id: 8ddc6b95e4 [formerly dd872433c7] [formerly a6667b70df86f17d8dea3939535e720a8767c67d [formerly e2e9eaaf35]]
Former-commit-id: 724e3e430da7d1dade1094fde0ea1cb4e6b99344 [formerly 9d6d418d48]
Former-commit-id: 560bc77a16
 2014-02-10 13:43:16 -06:00
Lee Venable
f41d73618d Merge "Issue #2453 - Notification Center refactor" into omaha_14.2.1 
Former-commit-id: b90abb03c1 [formerly d6fa79f1a7] [formerly 27be4297e6] [formerly b90abb03c1 [formerly d6fa79f1a7] [formerly 27be4297e6] [formerly 88a9d20316 [formerly 27be4297e6 [formerly 213ecfda92272947cda51d9c3d00b117a3d52a76]]]]
Former-commit-id: 88a9d20316
Former-commit-id: e9e5667274 [formerly 65e6fa1963] [formerly e7218f6aecd2d4898858f31ff591b76d092b3d14 [formerly d975dcf01e]]
Former-commit-id: 2aa0d25045e6db0c7585d4a56307a543da16bf81 [formerly 78df434dba]
Former-commit-id: 1a8f530d0d
 2014-02-10 11:50:07 -06:00
Nate Jensen
46442acd0f Merge "Issue #2211 Fix data mapped sampling." into omaha_14.2.1 
Former-commit-id: fb8ce8da65 [formerly d16d679809] [formerly 5c7c14a6c4] [formerly fb8ce8da65 [formerly d16d679809] [formerly 5c7c14a6c4] [formerly a48c1c6783 [formerly 5c7c14a6c4 [formerly 1ae3057ce4fbbb5e60b27cf21d75de72b7e00c3e]]]]
Former-commit-id: a48c1c6783
Former-commit-id: c65669a6bf [formerly 3047063c6e] [formerly 56b6cef3203d3700e7f7c9be8f7525f5d508e9c2 [formerly 57aa678883]]
Former-commit-id: 2745a51d0fadc11fe20353c3bf2ba06fabdef183 [formerly 9459523de9]
Former-commit-id: 2effa29507
 2014-02-10 09:53:41 -06:00
Ron Anderson
fa00f7d686 Merge "Issue #2509: Fix baseline merge breakage to ifpIMAGE." into omaha_14.2.1 
Former-commit-id: 40f316bcf8 [formerly 42850542af] [formerly 2170fb5615] [formerly 40f316bcf8 [formerly 42850542af] [formerly 2170fb5615] [formerly 0476a288db [formerly 2170fb5615 [formerly ec8c9e963137ec7b7201558c5ddd00d2affb3aa3]]]]
Former-commit-id: 0476a288db
Former-commit-id: bbd44e89ba [formerly 9e775c7d28] [formerly ab1744ee16b0c46f3fb2df37d047c16d38148eab [formerly 3cb44b9a12]]
Former-commit-id: 7765ad4ac343c6540933d6d51fdafed158f09f18 [formerly ec9713e4bc]
Former-commit-id: eadbc302b6
 2014-02-10 08:31:31 -06:00
Mike Duff
239b4a038f Issue #2453 - Notification Center refactor 
Former-commit-id: c20018d0ba [formerly 61c57d2254] [formerly eeb78f7f20] [formerly c20018d0ba [formerly 61c57d2254] [formerly eeb78f7f20] [formerly 2c9d603e50 [formerly eeb78f7f20 [formerly f570a3945ad8e9e8bc4f88989a0ec10da191856a]]]]
Former-commit-id: 2c9d603e50
Former-commit-id: b62abd4219 [formerly 7535b51fe7] [formerly 54e4296d2e02deec8772b1aa27026f2486ecd7da [formerly 4a87525df0]]
Former-commit-id: 22f20d75e586ec99c087bbc87cae6dd9e95f7f6d [formerly f005aa3d8d]
Former-commit-id: a87ce0b532
 2014-02-07 16:50:50 -06:00
Ben Steffensmeier
f2b9191863 Issue #2211 Fix data mapped sampling. 
Former-commit-id: e7baa5b186 [formerly d219a687c9] [formerly 724bb85676] [formerly e7baa5b186 [formerly d219a687c9] [formerly 724bb85676] [formerly 3d76d6655b [formerly 724bb85676 [formerly aec317f506eb940e843a0c3cf4ffa55a83eb186b]]]]
Former-commit-id: 3d76d6655b
Former-commit-id: 7f8ff5efc0 [formerly a37a910f67] [formerly 6fc70ed6daf823669783c4000e189cbb10a17f8d [formerly 6a95dd6242]]
Former-commit-id: 9362efc90ebebf4fffc157294abf0ea1f20992bc [formerly a8c075d7e3]
Former-commit-id: eb65002cf6
 2014-02-07 13:00:00 -06:00
David Gillingham
cc3256e77a Issue #2509: Fix baseline merge breakage to ifpIMAGE. 
Change-Id: Iff39a451b2d61c48fd3c77eda228f2812883ef00

Former-commit-id: dc8f0dde25 [formerly b12e29dd7c] [formerly 03d36b8309] [formerly dc8f0dde25 [formerly b12e29dd7c] [formerly 03d36b8309] [formerly e8ffc73893 [formerly 03d36b8309 [formerly 19e9a7f37409e37b378bf2f3eae0b9b16d797f65]]]]
Former-commit-id: e8ffc73893
Former-commit-id: 8cdf1ce158 [formerly ad8c40032f] [formerly bcf359e669db6d450eb89b007e4262c8f81e5b91 [formerly 94ec272ab2]]
Former-commit-id: 6d66a54db19d8e116fa26979efe8601acefd73a2 [formerly 06d68cc0be]
Former-commit-id: e20060f1da
 2014-02-07 09:51:42 -06:00
Brad Gonzales
304704a39d Issue #2636 Changed EdexBandwidthManager startup scheduling to use the 
in-memory bandwidth manager to setup initial scheduling because it
is much faster.

Amend: updated log statement.
       fix for rescheduling of already scheduled BandwidthAllocations.

Change-Id: I5c6d6543bce8222cb746fde2951caf6439db5fa3

Former-commit-id: c275da6725 [formerly 9529c1d191] [formerly 0524d3ea53181abcebe32d0fb47e14ba77359c86 [formerly 9c50fb29fd]] [formerly c275da6725 [formerly 9529c1d191] [formerly 0524d3ea53181abcebe32d0fb47e14ba77359c86 [formerly 9c50fb29fd]] [formerly 704e466f28 [formerly 9c50fb29fd [formerly f1a4a7b24290b6e85380668563793ac529fc5b31]]]]
Former-commit-id: 704e466f28
Former-commit-id: e57abad188 [formerly b59278f73f] [formerly fce69a5a63e582579ba583e885690b5aed2ab58f [formerly 0b211e8036]]
Former-commit-id: ce3bd1dae0d4336304304ae2262d659cba06e09c [formerly 104625b66d]
Former-commit-id: a8256a5202
 2014-02-07 09:35:36 -06:00
Ben Steffensmeier
58cdbe5b37 Issue #2762 Fix Satellite Data Access. 
Former-commit-id: 89105e1257 [formerly a26a150a69] [formerly 2166b5b696] [formerly 89105e1257 [formerly a26a150a69] [formerly 2166b5b696] [formerly ed2c1a0329 [formerly 2166b5b696 [formerly 4016e9366e8917225777b079da4b94dd1e6fde4a]]]]
Former-commit-id: ed2c1a0329
Former-commit-id: 7954587c40 [formerly 270433f5f3] [formerly 7fbc07009858ae2446c648b08c7b4a17103a905c [formerly e7662de8db]]
Former-commit-id: 4bfd34ac775c1575790378406f289cb7e821653f [formerly ad709c9692]
Former-commit-id: b6a5148b42
 2014-02-06 13:53:44 -06:00
Mike Duff
e5a2e9c6d2 Issue #2636 - Fix for ncf spring config 
Former-commit-id: e69e8c4615 [formerly 3707a4eabd] [formerly 3f7defe563] [formerly e69e8c4615 [formerly 3707a4eabd] [formerly 3f7defe563] [formerly e84ae26421 [formerly 3f7defe563 [formerly 4308e8a45d61e9d6a67b6036e98ff1b8886d86f6]]]]
Former-commit-id: e84ae26421
Former-commit-id: a63fdead0c [formerly 9ec273fdcc] [formerly d951ae7e0460f11e17e732248e01e37ce6a521fa [formerly 6210a6aa18]]
Former-commit-id: 4baf28cf015acd819e9c7ef99bf29aae41b460c7 [formerly af8013baa7]
Former-commit-id: c9f53e2346
 2014-02-06 09:29:20 -06:00
Richard Peter
1956e06576 Merge "Issue #2677 - Don't do overlap checks when updating subs to deactivated." into omaha_14.2.1 
Former-commit-id: 8ad3c5857b [formerly 82fc0a2ed3] [formerly 64f0cabaef] [formerly 8ad3c5857b [formerly 82fc0a2ed3] [formerly 64f0cabaef] [formerly 36d3d21b57 [formerly 64f0cabaef [formerly daacb19de029a15f94338c84a85116d0435f79be]]]]
Former-commit-id: 36d3d21b57
Former-commit-id: 5a7e7af23b [formerly c3c1205848] [formerly 15e05c73cb80bc97c2edc96c60ee1065b9f736b4 [formerly c965993d17]]
Former-commit-id: 34784310173da5accc225bf38ea0abccf3c639e4 [formerly 15c2f761be]
Former-commit-id: 8471e5dd46
 2014-02-05 18:20:36 -06:00
Mike Duff
6f00321a11 Issue #2677 - Don't do overlap checks when updating subs to deactivated. 
Change-Id: Ia974111d9810f27ef2b073304cd248de292275bd

Former-commit-id: 3691146e34 [formerly bafe19bbd5] [formerly 101c08818d] [formerly 3691146e34 [formerly bafe19bbd5] [formerly 101c08818d] [formerly 6b01c2957f [formerly 101c08818d [formerly 2e406f02b0abbdeee0f553df430f5a58977d9af2]]]]
Former-commit-id: 6b01c2957f
Former-commit-id: 229efa7c5b [formerly 9edf591218] [formerly c5c924842a196e06e1a50bd0c39e0bc05f4fb139 [formerly 6a2f75e8d5]]
Former-commit-id: 48997d15c589f0dd6cb352af2ea838edf7a6e2dd [formerly bb43ec00b1]
Former-commit-id: 377beb33a8
 2014-02-05 16:08:01 -06:00
Richard Peter
e94660bed9 Merge "Issue #2722 - Add auto refresh to sub manager dialog" into omaha_14.2.1 
Former-commit-id: 0ebd0009e5 [formerly d1546d42ce] [formerly 7e69f192a5] [formerly 0ebd0009e5 [formerly d1546d42ce] [formerly 7e69f192a5] [formerly 882544fec5 [formerly 7e69f192a5 [formerly 1e91683c1df918a7405c2f847a6dc7397dbcc473]]]]
Former-commit-id: 882544fec5
Former-commit-id: f4e9afceee [formerly 963fb37e6c] [formerly 29ff8293b807402f79b124b428ec48ebeb5fb99e [formerly 945bcd895c]]
Former-commit-id: ff10958606ea091de1602c98af8922163f4d5379 [formerly db4783afa4]
Former-commit-id: 127ce1f397
 2014-02-05 14:57:16 -06:00
Dave Hladky
36bc408bc2 Issue #2686 Refactor of retrieval 
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558

Former-commit-id: 1c8f6fb36d [formerly 7fb7e10cda] [formerly 6172c83afc] [formerly 1c8f6fb36d [formerly 7fb7e10cda] [formerly 6172c83afc] [formerly 39f97723d6 [formerly 6172c83afc [formerly 0b85e00cecdca6c5dcb6deee138f1a002515ac3c]]]]
Former-commit-id: 39f97723d6
Former-commit-id: 14f2c99e46 [formerly 39f5579103] [formerly d5d37d7b55d86fa82a363075d901e0a1583e45de [formerly 2b998409f5]]
Former-commit-id: d275e71a9e574bd23d396da26d9a5eaa6435dea7 [formerly 8e2eb4d255]
Former-commit-id: 59590fdf36
 2014-02-05 14:49:26 -06:00
Steve Harris
c64e6a75da Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 66e76b7de6 [formerly 1dbc316078] [formerly f24bc49703] [formerly 66e76b7de6 [formerly 1dbc316078] [formerly f24bc49703] [formerly 74c87b95c3 [formerly f24bc49703 [formerly cee2e11f4b3d74bee3ab254267f156a846801087]]]]
Former-commit-id: 74c87b95c3
Former-commit-id: d8f7d14d95 [formerly 4cab7709ec] [formerly b16ae4f42a3b6d0b7ffd0b0b6cace39fdfd151b8 [formerly ab294b7652]]
Former-commit-id: de50906aaf29d067b26a049403c828e1dad195ce [formerly 41f8fd08d2]
Former-commit-id: a76e3cf17b
 2014-02-05 09:12:40 -06:00
Richard Peter
793aabd17e Merge "Issue #2636 - Scheduling refactor. Single scheduling method now. Review comments" into omaha_14.2.1 
Former-commit-id: 176bee122b [formerly 21b0a87d78] [formerly 8f844bc9ce] [formerly 176bee122b [formerly 21b0a87d78] [formerly 8f844bc9ce] [formerly e5af004993 [formerly 8f844bc9ce [formerly a2536c180f68e5ea970e3406e3ef1f899650f3e2]]]]
Former-commit-id: e5af004993
Former-commit-id: 0c66686f19 [formerly d3f13fc4c7] [formerly 221df5c8f19958cdb7f96c8c47eb4903283decbe [formerly 4309c55a5f]]
Former-commit-id: cd20d2699e4537618b026ece7d62e0cb6723221f [formerly 1b8aacc92f]
Former-commit-id: 1aaeaf0037
 2014-02-04 18:12:48 -06:00
Brian.Dyke
90edefdb00 Issue #224 
Former-commit-id: cd80c22b5c [formerly ed476a583f] [formerly 3f86a80d7e] [formerly cd80c22b5c [formerly ed476a583f] [formerly 3f86a80d7e] [formerly dad6f2896b [formerly 3f86a80d7e [formerly 043faa447b4fc15a996dfe6108093bed5f1b6497]]]]
Former-commit-id: dad6f2896b
Former-commit-id: 896375c47b [formerly 17e3464377] [formerly 70f7b0213878f981680926bd20a81de54dadf205 [formerly 610cf76a29]]
Former-commit-id: 24eddc155397c6806dc89bb2fd48417fee4403c3 [formerly 6e57eae922]
Former-commit-id: a9af4960f0
 2014-02-04 17:05:12 -05:00
Brian.Dyke
99b2a226bc Issue #124 
Former-commit-id: 6d35a4b1bc [formerly 3ba93b175e] [formerly 439f053309] [formerly 6d35a4b1bc [formerly 3ba93b175e] [formerly 439f053309] [formerly 0cc11ddfd3 [formerly 439f053309 [formerly e192f01952d7779f03db819c0a04aa7f6cd0c88e]]]]
Former-commit-id: 0cc11ddfd3
Former-commit-id: d274021768 [formerly e1d788683d] [formerly 1e605ca4a47aef453131de36960bb5a057128099 [formerly 90b4e7ebf0]]
Former-commit-id: 5a34ed2e1d56f086517b4572c3b7029b51000d64 [formerly ff2ccb40e4]
Former-commit-id: 4b9bccad66
 2014-02-04 16:56:47 -05:00
Brian.Dyke
aab63d8758 Issue #179 
Former-commit-id: ea0a5bebfd [formerly 6b3ebc4fef] [formerly a0626cdc00] [formerly ea0a5bebfd [formerly 6b3ebc4fef] [formerly a0626cdc00] [formerly b23c6f59f7 [formerly a0626cdc00 [formerly d8f5c94fdc7a3332293e24c5e59d1d7177a5fcd9]]]]
Former-commit-id: b23c6f59f7
Former-commit-id: 9ec4a820d2 [formerly 2955d5c9f0] [formerly 8058c8a62e584fe650039e4e4c28cf04d7762dbc [formerly 6d58d8c016]]
Former-commit-id: b05a7a4faaca4fe7c20692df3b825b74112613e7 [formerly 5ac5774552]
Former-commit-id: cc4a735533
 2014-02-04 16:53:34 -05:00
Brian.Dyke
f1e47c71e6 Issue #131 
Former-commit-id: fc1aa5076a [formerly dea5f087d3] [formerly bd5db64b5b] [formerly fc1aa5076a [formerly dea5f087d3] [formerly bd5db64b5b] [formerly 35b25ee2a9 [formerly bd5db64b5b [formerly 4167f33801ee2450502231438955e72c4428fbcc]]]]
Former-commit-id: 35b25ee2a9
Former-commit-id: 62b86ef345 [formerly 6882fc8d52] [formerly d654aee4c9b0ffe10c4a2fc5e721d01175827f46 [formerly 4701088670]]
Former-commit-id: fd1f65e5f7267bcd6fc2575e9769fb6fd7418b7d [formerly 41b079e7fe]
Former-commit-id: d099529ef7
 2014-02-04 16:36:11 -05:00
Brian.Dyke
97bf17521e Issue #88 
Former-commit-id: 6510e6da5a [formerly d56bdce6ff] [formerly 643ef1a1a6] [formerly 6510e6da5a [formerly d56bdce6ff] [formerly 643ef1a1a6] [formerly edccef5569 [formerly 643ef1a1a6 [formerly 66a1b2ba9933754b0d6d0324108268563e6381bc]]]]
Former-commit-id: edccef5569
Former-commit-id: 9cf763cd13 [formerly cdb408daf8] [formerly 99d3c8608feda52225fe2dd85b896e03bfe99a30 [formerly a5606c86c7]]
Former-commit-id: 4ab0b8424f27ebdbb06be07987bd8f71c6cdee8a [formerly 83ebe8826f]
Former-commit-id: 904ffbd83e
 2014-02-04 16:34:40 -05:00
Brian.Dyke
2bc1fcbaa2 Issue #83 
Former-commit-id: 89422cef7c [formerly f2e56b268c] [formerly 484119f6b0] [formerly 89422cef7c [formerly f2e56b268c] [formerly 484119f6b0] [formerly fb15dd5dfb [formerly 484119f6b0 [formerly 93c3c9057bc68d7a4c436d433a629200663d9eeb]]]]
Former-commit-id: fb15dd5dfb
Former-commit-id: 8e78870c71 [formerly 3c160bb05e] [formerly 75d1cbbdb2e42e3d0ad9d5112f388174acbf50f1 [formerly f088dab5ef]]
Former-commit-id: 799ac9274e6dd53615f019c76b975281bd597c94 [formerly 870b355263]
Former-commit-id: 42e17bf5f3
 2014-02-04 16:32:42 -05:00
Mike Duff
451406c3c5 Issue #2636 - Scheduling refactor. Single scheduling method now. 
Review comments

Change-Id: I4d1e7c171504a8a6f97d4660bf165857dd6e7e58

Former-commit-id: 75faeae7e4 [formerly 2ca26aaa39] [formerly eee642ac9b] [formerly 75faeae7e4 [formerly 2ca26aaa39] [formerly eee642ac9b] [formerly eb46191ba9 [formerly eee642ac9b [formerly fc9ed661c3fe3ca75d30d8df414b5d1cd5725613]]]]
Former-commit-id: eb46191ba9
Former-commit-id: b7b0bdbfdd [formerly 38aeb23274] [formerly faacb82cc4cbe77a20073a957c9af17454152fba [formerly 684390e599]]
Former-commit-id: 9ebb64c46709c9a6c6431598e44ae990be200fb2 [formerly e8dea0d0dc]
Former-commit-id: bd52f67e0c
 2014-02-04 14:01:29 -06:00
Mike Duff
a67dbae2a2 Issue #2722 - Add auto refresh to sub manager dialog 
Former-commit-id: 8d92217e94 [formerly 227eb23157] [formerly 04ee397f2b] [formerly 8d92217e94 [formerly 227eb23157] [formerly 04ee397f2b] [formerly ab9621698f [formerly 04ee397f2b [formerly f678a39b37040bd637cf210f73aaef0841bda36e]]]]
Former-commit-id: ab9621698f
Former-commit-id: e1023f0bc4 [formerly f7566298b2] [formerly 81c8a2b9d2b37711be589b2c809d03532ae8c45f [formerly e984863c1c]]
Former-commit-id: ceb81e0f4adc6721ecab300474a9f86d1762a8f0 [formerly bb919f7d09]
Former-commit-id: 267f0aac0b
 2014-02-04 12:45:33 -06:00
Richard Peter
40d238a75d Merge "Issue #2769 Removed aggressive Hibernate session flushes" into omaha_14.2.1 
Former-commit-id: 57402adccf [formerly fe3963680d] [formerly 844f05e1ef] [formerly 57402adccf [formerly fe3963680d] [formerly 844f05e1ef] [formerly fb8d982ede [formerly 844f05e1ef [formerly b2edf70f6d9404ed4963ee874c3e03d13bf49303]]]]
Former-commit-id: fb8d982ede
Former-commit-id: ce1a2a4d41 [formerly 99a7c7afd7] [formerly 0677f3bc83b286eb0c5ade27ab8b03f8176edc41 [formerly 4c361f2cff]]
Former-commit-id: 627167a7cf4faec7404367f5342c4483c5b26526 [formerly 05a1e52357]
Former-commit-id: a7b90d781a
 2014-02-04 12:22:19 -06:00
Benjamin Phillippe
af03234dcc Issue #2769 Removed aggressive Hibernate session flushes 
Change-Id: Idaeb3ecf0a62cc586ed34525260034cd89e96216

Former-commit-id: 5de996ac4a [formerly 3f4b92fffb] [formerly 1691c5a3ff] [formerly 5de996ac4a [formerly 3f4b92fffb] [formerly 1691c5a3ff] [formerly fc589ed84d [formerly 1691c5a3ff [formerly 0440395a596d13bf8b4f1dda4857c185c6c8afa5]]]]
Former-commit-id: fc589ed84d
Former-commit-id: 1e0a1a6df8 [formerly 20d26dc5a0] [formerly b3183ec5423ee6e72bab494f9fa0adc8a517ca47 [formerly cdaa7e32b4]]
Former-commit-id: f65125400771d978a456076f39fe1ff9b3529402 [formerly 01def4be4a]
Former-commit-id: d4adefdad8
 2014-02-04 10:24:11 -06:00
Richard Peter
b95510d738 Merge "Issue #2745 - Don't display fulfilled or cancelled allocations" into omaha_14.2.1 
Former-commit-id: fa634d77b5 [formerly fb67e4410a] [formerly 995e0c538a] [formerly fa634d77b5 [formerly fb67e4410a] [formerly 995e0c538a] [formerly e16212d24d [formerly 995e0c538a [formerly d68e99735aab51fa7a5f335534e89141ba00c890]]]]
Former-commit-id: e16212d24d
Former-commit-id: e2318c4551 [formerly 2df813c4b8] [formerly ee4f89c3e6bfc050a32608777f71f81957dfbb43 [formerly 75ad3f3d2a]]
Former-commit-id: 59f3d59519a8a0c3a1c7efdb3a60d780b700707f [formerly b773518f3a]
Former-commit-id: d297b0c2f1
 2014-02-04 09:45:08 -06:00
Mike Duff
f7f6516da2 Issue #2745 - Don't display fulfilled or cancelled allocations 
Former-commit-id: 9c70fb3261 [formerly 4d529f5051] [formerly f81772f4be] [formerly 9c70fb3261 [formerly 4d529f5051] [formerly f81772f4be] [formerly c9b98868d2 [formerly f81772f4be [formerly 7b7f294622e886d7457d7abe0451d3e819568677]]]]
Former-commit-id: c9b98868d2
Former-commit-id: c9aa63c3c8 [formerly 8b3b5a688f] [formerly 444d2596405cc6142a1dc0b4b806d00c570225c6 [formerly 4a07f6fb4c]]
Former-commit-id: f563b418bf49a1b36f27d31b1c9de60b6b56ab31 [formerly 1065c56bde]
Former-commit-id: a33c96d8fc
 2014-02-03 16:57:03 -06:00
Ben Steffensmeier
0f46b1035c Issue #2764 Ensure GFEGridResource gets added to procedure xml context, fix gridded displays work for all float buffers. 
Change-Id: I50ff9be715357b6719d083de411f31c1a3e05834

Former-commit-id: fc0d044bd9 [formerly 921401ffe9] [formerly 8865177c6b] [formerly fc0d044bd9 [formerly 921401ffe9] [formerly 8865177c6b] [formerly 97a64f89f1 [formerly 8865177c6b [formerly 10d1070016b9a8a960f15e5dcf316d4f2aee5e90]]]]
Former-commit-id: 97a64f89f1
Former-commit-id: a63cd52b14 [formerly 1f34342948] [formerly e17a311de5c08292ece4f9c8f0ed3adc52531127 [formerly 2be72739b5]]
Former-commit-id: 5f02ff107456e1919928842ef0b933df4109d5d0 [formerly d05d31fa34]
Former-commit-id: f81c6dd1b9
 2014-02-03 14:07:07 -06:00
Steve Harris
b016112b8f Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: ab0609007c [formerly 131af8538e] [formerly b2032880ac] [formerly ab0609007c [formerly 131af8538e] [formerly b2032880ac] [formerly eb9d4319dc [formerly b2032880ac [formerly 9133aeccd450b0e241953c588192c2ee33fcbe8e]]]]
Former-commit-id: eb9d4319dc
Former-commit-id: ae4332665e [formerly 6883c64744] [formerly 66f652cd9d2fbc7c64872d432745217d602f2015 [formerly 33aea09906]]
Former-commit-id: 538ff84c8a7daabd62a35c1ea90e3f4c3651fc70 [formerly d8989145ac]
Former-commit-id: 08700a77b1
 2014-02-03 10:26:11 -06:00
Brian.Dyke
4deb06cc50 Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1 
Former-commit-id: 8b06bfd2f9 [formerly 89b824b846] [formerly 4e7b1b207f] [formerly 8b06bfd2f9 [formerly 89b824b846] [formerly 4e7b1b207f] [formerly 40ce5ccc2a [formerly 4e7b1b207f [formerly 0409f7045a797c8c051a353d69de1991b8c8b681]]]]
Former-commit-id: 40ce5ccc2a
Former-commit-id: 1f222c489d [formerly 3fd2ef82ab] [formerly f0782f5fb1a9ed0a419e5942875e692fbf816d81 [formerly dd183bc0e9]]
Former-commit-id: 7e826c4c3fd87de1a5c5fc4057ef18e6c2819ffe [formerly df55ab5503]
Former-commit-id: a540be3064
 2014-01-31 08:28:09 -05:00
Greg Armendariz
24740cdf4c Merge "Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN events while in there" into omaha_14.2.1 
Former-commit-id: 37a226378d [formerly 7fbfe85478] [formerly ed0c724860] [formerly 37a226378d [formerly 7fbfe85478] [formerly ed0c724860] [formerly 5ad9cca7a3 [formerly ed0c724860 [formerly 4df9504e742c2807676521b10e56797fb3a24a68]]]]
Former-commit-id: 5ad9cca7a3
Former-commit-id: 022ed11f9a [formerly b4d9ec0e46] [formerly f18871c65719e369747a6d8b7e2bd4891f8916f2 [formerly 66e79f459e]]
Former-commit-id: bf798c587cc569efb1973356eed83d50492151bc [formerly 677e6ac584]
Former-commit-id: af0af0920b
 2014-01-30 13:04:40 -06:00
Nate Jensen
ab58b2f973 Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN 
events while in there

Change-Id: I678035f35aef0153fdc92b935bad4372d77d3619

Former-commit-id: 9ff86044a2 [formerly c18e66cc45] [formerly 327c588c9e] [formerly 9ff86044a2 [formerly c18e66cc45] [formerly 327c588c9e] [formerly 906c679b4e [formerly 327c588c9e [formerly 68de7dd0f4e5728cb077dad541ef9369627fced4]]]]
Former-commit-id: 906c679b4e
Former-commit-id: 53afb531fa [formerly af0ac40f47] [formerly a60314b3783b7851cffad12a2adc0d68ac6ecdb3 [formerly 7bd1d802be]]
Former-commit-id: 21c2189b9de73879ebb7e4c047f7d7c980d4918a [formerly ed91c1d6f5]
Former-commit-id: cfb4bdbb21
 2014-01-30 12:02:42 -06:00
Ben Steffensmeier
9f58441a68 Issue #2537 Fix modelsounding registration. 
Former-commit-id: e5a72cf008 [formerly 12b989a34b] [formerly 819369747e] [formerly e5a72cf008 [formerly 12b989a34b] [formerly 819369747e] [formerly 1db0291792 [formerly 819369747e [formerly e4e476afc2063211523840eaa6f845a4c2264774]]]]
Former-commit-id: 1db0291792
Former-commit-id: 72b05d3cf9 [formerly 17ed6c9664] [formerly bc119a3cae474746e0debcdb5e25680e4dc2f3f3 [formerly 501aec2537]]
Former-commit-id: b88be879742e212d21b088fc3ba1967b730d6073 [formerly d06eb22524]
Former-commit-id: a00d385f2e
 2014-01-29 15:36:05 -06:00