Commit graph

1653 commits

Author SHA1 Message Date
Steve Harris
4ef41d2c35 Merge branch 'master_13.5.2' (13.5.2-1) into omaha_13.5.2
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: eb43afb042 [formerly 34e085ff97] [formerly 0791be2b77] [formerly cfe2ba88ad [formerly 0791be2b77 [formerly 5e0080743ae12b96d828451014a16ea118e25ce0]]]
Former-commit-id: cfe2ba88ad
Former-commit-id: 727a02ca1cf8ee5783dc8270301e0e9ffbdc71dc [formerly 116daf48ff]
Former-commit-id: 5abb143d01
2013-08-28 09:03:09 -05:00
Steve Harris
b4e006162f 13.5.2-1 baseline
Former-commit-id: 3cd0b2dfc6 [formerly 894d2425b2] [formerly 73dd0f166c] [formerly 542b2c3d18 [formerly 73dd0f166c [formerly a362ca91ee5972a1501a2842191fbe2e23feac9c]]]
Former-commit-id: 542b2c3d18
Former-commit-id: 43ff166b6d3df833e29603f504019d7b3776a1d1 [formerly 4ecb349ed8]
Former-commit-id: 43af1b227a
2013-08-28 09:43:48 -04:00
Richard Peter
8d6dd19565 Merge "Issue #2097 Initial update for OGC services Change-Id: I1bc8fc8a4c125bc79057c4af929c0495f0e5eb99" into development
Former-commit-id: b41733e62f [formerly 9ce57ca237] [formerly 7883b7642f] [formerly 34a6082255 [formerly 7883b7642f [formerly 96d335d72286bba82f9054b525f47450854797d1]]]
Former-commit-id: 34a6082255
Former-commit-id: e464ad97e5c451c923d9238fd91a98fb859d7428 [formerly f9a1a40bc2]
Former-commit-id: b418109df7
2013-08-28 08:26:51 -05:00
Dave Hladky
cfbbc7336f Issue #2097 Initial update for OGC services
Change-Id: I1bc8fc8a4c125bc79057c4af929c0495f0e5eb99

Former-commit-id: d4407744c2 [formerly d3bae9e065] [formerly 83dba7b655] [formerly bef4b3cdbd [formerly 83dba7b655 [formerly 875006e24de0755cdd0dedc7b0afcf221bcbad49]]]
Former-commit-id: bef4b3cdbd
Former-commit-id: e08c7ddce03a7cbe60a4ac8ba5e3f76990cd7780 [formerly 37062aac21]
Former-commit-id: 6a1a06e3ee
2013-08-28 08:24:45 -05:00
Roger Ferrel
3010d629f6 Issue #2225 Changes for make tar compressed files.
Change-Id: I154683fec10b57d548944dd9037d4ca61cbe1b1b

Former-commit-id: f418ef2cda [formerly b606e2b075] [formerly ddb6e16e80fa03b97223e9c05a013bda65efd850 [formerly d4eeceb020]] [formerly 477719a069 [formerly d4eeceb020 [formerly 3456f395e845457b1add41ca8d736a65b6fbb1c7]]]
Former-commit-id: 477719a069
Former-commit-id: 736660553836aebddc3fa93490dc0f5c2e086947 [formerly 9025cd3e30]
Former-commit-id: 65633833a8
2013-08-27 16:51:06 -05:00
Richard Peter
9564bfb78b Merge "Issue #1693 Fixed deploy" into development
Former-commit-id: 0383a244d5 [formerly 96aa0f78ee] [formerly 2109a65033] [formerly 3fc33070ae [formerly 2109a65033 [formerly 694e57e63ffdbb5f8d633c88c7423c0d582f310d]]]
Former-commit-id: 3fc33070ae
Former-commit-id: 1f46a3c826753333ffed7f73c87d6f8e697f9e1d [formerly 367f6f7863]
Former-commit-id: 5fdc3af01f
2013-08-27 15:57:07 -05:00
Benjamin Phillippe
39c566a5ac Issue #1693 Fixed deploy
Change-Id: Ic9db5951d8fa78580744380e84d3cd7496cf4530

