Commit graph

2393 commits

Author SHA1 Message Date
Slav Korolev
ca6efe6484 Issue #2431. Changed labels on the table.
Former-commit-id: 858b167938 [formerly 8874f76878] [formerly dd1ff63737] [formerly 858b167938 [formerly 8874f76878] [formerly dd1ff63737] [formerly 0801f8dedd [formerly dd1ff63737 [formerly 5599d13b9cbac3806c636b629d502aacc1f621b4]]]]
Former-commit-id: 0801f8dedd
Former-commit-id: 4b225552e2 [formerly 6b3481ca26] [formerly 77ecd7c42b3304b4ff77b15d1213ecb427f5661a [formerly 7d0198b356]]
Former-commit-id: 5146d816bee2418137c01850b925e11cdce09d47 [formerly f8e429a1b9]
Former-commit-id: e4a2b6d619
2013-11-01 15:06:19 -04:00
Ron Anderson
a9c8950fe6 Merge "Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product." into development
Former-commit-id: 5e4227410c [formerly a15c620fc8] [formerly 9e9dd04bfd] [formerly 5e4227410c [formerly a15c620fc8] [formerly 9e9dd04bfd] [formerly cc991ed528 [formerly 9e9dd04bfd [formerly 6346ae61d0639325fa199db525f4e34402b39224]]]]
Former-commit-id: cc991ed528
Former-commit-id: a0f67a006f [formerly f453d92818] [formerly c1140f67ed8f586264c71a61de18f87988cedd70 [formerly deb89a88f5]]
Former-commit-id: b4e8d1a865f6177e1d0672dcd506844aafc34864 [formerly 84adff8e96]
Former-commit-id: 638b57e188
2013-11-01 11:07:39 -05:00
Nate Jensen
3efcc68e75 Merge "Issue #2491 Fix collaboration Xml." into development
Former-commit-id: caa08095d8 [formerly b986638bc5] [formerly 43b2f50a0a] [formerly caa08095d8 [formerly b986638bc5] [formerly 43b2f50a0a] [formerly 0270e6bde3 [formerly 43b2f50a0a [formerly 311f84bcd1e10f9fd52df836673c9bb6012ee8a0]]]]
Former-commit-id: 0270e6bde3
Former-commit-id: 685c6034b2 [formerly 6ed6df6ed0] [formerly 1d11102b6e40b4f27646f1cf7aba32281be912e3 [formerly 47fc100053]]
Former-commit-id: 3b5342860c273add5e1cf001ce17db765d7f54d6 [formerly 6164feb2da]
Former-commit-id: 3858434dc3
2013-10-31 18:11:13 -05:00
David Gillingham
dc6a531641 Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product.
Change-Id: Id5aede1ba07019150b3a43b45f067a5740d657af

Former-commit-id: 320ef0eb71 [formerly f404f1560c] [formerly 6e1cca2966] [formerly 320ef0eb71 [formerly f404f1560c] [formerly 6e1cca2966] [formerly c4f5cc53bb [formerly 6e1cca2966 [formerly 194799b7d3fb719987523a77ba9b3c69a11bb69f]]]]
Former-commit-id: c4f5cc53bb
Former-commit-id: 82721bfe07 [formerly 3776f258a3] [formerly 345b0c83f25f83ef27ba6cbf8e70827c774b053d [formerly 3bac577a31]]
Former-commit-id: 5b6106d6a9109e95e2fa9e2742d6f3022a33ac54 [formerly 5df42898ad]
Former-commit-id: 4862c1d171
2013-10-31 14:07:20 -05:00
Ben Steffensmeier
a15afe6f6c Issue #2491 Fix collaboration Xml.
Former-commit-id: 0bcf7f77c0 [formerly a5f970e238] [formerly 3d36cec7be] [formerly 0bcf7f77c0 [formerly a5f970e238] [formerly 3d36cec7be] [formerly fdeff81da2 [formerly 3d36cec7be [formerly 64517ab3139be3cc21d5df7ff9d36709435bd7cd]]]]
Former-commit-id: fdeff81da2
Former-commit-id: d27369f59b [formerly 89c999410e] [formerly 6d36de8b83b8bd6d75e28507dfdb4314d2a89f81 [formerly 49ffb7e92c]]
Former-commit-id: 8474d807f157d7a0e7fc99090b358e9a371bb8fe [formerly a0e805ded6]
Former-commit-id: a92af46f59
2013-10-31 14:06:37 -05:00
Ron Anderson
2b4809ead7 Issue #2508 Added DiscreteGridSlice.getKeys(), deprecated getKey()
Change-Id: I5d47498c2056de1c217927102770092bb57a372c

