Commit graph

280 commits

Author SHA1 Message Date
Matt Nash
59dea3cf8f Issue #1612 export entries in .classpath for use in other unit test projects
Change-Id: I516da05d33cbfaad54775e30ef5ccd9df4c7f40c

Former-commit-id: ecd62ded67 [formerly b17705ab6c] [formerly 6405fa1eb1] [formerly 6405fa1eb1 [formerly 24993b08eb]] [formerly ecd62ded67 [formerly b17705ab6c] [formerly 6405fa1eb1] [formerly 6405fa1eb1 [formerly 24993b08eb]] [formerly 6e59cf2c5a [formerly 6405fa1eb1 [formerly 24993b08eb] [formerly 6e59cf2c5a [formerly ed7a54ecc71d16810b3fbd5ebebd1dc62e1bfe82]]]]]
Former-commit-id: 6e59cf2c5a
Former-commit-id: aef2eecce5 [formerly 93194573c6] [formerly 7d6914274d] [formerly 82fec716d2fdd47925b69f3a15dca5361102bc69 [formerly 413f9318a1b8c613883c3075aecda6b5422edb27] [formerly 7d6914274d [formerly b5d990bd0d]]]
Former-commit-id: b6c8ed237bdc17047061d20c45edcd0df9dc0bf2 [formerly 2ad0c4f4ef5a7e4cac736d4fce49507014fe27be] [formerly c373260232 [formerly 7b6cf6ec6b]]
Former-commit-id: ca8be46e0c17adc420a2f8290b5fc37323c44783 [formerly c373260232]
Former-commit-id: 287c836538
2013-02-12 10:24:53 -06:00
Dustin Johnson
1a268d04da Issue #1543 Add testing of current OpenDAP type retrievals.
- Add test for current behavior of SBN-like retrievals.
- Change session management to use a factory implementation.
- Add service locator strategy to find jaxbables.
- Tests cleanup.
- Add mock versions of OpenDAP service classes to test more OpenDAP retrieval functionality.

Amend:
  Peer review comments.
  Change to use Spring transactions.

Change-Id: Ifce73361a5d864c54fdd493240c40d5ae66ef366