Former-commit-id: db758f3753 [formerly aa4b536092] [formerly d7f31a61c0] [formerly d99620826c [formerly d7f31a61c0 [formerly 5e103126be41de2b4ac604d5bb118e8360690a4a]]]
Former-commit-id: d99620826c
Former-commit-id: 3eaacc851baf214ae1d437bdb6a469d1fb7fa3d5 [formerly bb7a94795d]
Former-commit-id: 98d27b5be2
2013-08-27 15:53:30 -05:00
Nate Jensen
d90cab61cf Merge "Issue #2250 Fix for importing the wrong Java class, and using WKTReader instead of WKBReader" into development
Former-commit-id: 4682297469 [formerly 68eda99d67] [formerly d30b76fbcf] [formerly 30f8b21f45 [formerly d30b76fbcf [formerly a4a6babdc549b90d0956e5c9e992c81698da670b]]]
Former-commit-id: 30f8b21f45
Former-commit-id: 65ea789fe886f300960dcf662f561f1d2e055813 [formerly b18397f172]
Former-commit-id: 7458da0643
2013-08-27 14:51:34 -05:00
Matt Nash
7d469c2454 Issue #2250 Fix for importing the wrong Java class, and using WKTReader instead of WKBReader
Change-Id: I46bde653be72b87a88ee26973904ae9c286e8ae9

Former-commit-id: 81c79a6ae6 [formerly f7e840192c] [formerly 4454ebd21f148ba2152f35b3b28202e2b97abb06 [formerly 14a41186be]] [formerly f5a321687f [formerly 14a41186be [formerly 7a64933a77793dd9429d583f15ba9b19efe138e6]]]
Former-commit-id: f5a321687f
Former-commit-id: 080eebc6168e4afb79779229bc334fe1562ad9e7 [formerly 0d8a97052e]
Former-commit-id: d8544c2cc9
2013-08-27 14:12:55 -05:00
Ron Anderson
8e26902f09 Issue #2287 Fix scaling and direction of wind/swell arrows in GFE
Change-Id: Id12823256fc3c383005098b83e72249284a36f33

Former-commit-id: 04def1379d [formerly df357588a0] [formerly 77db16933e] [formerly 803515f4ff [formerly 77db16933e [formerly b0c88cb7d71cf3e081596cd47d88d8412c2ea3d1]]]
Former-commit-id: 803515f4ff
Former-commit-id: 5764de917b8e19b33bed0061d37a440fbc638101 [formerly 518e32206e]
Former-commit-id: a1952b7c75
2013-08-27 13:51:17 -05:00
Ben Steffensmeier
3881b19c5a Issue #2262 add wxmath plugin to edex feature for use in soundings.
Former-commit-id: 8dc1b21e12 [formerly 4846602407] [formerly d029bf2527] [formerly d1907b0680 [formerly d029bf2527 [formerly f47803e32c9029f49bd4d3eb7f417ff2999cfdde]]]
Former-commit-id: d1907b0680
Former-commit-id: fb5356af37b2068398be18cf25b7263179cc09f3 [formerly c23306ad16]
Former-commit-id: 4dcd421a33
2013-08-27 11:12:06 -05:00
Nate Jensen
a4b650e7af Merge "Issue #2262 Port ept to java." into development
Former-commit-id: fb71fc869a [formerly f7f3e7a662] [formerly 963967887f] [formerly d7932c9288 [formerly 963967887f [formerly 9d54442e8c175488857ed0540b4ed381949503e0]]]
Former-commit-id: d7932c9288
Former-commit-id: 3b6e7b6f238b24303bde4436c10e1a57a0983be3 [formerly e8abace394]
Former-commit-id: 3077cfcc74
2013-08-27 09:17:45 -05:00
Ben Steffensmeier
929dc23b78 Issue #2262 Port ept to java.
Former-commit-id: a63079d509 [formerly e3b0b2b81f] [formerly fe739a6018] [formerly b6a8c63cff [formerly fe739a6018 [formerly a11ef952b6a7cf3135e07fa3161662783df37f74]]]
Former-commit-id: b6a8c63cff
Former-commit-id: bd2d1d660838ddb8b1b7b81993088f4980ba82e0 [formerly 969c467922]
Former-commit-id: c59c26b7ab
2013-08-26 16:35:30 -05:00
Nate Jensen
00eed61f7c Merge "Issue #2250 add array functionality checking to JUtil" into development
Former-commit-id: da447be5e3 [formerly 2e42aaccad] [formerly 4fa0a3855aecd16c14b5d126cb5aa4d0a71fa209 [formerly e214710122]] [formerly 796bd10c81 [formerly e214710122 [formerly 96ba088c29bf105688fbcad5bdfa620cf1875b14]]]
Former-commit-id: 796bd10c81
Former-commit-id: 9225e4c8a83129935c04190f5c9752aa53c91c18 [formerly 790017b753]
Former-commit-id: 5616b90b79
2013-08-26 13:04:21 -05:00
Matt Nash
c35007a0e3 Issue #2250 add array functionality checking to JUtil
Change-Id: Iffb4ba9dedd23641de82d99550e2b0473f4a5d23