Former-commit-id: f0529e0eee [formerly b61ccc1609] [formerly 38e33092a2] [formerly f0529e0eee [formerly b61ccc1609] [formerly 38e33092a2] [formerly 42e924e021 [formerly 38e33092a2 [formerly 19246ae601e292bd26ba8ba6b9446ef8d82ee663]]]]
Former-commit-id: 42e924e021
Former-commit-id: dd1b50d116 [formerly 2f23072e41] [formerly e573e83de25a263065e03ab739ab5d58c0ca7fb1 [formerly eef9d2dfb0]]
Former-commit-id: 6420457c498cf2f6184538b3831ba133f0623c15 [formerly e3a0440825]
Former-commit-id: 49ea9c0444
2013-10-31 14:04:55 -05:00
Nate Jensen
b7c11ac174 Merge "Issue #2491 Bug fixes and clean up all remaining resource datas. Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6" into development
Former-commit-id: 7648e116ad [formerly b17891ba0e] [formerly ccf3d5b1e9] [formerly 7648e116ad [formerly b17891ba0e] [formerly ccf3d5b1e9] [formerly de50a9214b [formerly ccf3d5b1e9 [formerly fc3adf193a8afacfec4c36feae4a3f1384119922]]]]
Former-commit-id: de50a9214b
Former-commit-id: 2aa3471a8a [formerly c9d9070600] [formerly c89ecfda3d23b19bae8caa3e9277339aa3c12a03 [formerly d6fcc98e76]]
Former-commit-id: ae9c745301a10896244f2d9c9846983381ddd2ac [formerly c24d8c63cd]
Former-commit-id: 3c1f343be5
2013-10-31 12:24:23 -05:00
Richard Peter
2baf599758 Merge "Issue #2292 - refactor and move overlap/duplicate checks to edex. Peer review comments" into development
Former-commit-id: 2b9cf07bfe [formerly 5048d010f5] [formerly 3139055873] [formerly 2b9cf07bfe [formerly 5048d010f5] [formerly 3139055873] [formerly b482eb2b48 [formerly 3139055873 [formerly 1f07e88f442c0426a9006a2f139d6eef9395ad51]]]]
Former-commit-id: b482eb2b48
Former-commit-id: 7b0ad6bacc [formerly fca3d73aa7] [formerly f7dbb5f3661236898b603e2fdf7604e44f42274a [formerly 73462fa134]]
Former-commit-id: 1019515624c081b6c221e0d3722489ce94b4ad06 [formerly 300f907c46]
Former-commit-id: ab890140fb
2013-10-31 11:46:25 -05:00
Mike Duff
e48beadbc6 Issue #2292 - refactor and move overlap/duplicate checks to edex.
Peer review comments

Change-Id: I33df9cc7e368778943e25420d18b343781304c7a

Former-commit-id: fbcf271899 [formerly c1bd170f8a] [formerly f123fa11f5] [formerly fbcf271899 [formerly c1bd170f8a] [formerly f123fa11f5] [formerly 3fc811102e [formerly f123fa11f5 [formerly f7405c2acfef95b57b79cf6d8ac3348017e64a59]]]]
Former-commit-id: 3fc811102e
Former-commit-id: ce2afdf1b3 [formerly b0c54d7c17] [formerly ac9b1be9e56f34d03174be87fbb48c2a6a187cdc [formerly 4da0648461]]
Former-commit-id: ece01cf9cf7d6b3d925c922f4d1d6fe84edf0f17 [formerly 26ca1b4d72]
Former-commit-id: 5ff3fe2791
2013-10-31 09:22:50 -05:00
David Gillingham
c7e966b43e Issue #1843: Return status back to client when contacting one of the
configured ETN partners fails.

Change-Id: I5bd49f6930c317ba21725ff53f6ab65d548f037c

Former-commit-id: ab3b629a6b [formerly c58160c9a9] [formerly 297fd6c3d4] [formerly ab3b629a6b [formerly c58160c9a9] [formerly 297fd6c3d4] [formerly b7b29a1fdb [formerly 297fd6c3d4 [formerly 18a09da6aba3caf83f4c4df71f2fcffb63043fb1]]]]
Former-commit-id: b7b29a1fdb
Former-commit-id: 2ddacaea30 [formerly 68b0b2e3db] [formerly 0f0aefb2c1b9d5dfbee8cd33020b863e61f2b01f [formerly 996817f124]]
Former-commit-id: 88b3c16c68fc66755ed20e6b4157548ca26d3124 [formerly eef2c93d6c]
Former-commit-id: 75acd532a1
2013-10-30 11:34:46 -05:00
Ben Steffensmeier
e193ba7f0f Issue #2491 Bug fixes and clean up all remaining resource datas.
Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6