Former-commit-id: b3cd53cf46 [formerly c79c031f62] [formerly 0d548bd66f] [formerly 0d548bd66f [formerly 8307af022c]] [formerly b3cd53cf46 [formerly c79c031f62] [formerly 0d548bd66f] [formerly 0d548bd66f [formerly 8307af022c]] [formerly ef32853dc1 [formerly 0d548bd66f [formerly 8307af022c] [formerly ef32853dc1 [formerly bb9ab0ceb479a8c6a727b9764433edb70eec31f1]]]]]
Former-commit-id: ef32853dc1
Former-commit-id: 0d3d1d3f6d [formerly ae6a451422] [formerly 73a5667256] [formerly 5293b04d2dc1f39e6fabd0187f24dc0748662336 [formerly 143e062f3345112806fef29bb7754963c3fc28dc] [formerly 73a5667256 [formerly e504a474f9]]]
Former-commit-id: 89f5ba7964d2dd7bd5a6a92626eb43da142363f9 [formerly a69874d13e21bedfe5a86f9a76cacb772976a779] [formerly 35b13ba973 [formerly e48bf48821]]
Former-commit-id: 35b13ba973
Former-commit-id: d9fe43006a
2013-02-11 14:21:57 -06:00
Steve Harris
3c85f63935 13.2.1-6 baseline
Former-commit-id: f645d7220c [formerly 52f48669f6] [formerly d66ad2f77b] [formerly d66ad2f77b [formerly d0752de66c]] [formerly f645d7220c [formerly 52f48669f6] [formerly d66ad2f77b] [formerly d66ad2f77b [formerly d0752de66c]] [formerly a46e33f06e [formerly d66ad2f77b [formerly d0752de66c] [formerly a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]]]
Former-commit-id: a46e33f06e
Former-commit-id: 6b128749f2 [formerly 5027d2365b] [formerly bbe92e6824] [formerly f3506870f6207481b364a8cfac79c7de4d08f83e [formerly 133f9034fb8163fb8efb8d8bbd27d7ed610a6e0d] [formerly bbe92e6824 [formerly 30d38334cc]]]
Former-commit-id: 99ffc46efa72b085e555d1c7d241e0316fa33b30 [formerly 0cd3f4b5889bda9de32b546358edf3d8210d3ad8] [formerly dc55ef579a [formerly 0c128dd8f0]]
Former-commit-id: dc55ef579a
Former-commit-id: b43935a991
2013-02-07 16:00:39 -06:00
Mike Duff
b06ed3e1aa Issue #1580 - Refactor events framework so EventBus is available from CAVE or EDEX.
Change-Id: If8d9c18108ca244b044b1ddc5a80e9e5de623c7a

Former-commit-id: fa30fc8ebd [formerly 6f1a03d230] [formerly 06ddb6cce7] [formerly 06ddb6cce7 [formerly 1b1d00f8a9]] [formerly fa30fc8ebd [formerly 6f1a03d230] [formerly 06ddb6cce7] [formerly 06ddb6cce7 [formerly 1b1d00f8a9]] [formerly 36909dd6c0 [formerly 06ddb6cce7 [formerly 1b1d00f8a9] [formerly 36909dd6c0 [formerly 1d3f9e0d5b32f96fc4eff47f040d5eb159a38d3c]]]]]
Former-commit-id: 36909dd6c0
Former-commit-id: 11ba193bff [formerly 77ad5ea58e] [formerly cd52a94032] [formerly 6b296d1ab15dd6e4982cb54b848a048dec6c39a2 [formerly ea3b9db059eaba9fc3581435e18f0a784925da2b] [formerly cd52a94032 [formerly 4400265394]]]
Former-commit-id: 0f2d56844657fe89effbf92ddd1ddc8ce8270790 [formerly 98cae448c2f17401fc8c1450a1b5fda8d453c7bb] [formerly 28e854de25 [formerly 0cb979038b]]
Former-commit-id: 28e854de25
Former-commit-id: 2314c6c187
2013-02-05 15:13:51 -06:00
Dustin Johnson
cb9f3f9ff3 Merge "Issue #1543 Add ability to save/read dods files back to net.dods" into development
Former-commit-id: e990785733 [formerly baa843d739] [formerly 7b2adf535e] [formerly 7b2adf535e [formerly df987e6204]] [formerly e990785733 [formerly baa843d739] [formerly 7b2adf535e] [formerly 7b2adf535e [formerly df987e6204]] [formerly 0ceb35c131 [formerly 7b2adf535e [formerly df987e6204] [formerly 0ceb35c131 [formerly 062ed14d60a8b3d29650ce78fa449f69f40d413b]]]]]
Former-commit-id: 0ceb35c131
Former-commit-id: 5f710c2d89 [formerly aaa4ea8fba] [formerly 81d0423913] [formerly b25f0c4016c11ba764d4888f37cd4be7a68aed37 [formerly b9f41462701bde6c5a7c07d7fa9ea11554562ab2] [formerly 81d0423913 [formerly d08a9b3b13]]]
Former-commit-id: 12bf21fee7c2ddd46d4f4170bef38db035c18d56 [formerly ae811356abf356c2d92d07ea919eae4017330f3f] [formerly 53c04aac63 [formerly f50dd729f5]]
Former-commit-id: 53c04aac63
Former-commit-id: 01c5245270
2013-02-05 14:36:31 -06:00
Dustin Johnson
887caee2f0 Issue #1543 Add ability to save/read dods files back to net.dods
Change-Id: Icca189f4c3716d4045798d88a6e6ce7d27d46fcf

Former-commit-id: de1c3878dc [formerly 23449a73bf] [formerly efe1bcc4b5] [formerly efe1bcc4b5 [formerly cd381cb819]] [formerly de1c3878dc [formerly 23449a73bf] [formerly efe1bcc4b5] [formerly efe1bcc4b5 [formerly cd381cb819]] [formerly febe492056 [formerly efe1bcc4b5 [formerly cd381cb819] [formerly febe492056 [formerly d93464273e905ecbb834d7aeaccf477b42e495a3]]]]]
Former-commit-id: febe492056
Former-commit-id: 24dadd9eac [formerly 7ad9070600] [formerly c81cb3d60b] [formerly 8e04bbcbc1b8a7b35ce4e41e2242abba2115c0ee [formerly 8ed6a0d05f4ab5e36a81ae666ed0b62384b8afd6] [formerly c81cb3d60b [formerly fffbb32775]]]
Former-commit-id: f2ab676bb125d7be9571c710b387a7592889ce48 [formerly 21356a47c76d0ac4674803ca4b53386af099cd4e] [formerly 547362b6bb [formerly 999f3cbcd5]]
Former-commit-id: 547362b6bb
Former-commit-id: 31151f3c5a
2013-02-05 14:07:30 -06:00
Dustin Johnson
7b2374b5ff Issue #1543 Break apart the retrieval process to support SBN capabilities.
Made interfaces for various aspects of retrieval that are Spring injectable.
Created an initial SBN retrieval task that will watch the /awips2/crawl directory, for proof of concept.

Amend:
  Check whether debug is enabled prior to debug message.
  Move log of request xml inside null check.

Change-Id: I5e3fe835f028cb93c98abce9735d3d59cfc663dc

Former-commit-id: be89d9e6b0 [formerly 3112fce540] [formerly cf063000ca] [formerly cf063000ca [formerly 3b20efeb7d]] [formerly be89d9e6b0 [formerly 3112fce540] [formerly cf063000ca] [formerly cf063000ca [formerly 3b20efeb7d]] [formerly 1a17e4a0f5 [formerly cf063000ca [formerly 3b20efeb7d] [formerly 1a17e4a0f5 [formerly 120296239cfa021507b4ce9bc3f7333509b1dfb9]]]]]
Former-commit-id: 1a17e4a0f5
Former-commit-id: 9755ebc41a [formerly 82c86df837] [formerly 2940a059d1] [formerly c75e7199401a0fe0470b6cbbd108b42dcfc47508 [formerly 3cb29f382d95ee1e760fcb5f018ec70b8bd3cb00] [formerly 2940a059d1 [formerly b5f69e21d8]]]
Former-commit-id: be5162500d2abacb74f95d93a51a46e377df3b8a [formerly 80d55cc82b3caa3784bcb0f5d2966f02f9acfa60] [formerly 55f7212a0e [formerly bef0f2eca1]]
Former-commit-id: 55f7212a0e
Former-commit-id: 2f19170098
2013-02-04 09:00:33 -06:00
Steve Harris
9d26ef9c3d Merge branch '13.2.1_delivery' into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 12c8d91429 [formerly f207d282bc] [formerly c218786986] [formerly c218786986 [formerly 658bea377b]] [formerly 12c8d91429 [formerly f207d282bc] [formerly c218786986] [formerly c218786986 [formerly 658bea377b]] [formerly ec56acde81 [formerly c218786986 [formerly 658bea377b] [formerly ec56acde81 [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]]]]
Former-commit-id: ec56acde81
Former-commit-id: 0213e6dfed [formerly 41b14f0fa2] [formerly 73d9455c65] [formerly 28ef7b3e5ed69c229148826fc7a07aff84ade484 [formerly 60daaf3ef91fb7f1318c36d98b7b63e339bd5c61] [formerly 73d9455c65 [formerly 6383bf8ed2]]]
Former-commit-id: c8517b08f46f1993eae05597ee8efb2c04ac26fb [formerly 96b2d429acce04d3a7b895e5c4de0e318433555e] [formerly 2107a54161 [formerly a74d58ce6f]]
Former-commit-id: 2107a54161
Former-commit-id: a8d7e2a51a
2013-01-31 10:19:14 -06:00
Dustin Johnson
5e48515cfa Issue #1501 Fix broken required latency calculations
Change-Id: If91a567b2a215ec039f5649b4a77939a8fd9b45a

Former-commit-id: dd09574598 [formerly 1a5b0db18a] [formerly e64e36ecf2] [formerly e64e36ecf2 [formerly f361f5a6a1]] [formerly dd09574598 [formerly 1a5b0db18a] [formerly e64e36ecf2] [formerly e64e36ecf2 [formerly f361f5a6a1]] [formerly 5830a98a51 [formerly e64e36ecf2 [formerly f361f5a6a1] [formerly 5830a98a51 [formerly 9788de6b75f727ea1c2d7c178081eeec16078362]]]]]
Former-commit-id: 5830a98a51
Former-commit-id: 1926b6ab5d [formerly d3dfd0d13e] [formerly 0185add187] [formerly 629c86dcde73a0caf2aeb0f912c40cf6bc61442f [formerly 8e1ba93b749807b664b2caa682b0ba179d0ff600] [formerly 0185add187 [formerly d7077690d8]]]
Former-commit-id: 8ac883dd2b88bbcf6d4d745f204c3f2adc402adb [formerly 91fdb5ab04eacbddb531b408e1374ea17f95f146] [formerly ba39807ebe [formerly 74f27ce9f8]]
Former-commit-id: ba39807ebe
Former-commit-id: 7a26ed4303
2013-01-31 08:39:08 -06:00
Dustin Johnson
aed7194c61 Issue #1530 Do not allow partial scheduling of subscriptions in BandwidthManager
Amend:
  Rebase to 13.2.1

Change-Id: Ied72baede3691957cf1155e1986428d1bfd16e81

Former-commit-id: 8fe18d5428 [formerly 8897d2b302] [formerly c8302eb9f8] [formerly c8302eb9f8 [formerly b0125d6d7e]] [formerly 8fe18d5428 [formerly 8897d2b302] [formerly c8302eb9f8] [formerly c8302eb9f8 [formerly b0125d6d7e]] [formerly 4e9ecdf166 [formerly c8302eb9f8 [formerly b0125d6d7e] [formerly 4e9ecdf166 [formerly 902feab2b1bdf0ffdadce76847ee76b9a8c7061e]]]]]
Former-commit-id: 4e9ecdf166
Former-commit-id: 79d5056406 [formerly 4c323a7bf8] [formerly a463f7ef2b] [formerly 6bf5ae18b943c4fe2dec9faf79f00c98de37e7f0 [formerly 696f9cd7deb51ded1ebc38bd99f68f88ea3f520b] [formerly a463f7ef2b [formerly 150c5275ca]]]
Former-commit-id: ca0263dad266afc9be9c3acaedae04a15cd99e76 [formerly 3eac8b9d66a42f44727f51f26828ff276c10b6e2] [formerly 64c335478a [formerly 6b46be5bc6]]
Former-commit-id: 37054f18c0327d411b9f440a3cf8f20748d073ce [formerly 64c335478a]
Former-commit-id: 1c23b90572
2013-01-29 10:10:54 -06:00
Dustin Johnson
5c68e122e7 Issue #1528 Fix subscription priorities to be the same from domain object to GUI
Fix incorrect use of enum ordinal value mappings to priorities.
Fix broken bandwidth priority scheduling.

Change-Id: Ic9e220966c20e95fcc3f81f0c647ffcdb2fcbca5

Former-commit-id: 0a50f12e2c [formerly f8d6fb35b4] [formerly 50bfcd3fbf] [formerly 50bfcd3fbf [formerly 41c0ff85ff]] [formerly 0a50f12e2c [formerly f8d6fb35b4] [formerly 50bfcd3fbf] [formerly 50bfcd3fbf [formerly 41c0ff85ff]] [formerly f88a5c1b95 [formerly 50bfcd3fbf [formerly 41c0ff85ff] [formerly f88a5c1b95 [formerly b6dbc5f3117832ce8bda1698043d7941398f11b1]]]]]
Former-commit-id: f88a5c1b95
Former-commit-id: b182eff192 [formerly dac4c429e7] [formerly 4ab288ae75] [formerly ab7a23812c517c14110fdb1bd5dc5b1da63f40d1 [formerly a9e048c56f0e0bcf1daa53c2f59ef7d20bb01b9b] [formerly 4ab288ae75 [formerly 4465094fe9]]]
Former-commit-id: 4a3c9bec432b881ed0ccfe9a2ceeaef8bbfdf904 [formerly 053fc880d7a6ac70b3580a152303d0a3ab5154a5] [formerly 7d73d0bd64 [formerly b78257ab11]]
Former-commit-id: 7d73d0bd64
Former-commit-id: 4064a06a23
2013-01-25 14:30:04 -06:00
Steve Harris
64975380d9 Merge branch '13.2.1_delivery' into development
Former-commit-id: 8e0d065695 [formerly d6aeabad12] [formerly 618cf868c5] [formerly 618cf868c5 [formerly f673583915]] [formerly 8e0d065695 [formerly d6aeabad12] [formerly 618cf868c5] [formerly 618cf868c5 [formerly f673583915]] [formerly 827611474f [formerly 618cf868c5 [formerly f673583915] [formerly 827611474f [formerly 5c6a08af0ad5f6185645e53143bf88d8c27f10d0]]]]]
Former-commit-id: 827611474f
Former-commit-id: 43a7f6ba8d [formerly 1397f8a811] [formerly a85c81289e] [formerly 20c33e600380c0f863b06c987ba54a3973ae1e5a [formerly b9760adfb36650f58aa4202fbbd5beedb40f8529] [formerly a85c81289e [formerly 25fecb8b4f]]]
Former-commit-id: 240805285a1d7bf02629970dbdd581d21ad1cec3 [formerly f2d8f7cd1be3a2bba4584db2da805b450fce002a] [formerly a7d7847b06 [formerly 895b25bac4]]
Former-commit-id: a7d7847b06
Former-commit-id: 379a9dd95c
2013-01-25 10:54:51 -06:00
Mike Duff
c77f1b4625 Issue #1523 - Fix problem with legend keys.
Change-Id: Iea9cf5a95767b8c3a71ddc022757d9d5dda5a931

Former-commit-id: b33fe64e30 [formerly ed32adc993] [formerly 478ec72102] [formerly 478ec72102 [formerly ba5014b162]] [formerly b33fe64e30 [formerly ed32adc993] [formerly 478ec72102] [formerly 478ec72102 [formerly ba5014b162]] [formerly c06ed9f9dc [formerly 478ec72102 [formerly ba5014b162] [formerly c06ed9f9dc [formerly c625174317778f673a8f3b5062e1bd7832b70ed4]]]]]
Former-commit-id: c06ed9f9dc
Former-commit-id: 79eb3fc0a6 [formerly a09e8c5570] [formerly 05e9b88566] [formerly 40ae97a9ee95b175cda39240cc7742c817249d2e [formerly 1b1ac20cfdbaa8e552b23d4725c85806c869b494] [formerly 05e9b88566 [formerly fbf92a6d06]]]
Former-commit-id: 4879d34a40c55f1624bb9ae042662c108257f7c1 [formerly ef3455ec3540faf3e7ca24232e1af94de307fd18] [formerly 0752ecb4f1 [formerly f9b7cae879]]
Former-commit-id: 0752ecb4f1
Former-commit-id: 27a9b15eea
2013-01-24 12:39:12 -06:00
Mike Duff
e11cbd0d73 Issue #1357 - Remaining stats items implemented.
Peer Review Fixes

Change-Id: I94d2e3fc08af2bef5e1e57c4ad7caf826e254ae1

Former-commit-id: 4751066bb4 [formerly d54b3a3519] [formerly 712862d96f] [formerly 712862d96f [formerly ffca969560]] [formerly 4751066bb4 [formerly d54b3a3519] [formerly 712862d96f] [formerly 712862d96f [formerly ffca969560]] [formerly 1bc6e7c2e4 [formerly 712862d96f [formerly ffca969560] [formerly 1bc6e7c2e4 [formerly 19e1608c44d314e11bb7cba809e1cc0a6bb68dc5]]]]]
Former-commit-id: 1bc6e7c2e4
Former-commit-id: 8bc4d1e6ef [formerly aa26a4d5d2] [formerly dfcce57a0a] [formerly bbdf6e4617e7a9ce81846c6d8506d20f2a2dd350 [formerly 1dd22669a9d4462243dd018526062181eb8a7d09] [formerly dfcce57a0a [formerly 4cd7deb608]]]
Former-commit-id: ae7d03776acab5cea5a23fac744fbcd9563e40b5 [formerly 9fd21a8ac89c2efd5bc6d198d4f4290003357cb3] [formerly df41fe4395 [formerly ac9f95d1d0]]
Former-commit-id: df41fe4395
Former-commit-id: 5cf904ba6f
2013-01-23 11:17:36 -06:00
Steve Harris
ccbd8dde52 13.2.1-2 baseline
Former-commit-id: 79c717ca60 [formerly a4fa438a41] [formerly 33bc5fd816] [formerly 33bc5fd816 [formerly 83e9157df7]] [formerly 79c717ca60 [formerly a4fa438a41] [formerly 33bc5fd816] [formerly 33bc5fd816 [formerly 83e9157df7]] [formerly 328c6dccad [formerly 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]]]
Former-commit-id: 328c6dccad
Former-commit-id: 19f4c6b47d [formerly ce726fadc7] [formerly d9be4dce21] [formerly 2627373644ec7ef09825bbc0c168afd0abd1a3fe [formerly f30d6bb5c391ebffda9767fba913019b2cd7d050] [formerly d9be4dce21 [formerly 47cc08ac79]]]
Former-commit-id: dc8171a7281c254994a85334494b23b7e0b2a8db [formerly 281ab815ed143a9ff49cedae7054da06195e3c69] [formerly 2779f5c6d9 [formerly 547c1dedd1]]
Former-commit-id: 2779f5c6d9
Former-commit-id: b92dfd1b62
2013-01-23 11:18:44 -05:00
Dustin Johnson
f9f8b42d92 Issue #1519 Fix max latency calculations for adhoc queries
Amend:
  Peer review comments.

Change-Id: Ifa76b145616d8fdcf4ba41cd3744cfc3991b902c

Former-commit-id: 57337e0291 [formerly 0f7b01795d] [formerly 504268f0f3] [formerly 504268f0f3 [formerly 6c1818d544]] [formerly 57337e0291 [formerly 0f7b01795d] [formerly 504268f0f3] [formerly 504268f0f3 [formerly 6c1818d544]] [formerly f730422834 [formerly 504268f0f3 [formerly 6c1818d544] [formerly f730422834 [formerly e9d88236907b98f7e461807592e580bdf1ecedb9]]]]]
Former-commit-id: f730422834
Former-commit-id: b859cf000e [formerly 70bce9d505] [formerly 2e09d46fea] [formerly ba38d178c49603288b7d99a12ee75063b68e45b2 [formerly 76d8b5641220e657d9123f65878c0ce41da1c8f6] [formerly 2e09d46fea [formerly 516ac1ab9a]]]
Former-commit-id: fa3342fe669ebc24c713d3e718ad47f733c25a75 [formerly ba860324a0a7e30cd96383cd383eb22a2db70a82] [formerly 4cec3d4356 [formerly 7918b009ff]]
Former-commit-id: 4cec3d4356
Former-commit-id: 1e301478b9
2013-01-23 08:06:52 -06:00
Steve Harris
07ef00d635 Merge branch '13.2.1_delivery' into development
Former-commit-id: 1a6c73219a [formerly f1b3a0ce2e] [formerly cf384edfbb] [formerly cf384edfbb [formerly 11b9bfc187]] [formerly 1a6c73219a [formerly f1b3a0ce2e] [formerly cf384edfbb] [formerly cf384edfbb [formerly 11b9bfc187]] [formerly 1af055a04b [formerly cf384edfbb [formerly 11b9bfc187] [formerly 1af055a04b [formerly 920b282de84def082dac82832d80e67f7bff2b19]]]]]
Former-commit-id: 1af055a04b
Former-commit-id: 17e6416a4c [formerly 7d6a1a7e3a] [formerly 8b578c10dc] [formerly 4e6e745746f901d07ef42c91ca7198ffb6e8849e [formerly cdda32a5afb54d36ca6dc56ab5842aa9a04bf651] [formerly 8b578c10dc [formerly 29b9077291]]]
Former-commit-id: b32045ce3b27997e8602ac4401fed5bc1af55bd4 [formerly f741fd6472c315f672ab76f7a397d383205c6f95] [formerly c60051d5df [formerly b03d5ce450]]
Former-commit-id: c60051d5df
Former-commit-id: 4ed4f88644
2013-01-22 16:45:48 -06:00
Dustin Johnson
7e7af90768 Issue #1441 Create new datadelivery services plugin
Add GroupDefinition service.
Update subscriptions to not have a group name when their group is deleted.

Amend:
  Rebase to HEAD of 13.2.1.

Change-Id: I817ca1912f76ccf347907ddb12e3f6fd8de7e5aa

Former-commit-id: 5c7fbb1841 [formerly 40ef4c5947] [formerly 3ec05a5a9c] [formerly 3ec05a5a9c [formerly 557de162b0]] [formerly 5c7fbb1841 [formerly 40ef4c5947] [formerly 3ec05a5a9c] [formerly 3ec05a5a9c [formerly 557de162b0]] [formerly 15c2c55ff9 [formerly 3ec05a5a9c [formerly 557de162b0] [formerly 15c2c55ff9 [formerly 464b46dd4f4af60dbeb917f65c18c876d712e4ad]]]]]
Former-commit-id: 15c2c55ff9
Former-commit-id: 623f92965c [formerly 02604beac9] [formerly 756080321e] [formerly 2e952681a8cee71340bb60edb67ba32dc47a3af5 [formerly 6bc759f6c2019b3fef1eb1a080cf002dc07697ce] [formerly 756080321e [formerly a3c99f86bb]]]
Former-commit-id: 00b1956f849de752f4d2a6d3e577ea076b7d9346 [formerly 07f8633fb9fb320b16573c6dc1052a735e4bf124] [formerly 7da688f138 [formerly 2168713505]]
Former-commit-id: 7da688f138
Former-commit-id: a2ca5bd06f
2013-01-22 11:45:18 -06:00
Steve Harris
1059d0eeb6 Merge branch '13.2.1_delivery' into development
Conflicts:
	edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/MpeLightningSrv.java

Former-commit-id: fca8c8527d [formerly bf957a3bd7] [formerly 89f3120c0c] [formerly 89f3120c0c [formerly 2c9c6b7dde]] [formerly fca8c8527d [formerly bf957a3bd7] [formerly 89f3120c0c] [formerly 89f3120c0c [formerly 2c9c6b7dde]] [formerly 407d73a04f [formerly 89f3120c0c [formerly 2c9c6b7dde] [formerly 407d73a04f [formerly cda6b1137d9052b0859f2b51f5bdadecad411e43]]]]]
Former-commit-id: 407d73a04f
Former-commit-id: 8884c85d3d [formerly f2b52084dc] [formerly 0ca985778e] [formerly c85353a62a55439215702d41413e295e3c2ca40b [formerly 5714abfd35536ab502243bd9ff20068b0fa7b7ac] [formerly 0ca985778e [formerly bbb637faf3]]]
Former-commit-id: 6a901a4ef25d6a7d426992c53a9f4389d4a43d46 [formerly 56287c40efa8ad1381c1a6f8efbc143f960cefd1] [formerly 61a9f644d9 [formerly 45760d8bef]]
Former-commit-id: 61a9f644d9
Former-commit-id: f8888e5294
2013-01-18 10:52:29 -06:00
Dustin Johnson
974b5096f2 Issue #1412 Check file last modified times each time role data is requested
Change-Id: Ieae84ad3106e3aa0cf4d253a10c27e8c9c60ecaa

Former-commit-id: 3ee74b54eb [formerly 088b0d4c08] [formerly b1ce19e41d] [formerly b1ce19e41d [formerly 74d5a70c30]] [formerly 3ee74b54eb [formerly 088b0d4c08] [formerly b1ce19e41d] [formerly b1ce19e41d [formerly 74d5a70c30]] [formerly 037dabb683 [formerly b1ce19e41d [formerly 74d5a70c30] [formerly 037dabb683 [formerly b7e577237df9e157fdb218af48c41f6209ff2bfb]]]]]
Former-commit-id: 037dabb683
Former-commit-id: 2aba052819 [formerly 837c1a0492] [formerly fce3f8bec9] [formerly b71d8d95d831864511d435c0eadfb094447ce571 [formerly 4c1037f281d91482cf2e0798dc7d242a1877cfba] [formerly fce3f8bec9 [formerly 6468029207]]]
Former-commit-id: 0edfd9f99f07e0d9a69112390891b21d8e8d3895 [formerly 58749b06f78b3c611a53c13d20facc15be2e4ccb] [formerly e3cf0246c7 [formerly 799cf85f82]]
Former-commit-id: e3cf0246c7
Former-commit-id: 70e2870b54
2013-01-17 12:48:01 -06:00
Roger Ferrel
f23e834fc6 Issue #1442 Changes to update display when Simulated Time is changed. Corrections to pqact.conf.template.
Changes based on code review and added listener to GridManager and unit test.

Change-Id: Ida593a7e3cc7d4fd9bd6f44a4455145114484650

Former-commit-id: e43aa7a1be [formerly 863bdb4d52] [formerly 972db12324] [formerly 972db12324 [formerly 1cd076671c]] [formerly e43aa7a1be [formerly 863bdb4d52] [formerly 972db12324] [formerly 972db12324 [formerly 1cd076671c]] [formerly 1e492b81ff [formerly 972db12324 [formerly 1cd076671c] [formerly 1e492b81ff [formerly 7f70c2f65453db6bf3097ae8157511c38a36b136]]]]]
Former-commit-id: 1e492b81ff
Former-commit-id: 7d069fdf4b [formerly 96deac5f43] [formerly 86d51634dc] [formerly 30ce29c14632887189b8127a79f986a3954513de [formerly ea2ddcc686b917f0c5feca15fbe115c2be0949d6] [formerly 86d51634dc [formerly f10521f861]]]
Former-commit-id: 9ee4cf48cc4dacf03dc3b4c173b57e612fba8373 [formerly 06cef0013d52ca86020642bf82ef1a6b6988048f] [formerly 0435636b1e [formerly 722708105f]]
Former-commit-id: 71687545b0fef950439c8cb946a21e796d7f63e7 [formerly 0435636b1e]
Former-commit-id: 815dd12ad9
2013-01-16 16:53:29 -06:00
Dustin Johnson
ca8d84a9cb Issue #1487 Use XML to store stats grouping information in the database
Amend:
  Increase length of grouping column to 1024.
  Add deltaScript to convert the grouping column to xml.
  Change regex to replace any pluginName fields with dashes, not just satellite-mcidas.

Change-Id: I0d5081645c5f11909e5778c8e555d5da3cf77e1a

Former-commit-id: 30b960bb59 [formerly 0397f990da] [formerly c12b46027f] [formerly c12b46027f [formerly b627dfc054]] [formerly 30b960bb59 [formerly 0397f990da] [formerly c12b46027f] [formerly c12b46027f [formerly b627dfc054]] [formerly 19d3a14d4f [formerly c12b46027f [formerly b627dfc054] [formerly 19d3a14d4f [formerly 38ecb1f36dce4717d0ba9066c8cd22116770d34b]]]]]
Former-commit-id: 19d3a14d4f
Former-commit-id: ef4ded0914 [formerly 56b47ffbf1] [formerly ecb1d5564a] [formerly 16eaff22173ccd050232416302fd7c61740025cb [formerly a1d7a7e343770b91b36afc9c193dcdcee6b09ef3] [formerly ecb1d5564a [formerly c750e27389]]]
Former-commit-id: d944d8af5ad7069a618e37c80169a0735d36bde3 [formerly d950f4621f676478de7a7656c2bccf8b324d5f74] [formerly 4ab214c5d7 [formerly 19558ae3fa]]
Former-commit-id: 4ab214c5d7
Former-commit-id: 693e9d93a2
2013-01-16 12:21:11 -06:00
Dustin Johnson
0b51a4dd37 Issue #1286 Fix bugs found during 1286 testing
Amend:
  Add time domain code.

Change-Id: Ib62ea23571a7e80877f8090064a8638e111fd2d2

Former-commit-id: 1b6c321cc7 [formerly 50fa22f710] [formerly 99f8d40bed] [formerly 99f8d40bed [formerly 3d74a68e94]] [formerly 1b6c321cc7 [formerly 50fa22f710] [formerly 99f8d40bed] [formerly 99f8d40bed [formerly 3d74a68e94]] [formerly 2cf52d976b [formerly 99f8d40bed [formerly 3d74a68e94] [formerly 2cf52d976b [formerly 9b79cfc11541c737087fb613c686d50cf79e0a7b]]]]]
Former-commit-id: 2cf52d976b
Former-commit-id: 6db55e24a8 [formerly b18fc5ff5e] [formerly 94e95f3e07] [formerly 8ff706a56a39c170c494e37329f9f499a7479694 [formerly d2caf5c394290add805dceb28270a72f9b600765] [formerly 94e95f3e07 [formerly aa7acedf0a]]]
Former-commit-id: 6063101ab6e915a0dd03df58d74694391df66fb5 [formerly 21ec2413c9d2a86c99721c6504722141f9046ddb] [formerly 1070de3f2d [formerly 5cd31fc0b7]]
Former-commit-id: 1070de3f2d
Former-commit-id: 23e70d529a
2013-01-15 10:18:14 -06:00
Mike Duff
6f5da8adfb Issue #1420 - Additional changes and cleanup
Issue #1420 - remove commented out code, move method
Issue #1420 - fix for max latency
Change-Id: I8a983812e4fab7477659d7f175eaa005bb92f064

Former-commit-id: 167b14222c [formerly 0eb256fc41] [formerly 329a010b07] [formerly 329a010b07 [formerly 279729e88e]] [formerly 167b14222c [formerly 0eb256fc41] [formerly 329a010b07] [formerly 329a010b07 [formerly 279729e88e]] [formerly 8411a46e3e [formerly 329a010b07 [formerly 279729e88e] [formerly 8411a46e3e [formerly d69e77e9b902d164a5716e432f62bd99e1b784dd]]]]]
Former-commit-id: 8411a46e3e
Former-commit-id: c519f1f7e8 [formerly 135fd5c13d] [formerly d3ed6f6148] [formerly 29df00d439584720e8effdc79c62813f2104d7b1 [formerly 8b9f15d6e0da73076d2f6aec446ddc93878baabc] [formerly d3ed6f6148 [formerly 950c71c164]]]
Former-commit-id: c4ea10f898274b8ba537f85748af0f78834d0991 [formerly 0e71292ea44022ed0f31fa4514b8529d747d49a7] [formerly 66dc038d02 [formerly 772154de38]]
Former-commit-id: 794b9cb8c3cc8dcb5739fb42658af6e295ff7f13 [formerly 66dc038d02]
Former-commit-id: ac03c3993c
2013-01-11 14:38:34 -06:00
Richard Peter
3494045a8e Merge "Issue #1453 Fix handling of active period across year boundary" into development
Former-commit-id: 2718c40036 [formerly dc6c7afd42] [formerly 58242a600c] [formerly 58242a600c [formerly 32e5d79e7a]] [formerly 2718c40036 [formerly dc6c7afd42] [formerly 58242a600c] [formerly 58242a600c [formerly 32e5d79e7a]] [formerly a2c3db2ee7 [formerly 58242a600c [formerly 32e5d79e7a] [formerly a2c3db2ee7 [formerly 5b08568c4f07da6d5916025e076260b0f469a68c]]]]]
Former-commit-id: a2c3db2ee7
Former-commit-id: 9a724141db [formerly dd12b3fe0f] [formerly cf815a4c72] [formerly 715b4540dd2bec33924ac26de445471011d84c42 [formerly 0dc63b9bd4f59e8fed895f177efe7f6278747845] [formerly cf815a4c72 [formerly d3df89181f]]]
Former-commit-id: a881e7fa462a3eb0247a14fef7dd2be3685bdacf [formerly 505df6e18a00aa3547de015d6cffa6c770479c9f] [formerly 87b4521a69 [formerly a9f01d5846]]
Former-commit-id: 9091ef286a266ca2ef897e65f266f43cb1d60cf2 [formerly 87b4521a69]
Former-commit-id: 038b214887
2013-01-11 12:37:05 -06:00
Dustin Johnson
8b59235301 Issue #1453 Fix handling of active period across year boundary
Change-Id: I6bd5f075d74d394eab2a47a2b5fee3e2d91fd272

Former-commit-id: 4f29745206 [formerly f7fa425488] [formerly 3e1878c5f9] [formerly 3e1878c5f9 [formerly 7716f1baa9]] [formerly 4f29745206 [formerly f7fa425488] [formerly 3e1878c5f9] [formerly 3e1878c5f9 [formerly 7716f1baa9]] [formerly c4068d27bf [formerly 3e1878c5f9 [formerly 7716f1baa9] [formerly c4068d27bf [formerly eb1c45cff6c9b0a6b5d194e8f5b9b582646ebde2]]]]]
Former-commit-id: c4068d27bf
Former-commit-id: 5cf4d77486 [formerly 2a306b4122] [formerly a4414d409a] [formerly 12ca22e63a18141f661b20817a74704131fab19c [formerly c86a35d61a0a7c32f9505c7606fcb5598beded97] [formerly a4414d409a [formerly 0b3f803f6c]]]
Former-commit-id: 896664c131337bafaf1e31c0a3ddcd7d2eb06eeb [formerly 3330a60d2df34bd1b8732593f276c83b6d1c1c02] [formerly ef31fc45a9 [formerly 9b3cf3308f]]
Former-commit-id: ef31fc45a9
Former-commit-id: f275418843
2013-01-11 12:23:15 -06:00
Dave Hladky
e9dfc948f0 Issue #1466 Updated parsing for NCOM, revamped MetaDataParser to make more efficient, unit updates, tests, params
Change-Id: I5177209c25cb08c0ffe74104ceb6e16874ce3208

Former-commit-id: ff3e325ef6 [formerly b56b5c1fe8] [formerly 440de708df] [formerly 440de708df [formerly 5cf3eee426]] [formerly ff3e325ef6 [formerly b56b5c1fe8] [formerly 440de708df] [formerly 440de708df [formerly 5cf3eee426]] [formerly 002ac2eb41 [formerly 440de708df [formerly 5cf3eee426] [formerly 002ac2eb41 [formerly 9b8169d2523480750bb3cf557fb8902a9cafcc03]]]]]
Former-commit-id: 002ac2eb41
Former-commit-id: 3461aa192a [formerly 59c349ac77] [formerly fe486b4889] [formerly 63ef733e03bc2099ff7c90d1b1f761c4b5785ec0 [formerly 6a98f7fe2876ba19787aa908c721669aaf618444] [formerly fe486b4889 [formerly 5312e82b4b]]]
Former-commit-id: c81ed9184ae6bf22204ad06c921f3a39856e4070 [formerly 57ac28b8518a3193cbd3b4125cd190f547bac07f] [formerly b5ea7aaff8 [formerly a51f8f449b]]
Former-commit-id: b5ea7aaff8
Former-commit-id: 87ae3ccfb8
2013-01-11 11:59:36 -06:00
Dustin Johnson
47e2ae4635 Issue #1441 Cleaned up editing/deleting groups and handling of user permissions
Amend:
  Split creation and edit group dialogs.
  Add some javadoc and remove sysouts.
  Add missing test data causing broken tests.
  Rebased.

Change-Id: I00d48f2a97bf8398b74bf8ed568cb19126d2c185

Former-commit-id: dd593171f8 [formerly b128ed3340] [formerly 8473eb60fb] [formerly 8473eb60fb [formerly 4ae1a9645c]] [formerly dd593171f8 [formerly b128ed3340] [formerly 8473eb60fb] [formerly 8473eb60fb [formerly 4ae1a9645c]] [formerly 446f65776e [formerly 8473eb60fb [formerly 4ae1a9645c] [formerly 446f65776e [formerly 797f570e28086b43b5d851275fba457c5920f57e]]]]]
Former-commit-id: 446f65776e
Former-commit-id: 81440c478a [formerly 6984791be8] [formerly 7bf029eb7e] [formerly 04bb493a0312c442e6be7e4e10b04fe4ddd743fb [formerly 23c340a1e9db08699dd6472e0937d44ae0e67cc5] [formerly 7bf029eb7e [formerly 64ececeda1]]]
Former-commit-id: a2efabe20e1f912de59c7a0dc4a77a7d6833b176 [formerly 4b7dc8fbd66d90306e884b8ea9c8af6f53371156] [formerly f269969791 [formerly 6fb6bc8f87]]
Former-commit-id: f269969791
Former-commit-id: 2598fc06d8
2013-01-11 11:53:02 -06:00
Mike Duff
9fcf93d530 Issue #1420 - Rules Peer review comments
Former-commit-id: 11e200d556 [formerly 86e3e4c397] [formerly f41d525fa3] [formerly f41d525fa3 [formerly 4c63333a96]] [formerly 11e200d556 [formerly 86e3e4c397] [formerly f41d525fa3] [formerly f41d525fa3 [formerly 4c63333a96]] [formerly 6e0367cdc7 [formerly f41d525fa3 [formerly 4c63333a96] [formerly 6e0367cdc7 [formerly 9f6756325c5788dd1b98d8f24ab3437993da7dcd]]]]]
Former-commit-id: 6e0367cdc7
Former-commit-id: 245ffde841 [formerly 65dd6c6f60] [formerly ed95eae2e3] [formerly cab0428be67275b176c7767becaac5811ed0571a [formerly 4e7421c22c8ae6fb0dd6d1566ea3fb164aec7691] [formerly ed95eae2e3 [formerly 67486aa43b]]]
Former-commit-id: d55810350c657576ba6e41614ead414758311b06 [formerly 2661145adf236b4fa5c186262fb5752eabdf600d] [formerly 660064ea6a [formerly 8313877a3a]]
Former-commit-id: 660064ea6a
Former-commit-id: 9adac72fba
2013-01-09 12:02:21 -06:00
Dustin Johnson
26bd0f81be Issue #1453 Fix the handling of subscription active period dates.
Amend:
  Move tests project over that was missed while moving datadelivery code

Change-Id: I10611f8a4b6c2efe6af1813e5181fadc059e4f9a

Former-commit-id: 104f4253e5 [formerly 3fb35985d0] [formerly 1975cd0442] [formerly 1975cd0442 [formerly 6a90779214]] [formerly 104f4253e5 [formerly 3fb35985d0] [formerly 1975cd0442] [formerly 1975cd0442 [formerly 6a90779214]] [formerly 2635e05723 [formerly 1975cd0442 [formerly 6a90779214] [formerly 2635e05723 [formerly 0e1397db6ca1a7a577d20507bc2c4daf823188fe]]]]]
Former-commit-id: 2635e05723
Former-commit-id: f71afe255b [formerly 71e085b940] [formerly 885f315d30] [formerly 43760e6a03aab52bbb12063af1f3aac6eca3145c [formerly db9b8d2b230d04c2984037f6535517c2201db20b] [formerly 885f315d30 [formerly 492cee4992]]]
Former-commit-id: a53c319f6ed6d5c36aab6eec320e1fe60f77bd3e [formerly 7294d4c01e6fcf76d993e5993a213ccedb5d6fe1] [formerly b24ddaeb4e [formerly b1c159fc7f]]
Former-commit-id: b24ddaeb4e
Former-commit-id: 683542813d
2013-01-08 12:44:29 -06:00