Former-commit-id: 3d871bef4c [formerly a5db9ddb3f] [formerly 57681b27b9] [formerly 2ed6658f4a [formerly 57681b27b9 [formerly a09ef5f2bad2a83394ec9a5f0dbb2edd4df0b961]]]
Former-commit-id: 2ed6658f4a
Former-commit-id: f80e17d7028947cfaf6174e7faec1b3b4c324b04 [formerly 60547123d8]
Former-commit-id: 2e3b2269d9
2013-08-26 12:58:58 -05:00
Mike Duff
cb0bd31b88 Issue #2180 - Pass messages back to CAVE
Change-Id: Ia5b88d577fc51b449a77389354e14808515e67bc

Former-commit-id: e9e712892f [formerly 4ed4e2a225] [formerly 20e6396c48] [formerly 5f462ebf6f [formerly 20e6396c48 [formerly 37de8f85f870ca494e5a641967f544e359df77b9]]]
Former-commit-id: 5f462ebf6f
Former-commit-id: 925559a0b7a9032d6b454b5d001bf47cf5684486 [formerly 70b186d19a]
Former-commit-id: 463eb504e0
2013-08-23 13:47:26 -05:00
Steve Harris
edd03a1cf1 Merge branch 'master_13.5.2' (13.5.1-18) into omaha_13.5.2
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	nativeLib/edexBridge/edexBridge.cpp

Former-commit-id: abb7bdd7ed [formerly decc9e4c36] [formerly e361386eab] [formerly 119af8a466 [formerly e361386eab [formerly a3671ea2935178a28dce6d075dc2067a609e6725]]]
Former-commit-id: 119af8a466
Former-commit-id: 4e6f59fd5b911fc5753e9e8c4824360e1ab43c50 [formerly 5b11d137df]
Former-commit-id: f56b906997
2013-08-23 11:36:43 -05:00
Richard Peter
ace6060431 Merge "Issue #2289 Speed up cape calculations. Change-Id: I56f2373779b2973a145b62c4f47b278458fd2d47" into development
Former-commit-id: de4b3a8c56 [formerly 7dc787bc00] [formerly 397b5123cb] [formerly 91a5f2b669 [formerly 397b5123cb [formerly 53faa91d53be5f71f6d0bee2174ec50fc41405a9]]]
Former-commit-id: 91a5f2b669
Former-commit-id: 30f27498137db73aa04c665903996123088e0232 [formerly ded4514e9d]
Former-commit-id: 7a71c50926
2013-08-23 11:23:25 -05:00
Ben Steffensmeier
ffa0c8494e Issue #2289 Speed up cape calculations.
Change-Id: I56f2373779b2973a145b62c4f47b278458fd2d47

Former-commit-id: 64c2f5f210 [formerly 93fc3eeb81] [formerly ce16be3666] [formerly d2c848e202 [formerly ce16be3666 [formerly 1120ff36f2b0906445950fabbeb0b7429865c0b2]]]
Former-commit-id: d2c848e202
Former-commit-id: 9359d0070da0710f849355df73330cc6d12c5f45 [formerly 56067a38f8]
Former-commit-id: d700fc7c6d
2013-08-22 18:39:39 -05:00
Nate Jensen
ef0c3ea8cf Issue #2262 port scaleless_analysis to java
Change-Id: If59be97230f243859c02d7de6117bc9ed6c6b4af