Former-commit-id: a4cbc8020a [formerly e15fecc459] [formerly 5b395f7417] [formerly a4cbc8020a [formerly e15fecc459] [formerly 5b395f7417] [formerly 27a392f90e [formerly 5b395f7417 [formerly 2412d6f094f98a8c24491ab43a2a88cf696758af]]]]
Former-commit-id: 27a392f90e
Former-commit-id: 8ec09e8f61 [formerly 78efdb7572] [formerly 08cc956d9a9abcf58a33328430ea1253b6f6e00d [formerly 418c259567]]
Former-commit-id: a33b0178c5a7309ae9c12ac4f7b2267997da8f07 [formerly 9d87eb50e2]
Former-commit-id: 02b9133d50
2013-10-29 17:35:55 -05:00
Nate Jensen
89b3b81ab3 Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code
Former-commit-id: a18df07586 [formerly 554a9cddf3] [formerly f3143ba7b4] [formerly a18df07586 [formerly 554a9cddf3] [formerly f3143ba7b4] [formerly 6880a18f1a [formerly f3143ba7b4 [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]]]
Former-commit-id: 6880a18f1a
Former-commit-id: dced4c4d11 [formerly 19043faeaa] [formerly df19f622b8df95f3d1447cd1c6c599d088ba4b1c [formerly f2751f017e]]
Former-commit-id: 15fd50423e5c76bf2d7d7f54653759492ef97c8d [formerly e8c199f108]
Former-commit-id: f2184b9379
2013-10-29 14:33:53 -05:00
Mike Duff
589da45d3f Issue #2430 - Implement the percent used bandwidth utilization graph.
Change-Id: Iad1d750ec1bb0a66a833f8358e27a80d0d6b42c5

Former-commit-id: cff7e321f0 [formerly 2d7c38290e] [formerly 6d5f697300] [formerly cff7e321f0 [formerly 2d7c38290e] [formerly 6d5f697300] [formerly 25e4a4741c [formerly 6d5f697300 [formerly 5b628ac782fc8b76729c74fe8bf995a7fc634aaa]]]]
Former-commit-id: 25e4a4741c
Former-commit-id: 3f502364c9 [formerly 4beb79d5a7] [formerly 1328f5fc6ad281525c7abd057dcd30572f31ff3d [formerly 73ecb9af6b]]
Former-commit-id: ae4c63d618c1eb58242c2ffdaf294d319749571c [formerly 2c7dbda379]
Former-commit-id: 26941f1033
2013-10-29 13:49:47 -05:00
Ben Steffensmeier
9c4692235f Issue #2491 Move ncep bundles off od SerializationUtil.
Former-commit-id: ca73be2ecb [formerly 9c62c3bae2] [formerly a4174430f7] [formerly ca73be2ecb [formerly 9c62c3bae2] [formerly a4174430f7] [formerly 204b47c67d [formerly a4174430f7 [formerly ddaa8e9ded31fb0676f949d5a98a30ad1709a25b]]]]
Former-commit-id: 204b47c67d
Former-commit-id: 7e0cb095c2 [formerly 09347cdd5a] [formerly 479b38fd22c3992c7e8afaec4ff032e7fa45f9d9 [formerly 9540b309b3]]
Former-commit-id: 4bf44aa82f7b082680aa650f926af4dfec1c5040 [formerly fd931a3e64]
Former-commit-id: c57dc46dfc
2013-10-29 12:28:07 -05:00
Nate Jensen
553475c0a2 Merge "Issue #2491 Remove ISerializableObject references in core and d2d viz plugins. Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07" into development
Former-commit-id: c1a5165bf9 [formerly 4cd0b3fed7] [formerly ac65672cb2] [formerly c1a5165bf9 [formerly 4cd0b3fed7] [formerly ac65672cb2] [formerly f62f7dc851 [formerly ac65672cb2 [formerly a35255318c9e5160f69cb784b86fd7d145465aac]]]]
Former-commit-id: f62f7dc851
Former-commit-id: 7ac7a7ce3d [formerly 9dc4378fc4] [formerly 236fe4b18811523bce5e5090bd5f361fa56869a5 [formerly 87917f3548]]
Former-commit-id: 0e9c2c54cf24b0469949784c3ccb934967d72820 [formerly 98118ccced]
Former-commit-id: b2072949f9
2013-10-28 13:27:17 -05:00
Ben Steffensmeier
d74e82bcc5 Issue #2491 Remove ISerializableObject references in core and d2d viz plugins.
Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07

Former-commit-id: 642e80aadb [formerly 4e86bb8e5f] [formerly 65522e83c9] [formerly 642e80aadb [formerly 4e86bb8e5f] [formerly 65522e83c9] [formerly 5b439696df [formerly 65522e83c9 [formerly 57825609e668f6595fa8cc6da4ec81a310abf966]]]]
Former-commit-id: 5b439696df
Former-commit-id: 285a0af019 [formerly 54a39977f5] [formerly ae5d9cd5f9d93524f8b356e1b865d0b7966eab25 [formerly 6866344496]]
Former-commit-id: a70f5f2f9ec94543623b1366018f66b21d4873b5 [formerly e3e621660f]
Former-commit-id: c0ba7d0acc
2013-10-28 13:16:23 -05:00
Ron Anderson
b0f0709755 Merge "Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins." into development
Former-commit-id: 283404400d [formerly dd3ef2844c] [formerly fa5b6dce02] [formerly 283404400d [formerly dd3ef2844c] [formerly fa5b6dce02] [formerly f2cfc0c686 [formerly fa5b6dce02 [formerly c4c1905a1ac16682ad5607b853041905dbde8a5b]]]]
Former-commit-id: f2cfc0c686
Former-commit-id: 306a5d72f4 [formerly 3575496955] [formerly 6d4daeecfebab06573c97b74f855c3bb1daa7ec9 [formerly dda2eb89c1]]
Former-commit-id: 53c38fe54d2869c9707556e4244b69af6f55a908 [formerly 1daa0f8649]
Former-commit-id: 643624f1a9
2013-10-28 12:59:44 -05:00
Ben Steffensmeier
5ac77f7f76 Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: ef2a281d45 [formerly 0c66089721] [formerly 27165cea30] [formerly ef2a281d45 [formerly 0c66089721] [formerly 27165cea30] [formerly 44a6f05986 [formerly 27165cea30 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]]]
Former-commit-id: 44a6f05986
Former-commit-id: 2400380daf [formerly 0e3cf8b47f] [formerly 82a83e55a2fa0b6a003492ed127ecae2ee7df8d2 [formerly 1f33a1997e]]
Former-commit-id: d4c767bc5d9a92f47044beb03900b35fdf1a24a2 [formerly 0c3bb6ef3e]
Former-commit-id: 47d3fb8249
2013-10-28 10:14:08 -05:00
Nate Jensen
7068ef91de Merge "Issue #2491 fix d2d xy bundles." into development
Former-commit-id: 3843a2fe2d [formerly b8d194e4cd] [formerly ca2e057635] [formerly 3843a2fe2d [formerly b8d194e4cd] [formerly ca2e057635] [formerly cda57ce742 [formerly ca2e057635 [formerly cbd9dabab1b08d2b3eb2814701bfa40d66ec5e54]]]]
Former-commit-id: cda57ce742
Former-commit-id: 91c89ad6e6 [formerly 4938d287fe] [formerly e024ea40dde60c244a0a5d34215ef2a3de55bd6d [formerly fad56e0c5f]]
Former-commit-id: 2afabcbb665bf52059f4323b46d5d543310c7c5f [formerly b48d5d53c3]
Former-commit-id: 5d8c27a87a
2013-10-28 09:31:28 -05:00
Nate Jensen
f76f5e9257 Merge "Issue #2484 Added originatingSite to id for Subscription registry objects." into development
Former-commit-id: 9e65845da0 [formerly 13eafc05c2] [formerly 4b19d287ea] [formerly 9e65845da0 [formerly 13eafc05c2] [formerly 4b19d287ea] [formerly e4aa2b8a94 [formerly 4b19d287ea [formerly 4b16e5325f63bb7dde3d5a49770fd4c30b69266b]]]]
Former-commit-id: e4aa2b8a94
Former-commit-id: fa1bd6b2a4 [formerly 8aa02150c4] [formerly ca27ae050bf35e88c84ec39cb3554276213a3fe7 [formerly aa0e2ca80a]]
Former-commit-id: 0b16e90747665fb5bad2de4fb36673726f33e59a [formerly 2741cb4348]
Former-commit-id: 8feeb6be16
2013-10-28 09:07:04 -05:00
Nate Jensen
14125ffbc6 Merge "Issue #2491 Remove uneeded ISerializableObject files." into development
Former-commit-id: fe6680fb56 [formerly f98764cfb6] [formerly 5840b34e67] [formerly fe6680fb56 [formerly f98764cfb6] [formerly 5840b34e67] [formerly 15fbcd6984 [formerly 5840b34e67 [formerly 9d43ad381967fff847f33025461a31bb31816819]]]]
Former-commit-id: 15fbcd6984
Former-commit-id: a2bf6fb3fb [formerly e46c285eed] [formerly a46bb24ed422dbd3fd41b66e023bd7c2d4fc36e7 [formerly 68a8dbe064]]
Former-commit-id: 574be25a0b8cf316624f8a62bcea2d308e351fac [formerly 6dcd593f32]
Former-commit-id: 80e84760aa
2013-10-28 09:05:01 -05:00
Ben Steffensmeier
20d9922f17 Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins.
Former-commit-id: e796e01586 [formerly 3b68ce8d72] [formerly 2a83b45f93] [formerly e796e01586 [formerly 3b68ce8d72] [formerly 2a83b45f93] [formerly 4c03fc93f1 [formerly 2a83b45f93 [formerly f74c39d591d10748f7e66c15c80390389ab5ec25]]]]
Former-commit-id: 4c03fc93f1
Former-commit-id: 694511af94 [formerly 4eea088717] [formerly ea40a4ab707d0769a72c89593d2b1a20c48d84a7 [formerly fbdcadb456]]
Former-commit-id: 122ec98ee5a18fcf8773f9c00abd54bcb37bbc42 [formerly 5645da0b45]
Former-commit-id: ddd58aa99c
2013-10-25 15:50:10 -05:00
Ben Steffensmeier
a81a780533 Issue #2491 Remove ISerializableObject references in uf.viz.monitor plugins.
Former-commit-id: 54130af4c9 [formerly a629f974a5] [formerly 88ad284e71] [formerly 54130af4c9 [formerly a629f974a5] [formerly 88ad284e71] [formerly 3150d960e8 [formerly 88ad284e71 [formerly 16993be4fde0154ea58e4bc55cbecaabdc44b3cb]]]]
Former-commit-id: 3150d960e8
Former-commit-id: 13829ffd04 [formerly 237d947086] [formerly a38be6aaa816c5c84d60730b77824580d18d9898 [formerly 4311d8ea4c]]
Former-commit-id: d023f86bfbb89cb22f672fa575f06062ce7c63be [formerly 39768a50c1]
Former-commit-id: 5e0fc1b98a
2013-10-25 15:42:53 -05:00
Ben Steffensmeier
fed726dd48 Issue #2491 Remove uneeded ISerializableObject files.
Former-commit-id: 230309c25f [formerly f34bfc1e5b] [formerly c14cc609a8] [formerly 230309c25f [formerly f34bfc1e5b] [formerly c14cc609a8] [formerly cac1f07cbb [formerly c14cc609a8 [formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]]]]
Former-commit-id: cac1f07cbb
Former-commit-id: e03a1c1202 [formerly ce9653ab15] [formerly cbb9e5689b5ecaf7c5b0202dbf3d51fae0c0dda9 [formerly a06bdc56d6]]
Former-commit-id: 65760735e4213dff6ee5ff8730b9a56f136c8d54 [formerly 3955ac729f]
Former-commit-id: 7f38aac48c
2013-10-25 15:31:39 -05:00
Ben Steffensmeier
91e76a843a Issue #2491 fix d2d xy bundles.
Former-commit-id: bb59c04696 [formerly 9922b11f75] [formerly 5b6e32f47e] [formerly bb59c04696 [formerly 9922b11f75] [formerly 5b6e32f47e] [formerly 86ba5b9f09 [formerly 5b6e32f47e [formerly 4f41b90c20e25689a24d73bdd92e24952516199a]]]]
Former-commit-id: 86ba5b9f09
Former-commit-id: ed7e75b748 [formerly 8248ea2b3b] [formerly abfcb4c0128db0fe3c621473959c887bb4552882 [formerly ddf45e1cf4]]
Former-commit-id: 3ccecf75b62e442a4753a4c621bced1a16209986 [formerly 7272087374]
Former-commit-id: 0fd0580788
2013-10-25 14:46:43 -05:00
Nate Jensen
e95a9d9144 Merge "Issue #2491 Use reflections to build Procedure JAXB context. Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b" into development
Former-commit-id: 2c88b7d9b3 [formerly 3a453d5442] [formerly 002005139f] [formerly 2c88b7d9b3 [formerly 3a453d5442] [formerly 002005139f] [formerly 5a99163569 [formerly 002005139f [formerly 16f9a9ece5743e0e1f2cd71b23287defb277e915]]]]
Former-commit-id: 5a99163569
Former-commit-id: 264555b5d7 [formerly b511177fa1] [formerly 4719aa1e26e1f8f1e10b15401b23c42814a2069f [formerly cf63b37257]]
Former-commit-id: aa9fcf1acc90fd6b11cfb0a4d5eca4720d7a4f65 [formerly c4161d09ba]
Former-commit-id: 213478f84b
2013-10-24 20:02:18 -05:00
Nate Jensen
b9dcdb5c57 Merge "Issue #2303 Fixed CAVE status messaging by fixing the setting of the UFStatus factory handler." into development
Former-commit-id: c513cbaa22 [formerly 408ea200fc] [formerly b17fc59a5a] [formerly c513cbaa22 [formerly 408ea200fc] [formerly b17fc59a5a] [formerly b1244552e4 [formerly b17fc59a5a [formerly 757ee730af2455ac88f2b5a666e23d32e3e068ef]]]]
Former-commit-id: b1244552e4
Former-commit-id: e6e0942d70 [formerly 3a1856b168] [formerly 7e842a91bf165a8db2e89fabd3906c256ec6db0e [formerly 803c9a8217]]
Former-commit-id: 644254ee88425258cfd9ef4563cdae5a400c8634 [formerly 9b582b0d83]
Former-commit-id: 9dc852ba9c
2013-10-24 19:52:13 -05:00
Dave Hladky
dbdd2b4b2a Issue #2484 Added originatingSite to id for Subscription registry objects.
Former-commit-id: 68002da957 [formerly 577e2b84e9] [formerly 3c33f6e5ea] [formerly 68002da957 [formerly 577e2b84e9] [formerly 3c33f6e5ea] [formerly 36d7c60914 [formerly 3c33f6e5ea [formerly f3bd999abcbed2cfb78ebd88604fbe3128e6de34]]]]
Former-commit-id: 36d7c60914
Former-commit-id: e44f20606e [formerly db33e9cafa] [formerly 84058224c1b44f8002df97e875e14dd66e8446ce [formerly 2b5ffeab74]]
Former-commit-id: a1a65c2049f48990c7a3dd437ec75aeb77d12bc8 [formerly 916f035c87]
Former-commit-id: 7f8ff13d44
2013-10-24 13:52:45 -05:00
Ben Steffensmeier
a14d315ae5 Issue #2491 Use reflections to build Procedure JAXB context.
Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b

Former-commit-id: f98448d19f [formerly a935ffadf7] [formerly bfc3faf08f] [formerly f98448d19f [formerly a935ffadf7] [formerly bfc3faf08f] [formerly fa0a0619bc [formerly bfc3faf08f [formerly 220f77069726f3652ca5cd1f7c100e01cf38547a]]]]
Former-commit-id: fa0a0619bc
Former-commit-id: 3b4ae67ded [formerly 09a3276d51] [formerly 0c6ad2e7a6ad44d264169d56b0486e1f819a8499 [formerly d927e6b2d7]]
Former-commit-id: af4e8832b224839d1a54437070e9f5572038a410 [formerly 5971562d1a]
Former-commit-id: d1d057ae57
2013-10-24 11:28:06 -05:00
Richard Peter
776b6ac204 Merge "Issue #2446 Added cluster lock and check for purgeable data to publish." into development
Former-commit-id: ddcfb3785f [formerly 32131b3b27] [formerly 2220ce9aa3] [formerly ddcfb3785f [formerly 32131b3b27] [formerly 2220ce9aa3] [formerly b5072746fe [formerly 2220ce9aa3 [formerly d41377864a0a20fa6e09f6a035e33402b0d79c16]]]]
Former-commit-id: b5072746fe
Former-commit-id: ca392195cb [formerly feb1655ae3] [formerly c433dcb03f3a6c8f1b7988a97befddc483c4253f [formerly f71d65d257]]
Former-commit-id: cb8cd359a1c87b2bc7f5d6308e30c68d34e6a1aa [formerly ea9b5e6c4a]
Former-commit-id: 25e3b7e114
2013-10-23 16:57:28 -05:00
Ron Anderson
7a6209b7a5 Issue #2446 Added cluster lock and check for purgeable data to publish.
Change-Id: Ib54c1f917251eb59920254682b1c707b7fdca089

Former-commit-id: 68ef7c7062 [formerly 680ba97826] [formerly 002bb6ab89] [formerly 68ef7c7062 [formerly 680ba97826] [formerly 002bb6ab89] [formerly cc28fca175 [formerly 002bb6ab89 [formerly 57d68b507b69ef4a72ceecaa20a9dce3c0d93de3]]]]
Former-commit-id: cc28fca175
Former-commit-id: 88f6e5d9d7 [formerly 0d9df14596] [formerly 4b9ce7666378daf235ca6c2275644a5d5cc7407a [formerly 20fcbd322e]]
Former-commit-id: bf7072abec62c42c21107a8d66df0a85d338f36d [formerly b9c5d96961]
Former-commit-id: ee845f3634
2013-10-23 16:02:40 -05:00
Nate Jensen
360066e5b8 Issue #2361 remove dependencies on mesowest and delete dead grichardson code
Former-commit-id: bd9578dd6d [formerly 65d7d4dac9] [formerly 477c64c8bd] [formerly bd9578dd6d [formerly 65d7d4dac9] [formerly 477c64c8bd] [formerly 2f79b34a77 [formerly 477c64c8bd [formerly a91a4fe2261050daee83b1edaa7d01404b7b89a0]]]]
Former-commit-id: 2f79b34a77
Former-commit-id: d2af0d52a6 [formerly 2419a99ac7] [formerly a01d69eb125667dc0511591658732e612649a73e [formerly 1adac8829f]]
Former-commit-id: a2aea41bda81ba451fdb55f8030f7d56d6699493 [formerly c9cdcc056a]
Former-commit-id: 41dab56b49
2013-10-23 14:52:29 -05:00
Brad Gonzales
17fe979698 Issue #2303 Fixed CAVE status messaging by fixing the setting of the UFStatus factory handler.
Amend: Also applied old patch to fix tool tips on message bar.

Change-Id: I2f83bbd07be9cb07d51c23a7e068144692f44771

Former-commit-id: 3a450cd3c0 [formerly df1e60b078] [formerly 60d7a13afd] [formerly 3a450cd3c0 [formerly df1e60b078] [formerly 60d7a13afd] [formerly e3883dba15 [formerly 60d7a13afd [formerly 3abca4ca950facaaa5a29cf2aaa6fccdcf469e95]]]]
Former-commit-id: e3883dba15
Former-commit-id: a6b82470eb [formerly 086dfe9ebc] [formerly 626bc6ac4ce722cbc6c9e2cd43b6ed575ca56112 [formerly b8cd1d5446]]
Former-commit-id: 1ca501591be07777618ac2ea857a9cccc4228ac9 [formerly 5b5bb8975d]
Former-commit-id: f71babda9a
2013-10-23 14:13:03 -05:00
Lee Venable
2bf50b46b9 Issue #2483 - Fixed image memory leak.
Former-commit-id: 1a52e2b388 [formerly 73caae724c] [formerly a2f75e547d] [formerly 1a52e2b388 [formerly 73caae724c] [formerly a2f75e547d] [formerly 3d6547d644 [formerly a2f75e547d [formerly b590a1d5799a94068fe9e444e40bb3819d596071]]]]
Former-commit-id: 3d6547d644
Former-commit-id: 0d399cc52a [formerly 25c7bd679f] [formerly 3d39b70d995dcfb7c2529bb9b72c3ce4df1b010c [formerly 74603afd97]]
Former-commit-id: f5083a1cd8fdfc81b02738eb21c687f754459c86 [formerly 8f1956da81]
Former-commit-id: ce35925120
2013-10-23 08:26:49 -05:00
Nate Jensen
a30f43298f Merge "Issue #2361 undo loading maps at startup" into development
Former-commit-id: d936dc839d [formerly 0e5ea7744e] [formerly ced02a508a] [formerly d936dc839d [formerly 0e5ea7744e] [formerly ced02a508a] [formerly 88ca2a78de [formerly ced02a508a [formerly 9e3b9ba67aafbcb0bfe7de147d00c44aa37403ac]]]]
Former-commit-id: 88ca2a78de
Former-commit-id: 223337178c [formerly 250f553532] [formerly a55807d37bbef25e8d8929bb33fd3ccf74c0257c [formerly 173e28b9d9]]
Former-commit-id: a5612755d90d9271066ed3e8223e83ba23762362 [formerly 00307deae3]
Former-commit-id: 3726903ddc
2013-10-22 13:05:22 -05:00
Nate Jensen
3c9107b0dc Issue #2361 undo loading maps at startup
Change-Id: If737fe16df0b11dbb2dd510697cba2ffaa5967a4

Former-commit-id: 4879e1d7d3 [formerly e65d392677] [formerly 5e2ebbaad8] [formerly 4879e1d7d3 [formerly e65d392677] [formerly 5e2ebbaad8] [formerly 938e4a3073 [formerly 5e2ebbaad8 [formerly 15c1452f6970515d91b5bcc0c75de1679f561c87]]]]
Former-commit-id: 938e4a3073
Former-commit-id: 9a6f474b0b [formerly 621eaab03a] [formerly 7b549b23c7a05b00918c0b4e70c2fde2005dabc1 [formerly d1ff15485c]]
Former-commit-id: 9f6b770f3d75d9f48fcf482b50635b65aa5b55cf [formerly 4f4af22201]
Former-commit-id: 4a1d2cfad5
2013-10-22 12:42:41 -05:00
Slav Korolev
08aaa44cc9 Issue #2455. Fixed error from test.
Former-commit-id: 34300d63a1 [formerly f64d667715] [formerly 359c281b1e] [formerly 34300d63a1 [formerly f64d667715] [formerly 359c281b1e] [formerly 981544290e [formerly 359c281b1e [formerly 86967352eba1893eb4ec40187638bfc33d06cc21]]]]
Former-commit-id: 981544290e
Former-commit-id: d56f7ca3a9 [formerly d0aa6f6f26] [formerly 90582b33ceb3e84ea08f1c20ad1a3bd68ef28ea6 [formerly 263244b606]]
Former-commit-id: 79a91e7b36c647374275b3525cb86e52f815bf12 [formerly 0ea9efa8dc]
Former-commit-id: 3324392dad
2013-10-22 12:34:34 -04:00
Nate Jensen
61edc6b315 Merge "Issue #2333 Merging gl refactor from GOES-R work. Preparing GL for data units in image." into development
Former-commit-id: 09ec04b9f4 [formerly 4aa40ad61a] [formerly 50bf735240] [formerly 09ec04b9f4 [formerly 4aa40ad61a] [formerly 50bf735240] [formerly aa0554d073 [formerly 50bf735240 [formerly 41462b804bf079368bead7c1271b1abdb7d4bf63]]]]
Former-commit-id: aa0554d073
Former-commit-id: b1a5a615f3 [formerly a58f2a6c10] [formerly ae45b51290b85ce8a744919e605659b1f78cc2cc [formerly d8a821746c]]
Former-commit-id: 1a926d99f4a7450015cd3c55043625a807584cbd [formerly fb879cfc00]
Former-commit-id: 4d18c2cc4e
2013-10-21 14:44:17 -05:00
Slav Korolev
aac48cb961 Issue #2451. Get highlighted rows on the table page after message update. Corrected.
Former-commit-id: 3eb5ae69c0 [formerly 981a44ffe9] [formerly d0d4f12057] [formerly 3eb5ae69c0 [formerly 981a44ffe9] [formerly d0d4f12057] [formerly a7883aabd3 [formerly d0d4f12057 [formerly 652094eb318459b1b73924ebba2b542b5f97eaff]]]]
Former-commit-id: a7883aabd3
Former-commit-id: da1acc7fff [formerly d5315c8f57] [formerly 08093b85ce58869330a7d6751c6f0a99e4322a03 [formerly 1d5a028ee1]]
Former-commit-id: 3666c28f3043bac34197daab36e0ae46547f4ec6 [formerly 6fe718d141]
Former-commit-id: 41a27352a0
2013-10-17 16:39:26 -04:00
Nate Jensen
0ca327d293 Merge "Issue #2361 fix scan alarm dialog" into development
Former-commit-id: b2629b9d22 [formerly 4c1a3fbd1e] [formerly 3a8650ef28] [formerly b2629b9d22 [formerly 4c1a3fbd1e] [formerly 3a8650ef28] [formerly 532d9f1bbe [formerly 3a8650ef28 [formerly 75265b17f65de80f0a0400d29a446cadbc619953]]]]
Former-commit-id: 532d9f1bbe
Former-commit-id: 9dd39289ef [formerly 32ecd61eae] [formerly f2c56097835e64f08a5d48331e7d3b30ef221a5d [formerly 64fdaa70d7]]
Former-commit-id: c51dde3dede79cee33009add35b4685dbb824a18 [formerly 2b3fc9fbc4]
Former-commit-id: 21585af43f
2013-10-17 14:20:52 -05:00
Nate Jensen
85b08d82c4 Issue #2361 fix scan alarm dialog
Change-Id: Ida44a00730fa14e3c161b4a8bf1ff630701cc426

Former-commit-id: 413ac9b322 [formerly 3ffc8c6c82] [formerly 31a01a7887] [formerly 413ac9b322 [formerly 3ffc8c6c82] [formerly 31a01a7887] [formerly 81fd87d9dd [formerly 31a01a7887 [formerly 566e8591050b83698d5d782f5a5d7885d1327534]]]]
Former-commit-id: 81fd87d9dd
Former-commit-id: ca63e8a2ee [formerly de55e62614] [formerly 3d0e510f23ea361cf143bfcee0bba966812d2c43 [formerly 4cd95b545b]]
Former-commit-id: 2febf7adf758c1dc164341a41c7debbbf9d50144 [formerly 17015834e9]
Former-commit-id: 33634c9cab
2013-10-17 13:55:19 -05:00
Slav Korolev
d362851509 Issue #2455. Fixed a problem with Changes Applied window. Corrected.
Former-commit-id: ba5556762c [formerly 604d542c63] [formerly 93b69bd6a7] [formerly ba5556762c [formerly 604d542c63] [formerly 93b69bd6a7] [formerly 4100629b39 [formerly 93b69bd6a7 [formerly c07a918474361d83907fb8de03538ec88486016d]]]]
Former-commit-id: 4100629b39
Former-commit-id: 80b0798d4f [formerly b3ec990f41] [formerly 9cc2d94fd6c5402787966d92170a9231e42ba36d [formerly 552789c978]]
Former-commit-id: 6715466f9b955837b01362479c75beb22132958d [formerly da45dbe1cb]
Former-commit-id: f3bc00b095
2013-10-17 14:17:11 -04:00
Max Schenkelberg
6608295c6a Issue #2333 Merging gl refactor from GOES-R work. Preparing GL for data units in image.
Change-Id: I6ec7c0808516cc1ce87e3325b54041366392d191

Former-commit-id: 3ec1b334cd [formerly 08cafadf8f] [formerly 676493c6e2] [formerly 3ec1b334cd [formerly 08cafadf8f] [formerly 676493c6e2] [formerly 004720f7a9 [formerly 676493c6e2 [formerly b4249acf8655c2c31e491cf945f2bb4fc00f7fad]]]]
Former-commit-id: 004720f7a9
Former-commit-id: af48a7e839 [formerly df3b18d237] [formerly 28d6f1e7606f37b873f1fed4610372d4a7014d7e [formerly 872652cab9]]
Former-commit-id: 5e783b2b5264365d80083fc6e37feb8602478bd8 [formerly d19010b129]
Former-commit-id: df73f86805
2013-10-17 12:59:23 -05:00
Nate Jensen
0f702b917c Merge "Issue #2460 Product browser display of adhoc subscriptions Change-Id: I9c045b781adb41468d395b67a837c9a862744447" into development
Former-commit-id: 82511938a0 [formerly decb9980fc] [formerly 8ef0c6e84e] [formerly 82511938a0 [formerly decb9980fc] [formerly 8ef0c6e84e] [formerly c8633d47cf [formerly 8ef0c6e84e [formerly 261a4f821cf2276849f3aab67f407147448ed979]]]]
Former-commit-id: c8633d47cf
Former-commit-id: 5637ba654f [formerly 1ca5f5fb4c] [formerly 3e0d80ff1a8f1fa9f0d4d551118a63138ae2a7e7 [formerly 268da5555e]]
Former-commit-id: 4d7d972d3a2d0b899fe5d562693efaa21888d703 [formerly 3490e0556f]
Former-commit-id: c26d55c517
2013-10-16 15:14:42 -05:00
Nate Jensen
343c2efd82 Merge "Issue #2389: Update NotificationManagerJob" into development
Former-commit-id: 5df556279b [formerly 7617fa37e3] [formerly 4d7125ecc5] [formerly 5df556279b [formerly 7617fa37e3] [formerly 4d7125ecc5] [formerly 697d0f8853 [formerly 4d7125ecc5 [formerly 9bd7ddeeb1e850eb1f8729f556fa46d5c70dc342]]]]
Former-commit-id: 697d0f8853
Former-commit-id: 128de383e2 [formerly 8f9ca27d50] [formerly fa6ee5f1dc33049e03880939e3155710f83ede24 [formerly b11c8e5c06]]
Former-commit-id: 8035686ac272bf01049f7c9ff6f557508223f647 [formerly 5ac7bc57f2]
Former-commit-id: 209d938d7d
2013-10-16 09:33:25 -05:00
Dave Hladky
e9dec56920 Issue #2460 Product browser display of adhoc subscriptions
Change-Id: I9c045b781adb41468d395b67a837c9a862744447

Former-commit-id: e14b51258b [formerly 7b6ef7ee9a] [formerly 6076f46549] [formerly e14b51258b [formerly 7b6ef7ee9a] [formerly 6076f46549] [formerly 477fbd3d59 [formerly 6076f46549 [formerly c504c44750f5f441be41c20fdb78a363c620fb3d]]]]
Former-commit-id: 477fbd3d59
Former-commit-id: aa5fd1ba3f [formerly 9880c82a36] [formerly a483ea67e7e78c9b17eaf6a48fb26ebec56271c3 [formerly 639019eff1]]
Former-commit-id: c88b0194e09755a944f026679b6a3c33a0aad9c3 [formerly 8a1f070927]
Former-commit-id: 33bd8d5cc4
2013-10-16 09:06:00 -05:00
Richard Peter
75d2a9e30a Merge "Issue #2473 Remove unneeded ncgrib functionality. Change-Id: If38138650660c75745091a82c231cd0fe8c92e38" into development
Former-commit-id: 596907fdf1 [formerly 74d34e7fb3] [formerly 9b987e8000] [formerly 596907fdf1 [formerly 74d34e7fb3] [formerly 9b987e8000] [formerly e1a0403c01 [formerly 9b987e8000 [formerly 1fb60210f841ee2ee9f127db33fe30df4222ff57]]]]
Former-commit-id: e1a0403c01
Former-commit-id: bd18628df9 [formerly 00f89efbca] [formerly 020e5955a6649bd7d4bb4c47058c6a42a54c0392 [formerly 4c983c7429]]
Former-commit-id: a564bbbd30c335f47363be07d4322f13adf3bcd8 [formerly 9b83504b42]
Former-commit-id: 00ea2b7c6d
2013-10-15 16:36:38 -05:00
Ben Steffensmeier
3af445a37a Issue #2473 Remove unneeded ncgrib functionality.
Change-Id: If38138650660c75745091a82c231cd0fe8c92e38

Former-commit-id: 0c0e339894 [formerly 10f74a1812] [formerly d25df40634] [formerly 0c0e339894 [formerly 10f74a1812] [formerly d25df40634] [formerly 51cd71c373 [formerly d25df40634 [formerly 49a3700d37c07f42991f7ca4a65f0fd4c7010f91]]]]
Former-commit-id: 51cd71c373
Former-commit-id: 50f81cf656 [formerly dcae8c6aa2] [formerly 91c71836947d0b2aea377fc28fa97fda33b6fd59 [formerly 24a6795677]]
Former-commit-id: ec49165c9e367122a2e3115a12c8a3e00aa1dbca [formerly 92828fbaa0]
Former-commit-id: 9ed413f0c2
2013-10-15 16:30:38 -05:00
Nate Jensen
fdfcd1ae84 Issue #2361 Added startup timing statements
Change-Id: I347b3e671ecd7c7c61b88e008e2d4c56d19e6108

Former-commit-id: 0d7d2257cc [formerly 3f107e931f] [formerly 323f594de4] [formerly 0d7d2257cc [formerly 3f107e931f] [formerly 323f594de4] [formerly d265f4ddf4 [formerly 323f594de4 [formerly 3f93aeeb8259600b1c6e0ff47641ff95337df605]]]]
Former-commit-id: d265f4ddf4
Former-commit-id: 84b16b89b5 [formerly 521c019757] [formerly 02d772fe8febbecc8657a8eacb5c61f6d3d41e3e [formerly d72a7f3c69]]
Former-commit-id: 5e12a372b6d817c05bc8593e1177b5c178c81b98 [formerly 4b2855e7cb]
Former-commit-id: ed1eb0adaa
2013-10-15 14:23:59 -05:00
Richard Peter
929a8dd118 Merge branch 'omaha_13.5.3' (13.5.2-10) into development
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java

Former-commit-id: cbf18e7a32 [formerly cbf53120dd] [formerly cd504e4e98] [formerly cbf18e7a32 [formerly cbf53120dd] [formerly cd504e4e98] [formerly 0787e7cc86 [formerly cd504e4e98 [formerly 1af6e051089c8f0a216307647e044d19d41f6828]]]]
Former-commit-id: 0787e7cc86
Former-commit-id: 210927720b [formerly 9896b051c1] [formerly 36f2423845a35dba4181db0c68f0634fbfc9eaef [formerly 1a62020265]]
Former-commit-id: 18e091b61bbc0c33f4f15918e97355378cbc6ded [formerly 03a58dabb2]
Former-commit-id: a8f823447e
2013-10-15 11:36:12 -05:00