Former-commit-id: c56cfb7e92 [formerly 589824e9c7] [formerly e1d0ae50786c23aa2a284907014e54088d1c4e2b [formerly 1c54f1ec82]] [formerly 0e227df511 [formerly 1c54f1ec82 [formerly 68a70c091203c74f33dc17ff31c3707c2c4c2a5a]]]
Former-commit-id: 0e227df511
Former-commit-id: 64a4c9bbc5de8aa7c6c37bf5a5f25cd1449e010d [formerly cc8cc61db5]
Former-commit-id: aa001b5b6c
2013-08-22 14:50:54 -05:00
Steve Harris
ff31991527 13.5.1-18 baseline
Former-commit-id: 80d8236464 [formerly d931b80e70] [formerly afb34814dd] [formerly 0a7acf96c7 [formerly afb34814dd [formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]]]
Former-commit-id: 0a7acf96c7
Former-commit-id: bef853d6001eb232a3c91986195c4ab5e86bc9cd [formerly 2f9aa87a9f]
Former-commit-id: 261b1da9d6
2013-08-22 09:12:43 -04:00
Richard Peter
a747e8c783 Merge "Issue #1693 Fixing dependencies" into development
Former-commit-id: 79c0e8d3e6 [formerly d7f63873c0] [formerly 1b223090e7] [formerly 1d2c4ea875 [formerly 1b223090e7 [formerly 9e6402a60994f17f3c8e61a2fc5ee3397c9f8da6]]]
Former-commit-id: 1d2c4ea875
Former-commit-id: 7c24df57f5a2b3778db48597544b0de1d3adc710 [formerly 61a042cf41]
Former-commit-id: 28aac73af0
2013-08-21 16:33:22 -05:00
Benjamin Phillippe
f467102072 Issue #1693 Fixing dependencies
Change-Id: Id62a593dfa9b3d6c09e998689f199d980dda0ed9

Former-commit-id: de11fc45b9 [formerly eebb355e81] [formerly 0d8adcade1] [formerly 2f0949aa0a [formerly 0d8adcade1 [formerly 73c647449e071c9290c7b7fa57e99490960be536]]]
Former-commit-id: 2f0949aa0a
Former-commit-id: 89aadc836192621ada769d9a7110d29964dbdcb0 [formerly 1561652425]
Former-commit-id: 93b1969f05
2013-08-21 16:28:49 -05:00
Richard Peter
5a64f3d1d0 Merge "Issue #1693 Fixing build again" into development
Former-commit-id: 9ed917a61d [formerly 63507ec12c] [formerly 4c47f74b91] [formerly cecd9a88e2 [formerly 4c47f74b91 [formerly e9b7e645b418e855e4ab14ba0c3fa35de545147b]]]
Former-commit-id: cecd9a88e2
Former-commit-id: 0eb24aa5f65dec60e12ccdd8754ada6a17f33090 [formerly 9d4f18f978]
Former-commit-id: 3a866323d0
2013-08-21 15:56:09 -05:00
Benjamin Phillippe
646ab1c672 Issue #1693 Fixing build again
Change-Id: I6af71ab102b13a0bc0ecefc794cbdf69742d935f

Former-commit-id: 31c6263f0f [formerly 078a8b2a98] [formerly b74eda779e] [formerly c3308766ee [formerly b74eda779e [formerly dbe29fbcec7e9e444113471806f19c83a4b6c5c5]]]
Former-commit-id: c3308766ee
Former-commit-id: 6ffad3646de9572c10354d6325f947dc4dbcbad7 [formerly 2ca4a747bf]
Former-commit-id: ac289ecc77
2013-08-21 15:55:04 -05:00
Richard Peter
56bf18f310 Merge "Issue #1571 Refactored GFE to store GridParmInfo and ParmStorageInfo in PostGres" into development
Former-commit-id: 8a37927e03 [formerly 918413d154] [formerly 02442e8fba] [formerly b6ed64f7bc [formerly 02442e8fba [formerly 2d79cbb93508d5c7f3a16fc4774c34deaa07923b]]]
Former-commit-id: b6ed64f7bc
Former-commit-id: 707315a7b11ef526cb2d9e1abb7ee6bf1822651d [formerly 53d8483087]
Former-commit-id: 4d00446318
2013-08-21 14:18:08 -05:00
Mike Duff
f991d691dd Issue #1848 - Don't show create shared subscription denied message on create sub when user doesn't have the create shared sub permission
Fix for cave startup

Change-Id: Ic5040a0bf89273669cc450370c4d858072df0dd8

Former-commit-id: 0f7e76ca43 [formerly 3797ca9523] [formerly 77e2d04073] [formerly 158b0f8564 [formerly 77e2d04073 [formerly 43a3349eda74743ccbccbef2e04bf80a54beba24]]]
Former-commit-id: 158b0f8564
Former-commit-id: d46b73738f4a15ee173ba2660c33b433eaf7284e [formerly 7228b3cf71]
Former-commit-id: edeb23f8d9
2013-08-21 13:46:55 -05:00
Benjamin Phillippe
1b76b2b73f Issue #1693 Fixing dependencies
Change-Id: I2e502e5ec97f94c316b534933f69285703b23a7e

Former-commit-id: fe5e7a019b [formerly 3310adfd0b] [formerly d7031d9c76] [formerly 087159b954 [formerly d7031d9c76 [formerly ab7af11f1a230cca095872751abfe7fb29c4500e]]]
Former-commit-id: 087159b954
Former-commit-id: 23ac05754354155c13b2eeda92e083ac5e76ee1c [formerly 384c70d990]
Former-commit-id: 345ba9baf0
2013-08-21 13:32:17 -05:00
Benjamin Phillippe
56f991703b Issue #1693 Fixed plugin dependency
Change-Id: I4633ee50d696961d3166203d3a155a9688c62fb6

Former-commit-id: dfaae68b19 [formerly 8c428829eb] [formerly db9c0af3a6] [formerly 416419bd27 [formerly db9c0af3a6 [formerly f8cbd960929249c4d711b54699fb7c7d973399f9]]]
Former-commit-id: 416419bd27
Former-commit-id: 4b6ff186b9f572ecdd921eee169612dff6a4af14 [formerly e5d3df9631]
Former-commit-id: 088009b83f
2013-08-21 12:50:57 -05:00
Ron Anderson
d586fe1031 Merge "Issue #2280 Fix plugin purging" into development
Former-commit-id: 464a3710ba [formerly ba6c8b4fae] [formerly 788a181336] [formerly 9ad6ca2c98 [formerly 788a181336 [formerly c52535a68ed4251527e54590319f2a5bf5baea72]]]
Former-commit-id: 9ad6ca2c98
Former-commit-id: 97e528858c7511081ec3834c5ca4d4d0cb7adff9 [formerly 04e6ab0dc3]
Former-commit-id: d765f460b2
2013-08-21 11:49:17 -05:00
Dave Hladky
163ad9ea52 Issue #2280 Fix plugin purging
Former-commit-id: 4b7500394e [formerly 1764948e53] [formerly 35b9b81e86] [formerly 8b80ed7ae1 [formerly 35b9b81e86 [formerly 7678e5a7b42b704ed531197291c1de5a7f2d14de]]]
Former-commit-id: 8b80ed7ae1
Former-commit-id: 8832587555032f680142685243825a6ea102717c [formerly c18fa655ff]
Former-commit-id: 9aefefa9d0
2013-08-21 11:45:25 -05:00
Richard Peter
04ad1d85a9 Merge "Issue #2280 Fix plugin purging" into development
Former-commit-id: 8e91e1ef7b [formerly b9e5d6c6b5] [formerly 317cd3417e] [formerly 38b983f09e [formerly 317cd3417e [formerly 17ec421694428d148db6744e288b0b5c44b66aed]]]
Former-commit-id: 38b983f09e
Former-commit-id: 791d5cc73e494acf099d6b1c51502c1d3fee678c [formerly 05819e8491]
Former-commit-id: d967b6ce7f
2013-08-21 11:29:54 -05:00
Ben Steffensmeier
04359ae0e4 Issue #2259 Restore WxMath functionality used by popup skewT.
Change-Id: Ibfb2d2fda05ad0f03d8e708e18d2b93b4914e7d2

Former-commit-id: 367dc2b0d9 [formerly 4fd0fb8863] [formerly d10a32ffa0] [formerly 25be2a014c [formerly d10a32ffa0 [formerly c3aa2c78243afcfa02c0988b16cf6640e35e73dc]]]
Former-commit-id: 25be2a014c
Former-commit-id: 4681e22e05a2186ef0af3afe86baa47cfb8b7feb [formerly 3697dd958a]
Former-commit-id: 1d863558b1
2013-08-21 11:27:50 -05:00
Ben Steffensmeier
160e4211fe Issue #2259 Delete old skewt plugin.
Change-Id: I41bd0e2268c5024ea88215683c4ecb12530ebd0d

Former-commit-id: 7da738187f [formerly d28018c5ce] [formerly e66bf7ce93] [formerly 3741068984 [formerly e66bf7ce93 [formerly 6f28d04b100001530afd17df69b87a6ac5a6407d]]]
Former-commit-id: 3741068984
Former-commit-id: ea81fa29a5c9a06d39f8e17d8fd3492521c9f46b [formerly 8eaa12c9db]
Former-commit-id: 3679a4526c
2013-08-20 17:57:06 -05:00
Ron Anderson
c17e493249 Issue #1571 Refactored GFE to store GridParmInfo and ParmStorageInfo in PostGres
Change-Id: Iae7cf49fc18abf03ef3b0ee498fb8e658f37d1cf

Former-commit-id: 3de94947e0 [formerly 3fd2f523d9] [formerly 04d2fdc214] [formerly 5aee6f35ff [formerly 04d2fdc214 [formerly 3094dc247a6de94ff00321d093b431e3f401b0c5]]]
Former-commit-id: 5aee6f35ff
Former-commit-id: 288c866bff4b051e23f64443aa754d46ba800e69 [formerly f0fb2391af]
Former-commit-id: 06cbd815be
2013-08-20 17:16:21 -05:00
Dave Hladky
84539edfcf Issue #2280 Fix plugin purging
Former-commit-id: 60f1e78650 [formerly 6aabf969a8] [formerly b0eeafe7d4] [formerly 4a10a699a9 [formerly b0eeafe7d4 [formerly 12aa32056e70d27aee62935ed7057812bd8107ef]]]
Former-commit-id: 4a10a699a9
Former-commit-id: a807aa07ca215af3991749568d459860cba64732 [formerly cf922cdefa]
Former-commit-id: 43dd1e18c2
2013-08-20 16:18:23 -05:00
Nate Jensen
0401d0a7e4 Merge "Issue #2250 resolve some ffmp data factory issues and make some changes to failing function calls in FFMP, and handle new types of objects in JUtil" into development
Former-commit-id: c77944ebf9 [formerly 783b7d151f] [formerly 8d01eefc50] [formerly 6941e3300b [formerly 8d01eefc50 [formerly 811924693ef44e87aae65a33c8decd1a7f1cd321]]]
Former-commit-id: 6941e3300b
Former-commit-id: b8571d4f62a6d7bb65ed8d2de800f4c718290db7 [formerly 599642edf5]
Former-commit-id: 4de49cde5a
2013-08-20 14:49:24 -05:00
Ben Steffensmeier
f558d240ba Issue #2194 Fix site override.
Former-commit-id: 85c71b7714 [formerly de00b302b3] [formerly 791c6a9890] [formerly dac718634c [formerly 791c6a9890 [formerly faba58780d497f8db564c0fa325c07b35326e010]]]
Former-commit-id: dac718634c
Former-commit-id: 1d5ea6677cdb2f75d1fabaa5d51f91e64314f0f3 [formerly 4e218e9e56]
Former-commit-id: e757a184e1
2013-08-20 14:47:32 -05:00
Matt Nash
ea6a00398f Issue #2250 resolve some ffmp data factory issues and make some changes to failing function calls in FFMP, and handle new types of objects in JUtil
Change-Id: If6b33d542e2a0c2744e6c906d98273f589694772

Former-commit-id: cf970e11ea [formerly c2da9a7152] [formerly 4c8e631e22] [formerly 304ef3e3b8 [formerly 4c8e631e22 [formerly 8916efbaad066e1b5dc6d01b68fa67c72ebc982b]]]
Former-commit-id: 304ef3e3b8
Former-commit-id: df4d2b3c7f7f83d412274f6be61ebe5b08f0dff3 [formerly b2b6246ead]
Former-commit-id: d7a87afa96
2013-08-20 12:10:19 -05:00
Roger Ferrel
6fb558b74b Issue #2220 Better response using priority queues and delay getting display data.
Change-Id: I5f7b8eb904dcde9ef52acc2f39df864ac62080bb

Former-commit-id: b9bf2ab9b7 [formerly 73cc41435b] [formerly 23bfd136b2] [formerly c626f25565 [formerly 23bfd136b2 [formerly 41b9f80efe66151a16b0df5b74ccc2904ac19e20]]]
Former-commit-id: c626f25565
Former-commit-id: c072ef91f16d6f97d00a8d53a1b34beec38c5335 [formerly 62563c8b7b]
Former-commit-id: 7d97beec44
2013-08-20 11:55:19 -05:00
Richard Peter
8b8959510e Merge "Issue #2196 Renamed ncfRegistry.sh to centralRegistry.sh and wfoRegistry.sh to registry.sh to correspend to the modes.xml names." into development
Former-commit-id: afbf699586 [formerly f623053d18] [formerly 02131eecb0] [formerly 36c486ca0a [formerly 02131eecb0 [formerly 4003a61f0b6ea56f31dcf6cf1be7ee16f70860be]]]
Former-commit-id: 36c486ca0a
Former-commit-id: dec2197b6f71ff5fba93a5326ecfee1870a32c21 [formerly 83eaf3f5fc]
Former-commit-id: d0c5729abc
2013-08-20 11:37:28 -05:00
Richard Peter
fc14b3c33d Merge "Issue #1692 Implemented/Verified Registry LifecycleManager - Verified submitObjects protocol - Added unimplemented features of removeObjects protocol - Implemented updateObjects protocol - Refactored registry error reporting - Fixed JUnit tests - Corrected @XmlRootElement tag on registry objects - Added capability to modify registry objects using XPath" into development
Former-commit-id: 8bfce05bc8 [formerly 4a581efbc5] [formerly 544504b029] [formerly afc8e8823f [formerly 544504b029 [formerly 95d945ad9fdfaf4a18d2fb6d9dd63b1314e95c8c]]]
Former-commit-id: afc8e8823f
Former-commit-id: 84b714c8157bb59dd7404ce6786e9f26cbc5bc14 [formerly 194604aa24]
Former-commit-id: 82239ba26f
2013-08-20 11:02:43 -05:00
Richard Peter
115e4fba92 Merge "Issue #1654 added Adhoc and SubscriptionRequestEvent. Added AdhocDataRetrievalEvent." into development
Former-commit-id: 78c4b99f96 [formerly 907ba11370] [formerly 3f68e90b92] [formerly fed1365d50 [formerly 3f68e90b92 [formerly d18c660b2b9d1f9c679118ca46be45c69d76aea7]]]
Former-commit-id: fed1365d50
Former-commit-id: 8865a2769a423b07a46c1d515ba69f5cdc297eab [formerly 75bdec15f2]
Former-commit-id: 15f4bda876
2013-08-20 11:01:05 -05:00
Brad Gonzales
f37dceacf0 Issue #2196 Renamed ncfRegistry.sh to centralRegistry.sh and wfoRegistry.sh
to registry.sh to correspend to the modes.xml names.

Change-Id: Ia07b046016e522089002440b4162de8370ee5343

Former-commit-id: 2d3426d9c7 [formerly 1c117e1ace] [formerly 6a98f66353] [formerly 6f7eb373d4 [formerly 6a98f66353 [formerly 17f72768dbee4239238c77d21a35a07c21824e88]]]
Former-commit-id: 6f7eb373d4
Former-commit-id: f3fd2c89c2b1032a1e52d05c547c81839d848716 [formerly aa63997a17]
Former-commit-id: 0b9acdf944
2013-08-19 16:56:09 -05:00
Ben Steffensmeier
fbf165f37f Issue #2275 Add dataURI column back into bufrmos types.
Former-commit-id: c444a0c4ba [formerly d6ab7d08be] [formerly 4cb853ac39] [formerly 9219db0069 [formerly 4cb853ac39 [formerly 1b883da972ac915252c256b63c881d23121f3ac6]]]
Former-commit-id: 9219db0069
Former-commit-id: ababd150fc882dda0dca13854e3bf316e1aafa9b [formerly 8b9031719a]
Former-commit-id: 3a8893846f
2013-08-19 16:00:01 -05:00
Steve Harris
4fd4093539 13.5.1-17 baseline
Former-commit-id: fb9ab08255 [formerly 2d882ccb54] [formerly 9dd7dc5d20] [formerly b210c90245 [formerly 9dd7dc5d20 [formerly c5d75a6473b2659b9ac1054a1160c921bd8c1c16]]]
Former-commit-id: b210c90245
Former-commit-id: c4d2af6f3a1f86a3300795dc1db7d6c9323eac0b [formerly a192a3ebb1]
Former-commit-id: 7c0cf13ea8
2013-08-19 16:34:24 -04:00
Lee Venable
18b63c6cff Merge "Issue #2180 - Implement front end of ogc encryption, redesign DD system management dialog Peer review comments" into development
Former-commit-id: f666a24c75 [formerly 23dca45a0c] [formerly b8d050a172] [formerly 6f1e633d57 [formerly b8d050a172 [formerly cb230698c8be8faef2441171f2270e41807f797d]]]
Former-commit-id: 6f1e633d57
Former-commit-id: 3973cbe4b9deebe7fb069043bda07496e2099871 [formerly e1b9d4cf81]
Former-commit-id: a4cb2d6d21
2013-08-19 15:14:22 -05:00
Benjamin Phillippe
8dc4f54610 Issue #1692 Implemented/Verified Registry LifecycleManager
- Verified submitObjects protocol
            - Added unimplemented features of removeObjects protocol
            - Implemented updateObjects protocol
            - Refactored registry error reporting
            - Fixed JUnit tests
            - Corrected @XmlRootElement tag on registry objects
            - Added capability to modify registry objects using XPath

Change-Id: Id8eea47c3c4a1e39fe88cb17530e9e6cdacd7ce2

Former-commit-id: afddfc35e5 [formerly fcd42b5869] [formerly 2403f75262] [formerly 1390bd8a65 [formerly 2403f75262 [formerly 94810246b449c64457c48684df72baf6e9e8b03d]]]
Former-commit-id: 1390bd8a65
Former-commit-id: 79784b1b6e6437fbfc1c16e804a6e73a6d884797 [formerly d9dffafa6f]
Former-commit-id: d98fbd79c7
2013-08-19 13:16:13 -05:00
Bryan Kowal
99e3667a78 Issue #2169 - gzip data uris; entities that receive data uris will unzip them before running thrift conversions.
- Amend: updates for 32-bit edex_com
- Amend: do not synchronize when building the message
- Amend: use the byte array pool
- Amend: default to data decompression when the queue is edex.alerts

Change-Id: I79a1f3d3d698c67019a4aa33e667fef99f6ebc17

Former-commit-id: 35cacacc45 [formerly 7e61461e86] [formerly 3eaacdb522] [formerly 2e1a8eb2b3 [formerly 3eaacdb522 [formerly 120aa0d6ee671e20734f8efb7bad89ff1b145629]]]
Former-commit-id: 2e1a8eb2b3
Former-commit-id: f55be8607a629311fb3cfbbd46fe9a4e8526f65a [formerly 5c0af47d6d]
Former-commit-id: 18c9026455
2013-08-19 12:06:30 -05:00
Richard Peter
4d01748097 Merge "Issue #1742 Fixed concurrent mod exception in DAT config updates Change-Id: I78ddb871e2bdc3c4200d9c32ae5d9fbd729f116e" into development
Former-commit-id: 531fa21a9c [formerly fd4e8b931c] [formerly 5772854d78bb31832b58a08f72c7aa9c1ac70461 [formerly e5b6102791]] [formerly 39a56abb39 [formerly e5b6102791 [formerly 7988827cf78516d2b928db9004cec0ab5bebd08e]]]
Former-commit-id: 39a56abb39
Former-commit-id: a2323adbe5d1fc9877caa9023a75acaa597ae213 [formerly 2258c4cee1]
Former-commit-id: cdc82ab15f
2013-08-19 10:10:38 -05:00